zotlabs
|
1358a81c32
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-11-04 14:26:12 -08:00 |
|
Max Kostikov
|
09ad48c12b
|
Prefer use Etag on photo modification validation
|
2019-11-04 21:44:42 +01:00 |
|
M. Dent
|
aa137fb2d2
|
Merge branch 'cherry-pick-4cfb9658' into 'dev'
fix duplicate attachment and regression with audio file upload
See merge request hubzilla/core!1766
|
2019-11-04 20:01:14 +01:00 |
|
M. Dent
|
09284d512d
|
Merge branch 'cherry-pick-03317b98' into 'dev'
fix query with protocol prefix not always picking the right xchan
See merge request hubzilla/core!1765
|
2019-11-04 19:58:01 +01:00 |
|
Mario
|
02fd7e51ff
|
add date and request target headers to make pixelfed happy
(cherry picked from commit 3604220c2a5aedddf25143cc5fd87ed576d34702)
|
2019-11-04 13:04:28 +01:00 |
|
Mario
|
b359b89aa1
|
port fixes from zap to check for arrays
(cherry picked from commit 7cc8c2d127b09b7e53c7916c6ea104fa566971db)
|
2019-11-04 13:03:00 +01:00 |
|
Mario
|
873b20677e
|
fix duplicate attachment and regression with audio file upload
(cherry picked from commit 4cfb965881df2be181aab6020c9df78c0a86fd9f)
|
2019-11-04 10:34:24 +01:00 |
|
Mario
|
a049664219
|
fix query with protocol prefix not always picking the right xchan
(cherry picked from commit 03317b9864c0d7c99e144404c647b9923d8d29ea)
|
2019-11-04 09:39:56 +01:00 |
|
Max Kostikov
|
64c6e25896
|
Merge branch 'cherry-pick-4a1c2208' into 'dev'
fix issue #1402
See merge request hubzilla/core!1764
|
2019-11-03 14:03:00 +01:00 |
|
Mario
|
9f9122ab8e
|
fix issue #1402
(cherry picked from commit 4a1c2208866360b5fe54eea71ff8e62bd6d63045)
|
2019-11-03 11:15:12 +01:00 |
|
Mario
|
d0661cd4a3
|
Merge branch 'commentsclosed-hook' into 'dev'
Add hook to comments_are_now_closed()
See merge request hubzilla/core!1763
|
2019-11-03 10:12:12 +01:00 |
|
M. Dent
|
707b19dc35
|
Add hook to comments_are_now_closed()
|
2019-11-03 10:12:11 +01:00 |
|
Max Kostikov
|
6fd15d66a7
|
Merge branch 'dev' into 'dev'
Change llink type in default SQL schema
See merge request hubzilla/core!1761
|
2019-11-02 10:42:02 +01:00 |
|
Max Kostikov
|
8c9a814e18
|
Merge branch 'homeinstall_fix_addons' into 'dev'
homeinstall fix addons
See merge request hubzilla/core!1762
|
2019-11-02 10:37:59 +01:00 |
|
Max Kostikov
|
74ef5f38e9
|
Fix start time to sync queries on photo cache purge
|
2019-11-02 10:36:04 +01:00 |
|
root
|
624a3ee1a7
|
homeinstall fix addons
|
2019-11-01 23:01:42 +01:00 |
|
Max Kostikov
|
fc658a25d7
|
Update schema_mysql.sql
|
2019-11-01 19:37:46 +01:00 |
|
Max Kostikov
|
308619a726
|
Drop llink index
|
2019-11-01 17:47:16 +01:00 |
|
Max Kostikov
|
e87d8d9856
|
Change llink column type and drop index
|
2019-11-01 17:46:28 +01:00 |
|
Max Kostikov
|
7594264725
|
Merge branch 'dev' into 'dev'
Better photo cache expiry processing
See merge request hubzilla/core!1760
|
2019-11-01 10:49:19 +01:00 |
|
Max Kostikov
|
69533ce8f5
|
Add missed interval in SQL query
|
2019-11-01 10:46:49 +01:00 |
|
Max Kostikov
|
9fac43a3a3
|
Better photo cache expiry processing
|
2019-11-01 10:34:02 +01:00 |
|
Max Kostikov
|
b00db39739
|
Merge branch 'dev' into 'dev'
Better cached photos processing
See merge request hubzilla/core!1759
|
2019-10-26 12:30:41 +02:00 |
|
Max Kostikov
|
6f2a584279
|
Update Photo.php
|
2019-10-26 12:24:23 +02:00 |
|
Max Kostikov
|
de717268f7
|
Better cached photos processing
|
2019-10-26 12:22:09 +02:00 |
|
Mario
|
e27b19c756
|
fix hardcoded code/pre css in mod admin
(cherry picked from commit cddf6c4ff51580f3dec5d32eef06a40a473a9202)
|
2019-10-22 13:29:52 +02:00 |
|
Mario
|
045cb461f1
|
fix encoding issue
(cherry picked from commit 067010fc0a5a6c10825b869b822c9cfbb3d4516b)
|
2019-10-22 10:39:54 +02:00 |
|
Max Kostikov
|
088c0eedc6
|
Merge branch 'patch-1' into 'dev'
add japanese translation
See merge request hubzilla/core!1752
|
2019-10-19 23:28:58 +02:00 |
|
harukin
|
e5137b03fc
|
Update view/ja/hstrings.php
|
2019-10-19 18:41:58 +02:00 |
|
harukin
|
76d34a4d74
|
Update view/ja/hmessages.po, view/ja/hstrings.php files
|
2019-10-17 17:57:23 +02:00 |
|
Max Kostikov
|
ae4f0e5728
|
Merge branch 'dev' into 'dev'
Fix channel address in follow link
See merge request hubzilla/core!1757
|
2019-10-15 22:39:18 +02:00 |
|
Max Kostikov
|
5df59027ad
|
Fix channel address in follow link
|
2019-10-15 22:37:03 +02:00 |
|
Max Kostikov
|
c888e33f04
|
Merge branch 'dev' into 'dev'
Better Opengraph image type detection
See merge request hubzilla/core!1756
|
2019-10-15 14:11:21 +02:00 |
|
Max Kostikov
|
1a56ecaa39
|
Update opengraph.php
|
2019-10-15 14:04:24 +02:00 |
|
Max Kostikov
|
d778c3cf19
|
Better Opengraph image type detection
|
2019-10-15 14:03:41 +02:00 |
|
Max Kostikov
|
8bf57c6226
|
Merge branch 'dev' into 'dev'
Dev
See merge request hubzilla/core!1755
|
2019-10-15 14:00:21 +02:00 |
|
Max Kostikov
|
3c762b8809
|
Fix cache-control syntax for photos
|
2019-10-15 13:49:46 +02:00 |
|
Max Kostikov
|
3561fd7c43
|
Merge branch 'dev' into 'dev'
Sync dev
See merge request kostikov/core!3
|
2019-10-15 13:48:07 +02:00 |
|
Max Kostikov
|
66bfc0ec64
|
Merge branch 'patch-20191014' into 'dev'
Updates to zcard/profile images and other public images to account for infrastructure caches (CDN)
See merge request hubzilla/core!1754
|
2019-10-14 22:28:48 +02:00 |
|
M. Dent
|
7d0e576e3b
|
Updates to zcard/profile images and other public images to account for infrastructure caches (CDN)
|
2019-10-14 22:28:48 +02:00 |
|
Max Kostikov
|
aa330bc8c7
|
Merge branch 'dev' into 'dev'
Better plural function detection
See merge request hubzilla/core!1753
|
2019-10-14 11:16:12 +02:00 |
|
Max Kostikov
|
b4de492e0d
|
Merge branch 'dev' into 'dev'
Dev
See merge request kostikov/core!2
|
2019-10-14 11:11:48 +02:00 |
|
Max Kostikov
|
5bf3114e6f
|
Better plural function detection
|
2019-10-14 11:09:53 +02:00 |
|
harukin
|
d2b1a2e5a3
|
Upload .php file
|
2019-10-14 03:39:43 +02:00 |
|
harukin
|
4b01f6359b
|
Upload .po file
|
2019-10-14 03:39:05 +02:00 |
|
harukin
|
bcfa62f45a
|
japanese translation directory
|
2019-10-14 03:34:24 +02:00 |
|
Mario
|
e7e8a2ca5f
|
Merge branch 'dev' into 'dev'
Better Opengraph markup
See merge request hubzilla/core!1751
|
2019-10-13 14:27:54 +02:00 |
|
Max Kostikov
|
5edeb0250b
|
Revert "Remove visible channels list from pubstream tags cloud creation procedure"
This reverts commit 5c4c6e68f6
|
2019-10-13 14:27:54 +02:00 |
|
Max Kostikov
|
0c2657df78
|
Add Opengraph image type detection
|
2019-10-12 23:42:35 +02:00 |
|
Max Kostikov
|
e4c57e8031
|
Update opengraph.php
|
2019-10-12 21:22:42 +02:00 |
|