Commit Graph

7319 Commits

Author SHA1 Message Date
harukin
fdb2cf09c7 edit translation 2018-12-18 14:26:16 +09:00
harukin
a67738380c edit translation 2018-12-18 14:19:34 +09:00
harukin
5816ee9f9a Merge branch 'develop' into 'japanese'
merge again upstream/master for 3.8.7

See merge request harukin/core!27
2018-12-15 17:20:44 +09:00
harukin
e02c09d361 merge again upstream/master for 3.8.7 2018-12-15 17:17:00 +09:00
Mario Vavti
d51d0160d3 fix issue with linkdropper
(cherry picked from commit f81a3ba45d)
2018-12-14 21:32:23 +01:00
zotlabs
c2ad9d4996 regression: the ability to order apps messed up since adding pinned apps to the ordering
(cherry picked from commit 6464099364)
2018-12-14 21:31:02 +01:00
harukin
dfa6463e5b Merge branch 'develop' into 'japanese'
merge from upsream

See merge request harukin/core!25
2018-12-15 00:48:21 +09:00
harukin
097afab9f4 merge from upsream 2018-12-15 00:40:38 +09:00
Mario Vavti
1bd49671b7 add photo_view_filter hook and fix minor issue with unset auto_save_draft variable which resultet in a javascript error
(cherry picked from commit 7894fed741)
2018-12-14 11:30:57 +01:00
phani00
44832bbacb change redbasic dark schema to make categories and highlights readable
additions to /view/theme/redbasic/schema/dark.css to change the appearance of category
badges and highlighted text ([hl]...[/hl]).

hl text changed from master: it's not 'strong' anymore. commented out the pseudo-class
selector that works in master but not in dev anymore.


(cherry picked from commit 18caf0273f)
2018-12-14 11:30:05 +01:00
harukin
018fa052f2 edit translation 2018-12-14 19:21:10 +09:00
harukin
7c19f0cca7 edit translation 2018-12-12 11:42:46 +09:00
harukin
c2181c23ef edit translation 2018-12-12 11:31:05 +09:00
harukin
3cf145aa6a edit translation 2018-12-11 23:01:28 +09:00
harukin
f2d078e3cd edit translation 2018-12-11 10:02:20 +09:00
harukin
4f1fdf85c8 edit translation 2018-12-09 13:31:34 +09:00
harukin
33865993db edit translation 2018-12-09 13:29:24 +09:00
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
9ef6c57ca5 more notifications fixes 2018-12-03 10:46:49 +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
f083c0cba1 fix filtering by addr in handleNotificationsItems() 2018-12-02 10:58:54 +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
Mario
58c0b81908 use flex for the default template
(cherry picked from commit 3775be4ce9)
2018-12-02 10:16:24 +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
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