Commit Graph

23854 Commits

Author SHA1 Message Date
Mario Vavti
7f65d82a74 Merge remote-tracking branch 'mike/master' into dev 2018-12-06 12:50:23 +01:00
zotlabs
8ab1f31058 reset page title if article has no title. 2018-12-05 16:24:30 -08:00
Max Kostikov
d12744011a Merge branch 'dev' into 'dev'
Add strings to Russian translation

See merge request hubzilla/core!1418
2018-12-04 11:50:04 +01:00
Max Kostikov
c0e4c92d47 Update hstrings.php 2018-12-04 11:41:59 +01:00
Max Kostikov
cc3e910194 Update hmessages.po 2018-12-04 11:41:42 +01:00
Mario Vavti
5d9f993352 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-12-04 11:39:14 +01:00
Mario
eaa52c19a8 Merge branch 'photocache' into 'dev'
Less dependence on cache logic

See merge request hubzilla/core!1417
2018-12-04 11:38:58 +01:00
zotlabs
42aeb19562 partial solution for obj|tgt multiple (zot and zot6) encodings; the zot6 version will be stored under $item['obj']['asld'] 2018-12-03 20:09:57 -08:00
zotlabs
ffc3dba682 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-12-03 19:19:31 -08:00
zotlabs
1acc5ceb5f more merging 2018-12-03 19:18:20 -08:00
zotlabs
7d694dca07 more work on z6 commenting 2018-12-03 18:50:45 -08:00
zotlabs
7a693500c4 fix generated plink 2018-12-03 14:21:33 -08:00
Max Kostikov
1c44912aff Update Photo.php 2018-12-03 21:33:32 +01:00
Mario Vavti
5e14da67e1 quickfix for es-es language
(cherry picked from commit 6b68a76bbe)
2018-12-03 21:24:29 +01:00
Max Kostikov
b586fcebab Update Photo.php 2018-12-03 21:21:23 +01:00
Max Kostikov
244c0d828a Update Photo.php 2018-12-03 13:29:27 +01:00
Max Kostikov
57ebd7e170 New logic for less dependence on cache logic 2018-12-03 13:10:55 +01:00
Mario Vavti
5776471547 changelog
(cherry picked from commit 88486a1278)
2018-12-03 11:48:30 +01:00
Mario Vavti
c50e3a702a more notifications fixes
(cherry picked from commit 9ef6c57ca5)
2018-12-03 10:49:08 +01:00
Mario Vavti
2173ef5fb6 catch exception if readImageBlob() receives bogus data
(cherry picked from commit 443d7684db)
2018-12-03 10:48:39 +01:00
Max Kostikov
1f6da1c653 Merge branch 'photocache' into 'dev'
Add flag to allow to save image without validation

See merge request hubzilla/core!1416
2018-12-03 00:57:52 +01:00
Max Kostikov
c165894ce9 Add Expires field support 2018-12-03 00:51:09 +01:00
Max Kostikov
19903ea3c1 Add flag to allow to save image without validation 2018-12-02 21:59:08 +01:00
M. Dent
0b38ab259c Merge branch 'photocache' into 'dev'
Add Photo Cache addon support

See merge request hubzilla/core!1412
2018-12-02 19:33:54 +01:00
Mario Vavti
237c6eed50 fallback to url if we have not got an addr
(cherry picked from commit a3ba7f0788)
2018-12-02 11:39:04 +01:00
Mario Vavti
f13b1e8604 fix filtering by addr in handleNotificationsItems()
(cherry picked from commit f083c0cba1)
2018-12-02 10:59:33 +01:00
Max Kostikov
2a57e00cb4 Remove local_channel() check on cache_body_hook call 2018-12-02 10:07:12 +01:00
M. Dent
52424b0f9c Merge branch 'pdf_embed_fixes' into 'dev'
make pdf preview 100% width and 300px height to match it openstreetmaps preview

See merge request hubzilla/core!1414
2018-12-02 05:09:45 +01:00
M. Dent
132547a9d9 Merge branch 'sticky_aside_fixes' into 'dev'
redbasic sticky aside fixes

See merge request hubzilla/core!1415
2018-12-02 05:07:59 +01:00
Mario Vavti
fdb0459288 Merge remote-tracking branch 'mike/master' into dev 2018-12-01 21:43:54 +01:00
Mario Vavti
df84352385 make pdf preview 100% width and 300px height to match it openstreetmaps preview 2018-12-01 21:37:33 +01:00
Mario Vavti
8d4f6a7865 redbasic sticky aside fixes 2018-12-01 21:30:18 +01:00
zotlabs
6f22e47feb typo 2018-11-30 22:39:10 -08:00
zotlabs
c6acb6191c allow notification filtering by name or addr 2018-11-30 19:03:14 -08:00
zotlabs
6cade7d935 attached photo permissions regression 2018-11-30 13:54:17 -08:00
Max Kostikov
c857ecab46 Create plink depending on message id format 2018-11-30 19:56:49 +01:00
Max Kostikov
53d9cbc69c Check local_channel() before cache call 2018-11-30 11:38:47 +01:00
Max Kostikov
0ee403eab3 Move cache code to addon 2018-11-30 10:50:00 +01:00
Max Kostikov
6f2d09eb20 Fix wrong parameter 2018-11-29 23:28:45 +01:00
Max Kostikov
d6442ec991 Update text.php 2018-11-29 23:07:39 +01:00
Max Kostikov
f3831fa77f Better cache settings logic 2018-11-29 21:27:06 +01:00
Max Kostikov
3265c2e543 Skip sslify for images if it already were cached with https enabled 2018-11-29 20:36:21 +01:00
Max Kostikov
1a9ea64523 Update text.php 2018-11-29 19:28:54 +01:00
Max Kostikov
9de650e175 Cache for viewer channel 2018-11-29 19:13:43 +01:00
Max Kostikov
d8b5f383f5 Disable links to cached photos for non logged viewers 2018-11-29 16:21:50 +01:00
Max Kostikov
6aa99a903f Code cleanup 2018-11-29 11:56:56 +01:00
Max Kostikov
d9faf6c4bb Update text.php 2018-11-29 11:48:12 +01:00
Max Kostikov
48cd5855fe Add photo cache support using sslify() 2018-11-29 11:06:14 +01:00
Max Kostikov
bd0fc8a2d7 Add photo cache hooks 2018-11-29 10:38:25 +01:00
Max Kostikov
476bd7400d Add photo cache cleanup 2018-11-29 10:37:39 +01:00