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
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
Mario Vavti
5ec1e97cae
do not add timestamp to the photo src. caching is handled in mod photo now.
...
(cherry picked from commit e34853e19e
2018-12-21 21:45:33 +01:00
zotlabs
5f5746a2f6
like permission issue
...
(cherry picked from commit 389b4beba4
2018-12-21 21:44:33 +01:00
Mario Vavti
d0ee6d1ad2
missing observer check
...
(cherry picked from commit ec769bc9f9
2018-12-20 19:45:59 +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
zotlabs
06c71eec65
default curl to http/1.1
...
(cherry picked from commit 04a45a407e
2018-12-17 12:17:44 +01:00
DM42.Net (Matt Dent)
aabc6c2825
Add return if no local_channel()
...
(cherry picked from commit 5bcc379530
2018-12-17 10:46:43 +01:00
DM42.Net (Matt Dent)
8323458da9
ARTICLES MODULE: Default to local_channel() user when no argv(1) is passed.
...
(cherry picked from commit 3f06a857c2
2018-12-17 10:46:24 +01:00
harukin
9df8dbee08
Merge branch 'develop' into 'japanese'
...
add harukin- picture
See merge request harukin/core!29
2018-12-16 18:44:51 +09:00
harukin
140af45bb0
Merge branch 'add-harukin--future' into 'develop'
...
add harukin- picture
See merge request harukin/core!28
2018-12-16 18:43:41 +09:00
harukin
2bf2f2518c
add harukin- picture
2018-12-16 18:35:45 +09:00
Mario Vavti
d7c7ff1c12
fix wiki preview issue with hyperlinks
...
(cherry picked from commit 919ea9f750
2018-12-15 18:20:21 +01: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
