Commit Graph

23737 Commits

Author SHA1 Message Date
harukin
5a27aaef24 edit translation 2018-12-06 22:10:55 +09:00
harukin
770036c5a8 Merge branch 'develop' into 'japanese'
merge from upsream 3.8.6 release

See merge request harukin/core!23
2018-12-04 23:55:59 +09:00
harukin
e8acf7e87a merge from upsream 3.8.6 release 2018-12-04 23:52:59 +09:00
harukin
2a4aea67b8 edit translation 2018-12-04 23:47:09 +09:00
Mario Vavti
6b68a76bbe quickfix for es-es language 2018-12-03 21:22:02 +01:00
Mario Vavti
8f10b58cb1 version 3.8.6 2018-12-03 12:23:55 +01:00
Mario Vavti
f8bc408abc update strings 2018-12-03 12:07:56 +01:00
Mario Vavti
f581f6163a optimize autoload cache 2018-12-03 11:52:38 +01:00
Mario Vavti
88486a1278 changelog 2018-12-03 11:47:28 +01:00
Mario Vavti
9fcadc2d7c prevent incompatible export files (osada/zap) from being imported (manual patch from dev) 2018-12-03 11:08:39 +01:00
Mario Vavti
9ef6c57ca5 more notifications fixes 2018-12-03 10:46:49 +01:00
Mario Vavti
443d7684db catch exception if readImageBlob() receives bogus data 2018-12-03 10:45:43 +01:00
harukin
5d82037ffb edit translation 2018-12-02 20:36:14 +09:00
harukin
a41713febb edit translation 2018-12-02 20:29:11 +09:00
harukin
5002d8e1fa edit translation 2018-12-02 19:59:58 +09:00
Mario Vavti
a3ba7f0788 fallback to url if we have not got an addr 2018-12-02 11:38:13 +01:00
Mario Vavti
f083c0cba1 fix filtering by addr in handleNotificationsItems() 2018-12-02 10:58:54 +01:00
Mario Vavti
defa2d9df1 make pdf preview 100% width and 300px height to match it openstreetmaps preview
(cherry picked from commit df84352385)
2018-12-02 10:18:37 +01:00
Mario Vavti
05c422ef23 redbasic sticky aside fixes
(cherry picked from commit 8d4f6a7865)
2018-12-02 10:18:20 +01:00
zotlabs
51d274961b typo
(cherry picked from commit 6f22e47feb)
2018-12-02 10:18:05 +01:00
zotlabs
4b4cc04897 allow notification filtering by name or addr
(cherry picked from commit c6acb6191c)
2018-12-02 10:17:45 +01:00
zotlabs
4bf3d4d87a attached photo permissions regression
(cherry picked from commit 6cade7d935)
2018-12-02 10:17:29 +01:00
Manuel Jiménez Friaza
71cc980e96 Revision 1 doc/es-es/about/about.bb
(cherry picked from commit 5ac08ec3aa)

(cherry picked from commit 37d563c30e)
2018-12-02 10:16:50 +01:00
Mario
58c0b81908 use flex for the default template
(cherry picked from commit 3775be4ce9)
2018-12-02 10:16:24 +01:00
M. Dent
3b42bd43ab Do not store serialized pconfig value received via to Module/Pconfig.php
(cherry picked from commit 6b02c664fb)
2018-12-02 10:15:55 +01:00
Mario
a151532ffa update jquery-file-upload and psr-log via composer
(cherry picked from commit c7ae3fdc9a)
2018-12-02 10:14:58 +01:00
Mario
a0d1ce77dc update imagesloaded to version 4.1.4 via composer
(cherry picked from commit c667572d3e)
2018-12-02 10:14:37 +01:00
Manuel Jiménez Friaza
863cae1bab Update es-es
(cherry picked from commit ca98a566ee)
2018-12-02 10:13:43 +01:00
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
harukin
d72276df94 edit translation 2018-12-01 23:15:39 +09:00
harukin
450bb1c2cb edit translation 2018-12-01 22:54:51 +09: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
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
harukin
34961b39fe edit translation 2018-11-27 18:53:26 +09:00
harukin
088a54dacb edit translation 2018-11-27 18:47:25 +09:00
harukin
bc9d4a7643 edit translation 2018-11-27 18:32:55 +09:00
harukin
e0ee14d5b0 edit translation 2018-11-27 16:19:46 +09:00
harukin
e88db3d609 edit translation 2018-11-27 15:45:10 +09:00
harukin
f7d3550122 edit translation 2018-11-27 15:35:48 +09:00