7603 Commits

Author SHA1 Message Date
harukin
b13c3979c2 edit translation 2018-12-20 16:59:24 +09:00
harukin
fdd0dbd973 edit translation 2018-12-19 20:48:05 +09:00
phani00
2354bb5427 remove color from style.css (default) but add a little padding; add color & border radius to dark.css. 2018-12-18 17:54:39 +01:00
phani00
b97143e9db 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. 2018-12-18 14:02:50 +01:00
phani00
aaab905e72 remove some fancy formatting. 2018-12-18 12:37:51 +01: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
phani00
aace8a14ce 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.
2018-12-17 15:28:15 +00:00
phani00
70a7661711 remove my dark theme fixes. 2018-12-17 10:08:45 +00: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
Mario Vavti
f81a3ba45d fix issue with linkdropper 2018-12-14 11:23:08 +01:00
harukin
018fa052f2 edit translation 2018-12-14 19:21:10 +09:00
Mario Vavti
c771d2809f Merge remote-tracking branch 'mike/master' into dev 2018-12-14 10:28:55 +01:00
zotlabs
6464099364 regression: the ability to order apps messed up since adding pinned apps to the ordering 2018-12-12 19:11:30 -08: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
M. Dent
4cb4f17500 Merge branch 'photo-hook' into 'dev'
add photo_view_filter hook and fix minor issue with unset auto_save_draft…

See merge request hubzilla/core!1425
2018-12-10 21:49:12 +01:00
Mario Vavti
7894fed741 add photo_view_filter hook and fix minor issue with unset auto_save_draft variable which resultet in a javascript error 2018-12-10 10:37:29 +01:00
phani00
18caf0273f 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.
2018-12-10 03:03:28 +00: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
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
5e14da67e1 quickfix for es-es language
(cherry picked from commit 6b68a76bbe)
2018-12-03 21:24:29 +01:00
Mario Vavti
6b68a76bbe quickfix for es-es language 2018-12-03 21:22:02 +01:00
Mario Vavti
c50e3a702a more notifications fixes
(cherry picked from commit 9ef6c57ca5)
2018-12-03 10:49:08 +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
f13b1e8604 fix filtering by addr in handleNotificationsItems()
(cherry picked from commit f083c0cba1)
2018-12-02 10:59:33 +01: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