Commit Graph

7340 Commits

Author SHA1 Message Date
harukin
ad89310c45 edit translation 2019-01-15 17:36:43 +09:00
harukin
f481ba1c1c edit translation 2019-01-13 10:39:40 +09:00
harukin
2dbe567e3b edit translation 2019-01-08 21:48:31 +09:00
harukin
7fbff885dd edit translation 2019-01-01 15:22:09 +09:00
harukin
60b0e652df edit translation 2018-12-31 12:04:53 +09:00
harukin
bb3405ef60 edit translation 2018-12-31 11:57:32 +09:00
harukin
9ef0883011 edit translation 2018-12-31 10:36:15 +09:00
harukin
fa0176c1e6 Merge branch 'develop' into 'japanese'
merge upstream/master for 3.8.8

See merge request harukin/core!32
2018-12-24 01:00:50 +09:00
harukin
ffadb70d81 Merge branch 'origin' into 'develop'
merge upstream/master for 3.8.8

See merge request harukin/core!30
2018-12-24 00:54:15 +09:00
Mario Vavti
0bfda6d4c8 revert padding for text highlight. It is messing with indent punctuation and decreases legibility of the highlighted text.
(cherry picked from commit fac3579fb0)
2018-12-22 20:18:12 +01:00
phani00
feda1e6d84 remove color from style.css (default) but add a little padding; add color & border radius to dark.css.
(cherry picked from commit 2354bb5427)
2018-12-22 19:54:48 +01:00
phani00
4256bea418 change hl text color to the default text color in non-dark schema. looks good, except in dark, where i can change it in dark.css.
(cherry picked from commit b97143e9db)
2018-12-22 19:54:31 +01:00
phani00
4d47b098e5 remove some fancy formatting.
(cherry picked from commit aaab905e72)
2018-12-22 19:54:11 +01:00
phani00
66b56416b6 new fix for dark theme
change implementation of hl-tags in include/bbcode.php
insert class='default-highlight' instead of background-color: 'yellow' into span
add span.default-highlight definition to view/theme/redbasic/css/style.css

this works for all schemas incl. dark.


(cherry picked from commit aace8a14ce)
2018-12-22 19:52:39 +01:00
phani00
c855346358 remove my dark theme fixes.
(cherry picked from commit 70a7661711)
2018-12-22 19:52:09 +01:00
harukin
651ea8cc2f edit translation 2018-12-20 20:34:39 +09:00
harukin
3f0e948981 edit translation 2018-12-20 17:07:24 +09:00
harukin
24ed7fbf3f edit translation 2018-12-20 17:04:54 +09:00
harukin
b13c3979c2 edit translation 2018-12-20 16:59:24 +09:00
harukin
fdd0dbd973 edit translation 2018-12-19 20:48:05 +09:00
harukin
f0a834f7e8 edit translation 2018-12-18 15:05:36 +09:00
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