Commit Graph

23826 Commits

Author SHA1 Message Date
harukin
e9edec0875 edit translation 2019-02-24 09:19:28 +09:00
harukin
6dda2713cf edit translation 2019-02-15 23:29:31 +09:00
harukin
38443c72c3 おまえかぁぁぁぁぁぁぁぁぁあ!!!!!!!!!!!!!!!!!!!!!11 2019-02-13 23:56:49 +09:00
harukin
0cef3e67ce fix delete strings.php.... 2019-02-13 23:49:33 +09:00
harukin
b98d4875da fix strings.php 2019-02-13 23:24:13 +09:00
harukin
ae52db41de edit translation 2019-02-13 23:19:40 +09:00
harukin
5e0ce96e49 Merge branch 'origin' into 'japanese'
marge from origin 3.8.9

See merge request harukin/core!37
2019-02-11 17:51:12 +09:00
harukin
d9a0382539 edit translation 2019-02-11 17:15:48 +09:00
Mario
90fd323ac5 bump version 2019-02-03 15:03:56 +01:00
Mario Vavti
b6c384a0f7 cleanup logging and return if query returns empty result
(cherry picked from commit c657d766cf)
2019-02-03 15:02:06 +01:00
Mario Vavti
cda8a7be38 do not overwrite $sql_extra
(cherry picked from commit 4706ff6938)
2019-02-03 15:01:39 +01:00
harukin
ded949052c edit translation 2019-01-31 18:44:51 +09:00
harukin
de15a1e7c8 edit translation 2019-01-31 16:50:53 +09:00
Mario Vavti
ddbc35181c fix page jumping when liking a collapsed/expanded post
(cherry picked from commit 54806f6ee8)
2019-01-24 13:39:49 +01:00
harukin
875aecf9c6 edit translation 2019-01-24 17:43:03 +09:00
harukin
c85acf8044 edit translation 2019-01-20 22:33:47 +09:00
harukin
78a587791f edit translation 2019-01-20 21:38:53 +09:00
harukin
f4a3ebcb41 edit translation 2019-01-20 21:31:43 +09:00
harukin
086dab902c edit translation 2019-01-20 17:22:38 +09:00
harukin
722c03b6c6 edit translation 2019-01-20 17:08:14 +09:00
harukin
bb962b90cc edit translation 2019-01-16 21:19:38 +09:00
harukin
44f75d94e1 edit translation 2019-01-15 18:07:33 +09:00
harukin
ad89310c45 edit translation 2019-01-15 17:36:43 +09:00
harukin
f481ba1c1c edit translation 2019-01-13 10:39:40 +09:00
zotlabs
57dde3e980 failure to import mail
(cherry picked from commit 7b30fc4b82)
2019-01-11 12:20:50 +01:00
Mario Vavti
3eba0c2297 do not count removed channels
(cherry picked from commit 01f4ce96f1)
2019-01-10 13:36:31 +01: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
414b7e28d3 bump version 2018-12-22 21:02:49 +01:00
Mario Vavti
fca464071f update changelog
(cherry picked from commit cdb85f1309)
2018-12-22 21:01:50 +01:00
Mario Vavti
4f08f4b84c use count() instead of sizeof()
(cherry picked from commit 774dd6d5e3)
2018-12-22 20:20:58 +01:00
Mario Vavti
1b5175d018 check if we deal with an array before sizeof()
(cherry picked from commit 339c9cceec)
2018-12-22 20:20:13 +01: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
Mario
880b22604b manualy Fix cURL with HTTP/2 due to merge conflicts 2018-12-22 20:17:20 +01:00
Mario
04a2dc075f manualy remove scale_external_images() due to merge conflicts 2018-12-22 20:08:44 +01:00
Max Kostikov
01448c152c Remove scale_external_images()
(cherry picked from commit 1541f67eab)
2018-12-22 20:04:09 +01:00
Max Kostikov
a09beb3833 Remove scale_external_images()
(cherry picked from commit a2959c6e9e)
2018-12-22 20:03:49 +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
Mario Vavti
163754a46c make mod channel deal with b64 encoded mid\s
;


(cherry picked from commit bc6d384ca9)
2018-12-22 19:53:37 +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
Pascal Deklerck
0e32c86c3d Update OAuth2Storage.php - fix email retrieval in getUser
(cherry picked from commit 6a825cc504)
2018-12-22 19:51:16 +01:00
M. Dent
19952264c8 Add reload to util/addons
(cherry picked from commit 0e5d76e735)
2018-12-22 19:43:16 +01:00