Commit Graph

24322 Commits

Author SHA1 Message Date
zotlabs
4010ea814a fix mastodon tag notifications (again)
(cherry picked from commit 8e71324514)
2018-12-02 10:13:12 +01:00
zotlabs
8e25c091f4 no mention notifications from mastodon (and pleroma)
(cherry picked from commit ea235c0c67)
2018-12-02 10:12:44 +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
harukin
d72276df94 edit translation 2018-12-01 23:15:39 +09:00
harukin
450bb1c2cb edit translation 2018-12-01 22:54:51 +09: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
harukin
658c0734e2 edit translation 2018-11-30 00:19:54 +09:00
harukin
5c7f01140a edit translation 2018-11-29 22:53:13 +09:00
harukin
12767746ca edit translation 2018-11-29 22:50:12 +09:00
harukin
ffa86b25db edit translation 2018-11-29 22:46:14 +09:00
harukin
2763c0f40e edit translation 2018-11-29 22:42:28 +09: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
Max Kostikov
bd10d48338 Update database with expires field for photo 2018-11-29 10:36:56 +01:00
Max Kostikov
bb91064416 Add expires for photo 2018-11-29 10:35:56 +01:00
Max Kostikov
72d2fe2fd4 Add expires for photo 2018-11-29 10:35:11 +01:00
Max Kostikov
92a5b9ac41 Add PHOTO_CACHE photo type 2018-11-29 10:34:18 +01:00
M. Dent
cded6b1136 Merge branch 'es-es' into 'dev'
Revision 1 doc/es-es/about/about.bb

See merge request hubzilla/core!1410
2018-11-28 05:32:10 +01:00
M. Dent
19f0ce7e37 Merge branch 'default2flex-conversion' into 'dev'
use flex for the default template

See merge request hubzilla/core!1409
2018-11-28 04:03:39 +01:00
M. Dent
a88a515fa0 Merge branch 'composer-updates' into 'dev'
update jquery-file-upload and psr-log via composer

See merge request hubzilla/core!1408
2018-11-28 03:55:13 +01:00
M. Dent
a4b2eac0f0 Merge branch 'update-imagesloaded' into 'dev'
update imagesloaded to version 4.1.4 via composer

See merge request hubzilla/core!1407
2018-11-28 03:52:53 +01:00
M. Dent
0bd38290e6 Merge branch 'pg-fixes' into 'dev'
fix db upgrade 1228 for postgres

See merge request hubzilla/core!1403
2018-11-28 03:49:22 +01:00
zotlabs
19e4f3c2f0 prevent incompatible export files (osada/zap) from being imported. This is to keep your DB from getting trashed. We probably need a similar thing for item import since the object formats aren't compatible 2018-11-27 11:53:02 -08:00
harukin
e6edac1589 edit translation 2018-11-28 00:29:24 +09:00
harukin
781d0c0fe0 edit translation 2018-11-27 23:26:03 +09:00
harukin
b48cb47f41 edit translation 2018-11-27 19:38:00 +09:00
harukin
1ece7caa57 edit translation 2018-11-27 19:35:54 +09:00
harukin
0c1a3b1a61 edit translation 2018-11-27 19:10:07 +09:00
harukin
2b5d4ef346 edit translation 2018-11-27 19:07:33 +09:00
harukin
2dbd990017 edit translate 2018-11-27 18:59:50 +09:00