Mario Vavti
b0339b848f
fix preg_match(): Delimiter must not be alphanumeric or backslash warning
2019-01-02 17:53:28 +01:00
Mario Vavti
f3f106c21f
check suppported type if we get content type from header
2019-01-02 17:49:21 +01: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
DM42.Net (Matt Dent)
a50433dd95
Use subselect
2018-12-30 15:05:45 -05:00
Max Kostikov
37d7d18bb7
Faster image processing with photo cache addon
2018-12-24 09:22:58 +01: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
695c60c3fe
Merge branch 'develop' into 'master'
...
merge upstream/master for 3.8.8
See merge request harukin/core!31
2018-12-24 01:00:22 +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
cdb85f1309
update changelog
2018-12-22 21:00:01 +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
6d7fba6758
Merge branch 'fix_linkinfo_warning' into 'dev'
...
check if we deal with an array before sizeof()
See merge request hubzilla/core!1444
2018-12-22 20:18:41 +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
Mario Vavti
fac3579fb0
revert padding for text highlight. It is messing with indent punctuation and decreases legibility of the highlighted text.
2018-12-22 19:47:46 +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
458b023204
Merge branch 'dev' into 'dev'
...
Fix for cURL with default HTTP/2
See merge request hubzilla/core!1447
2018-12-21 21:35:54 +01:00
Max Kostikov
4bad4ec632
Merge branch 'remove-legacy-photo-cache-prevention' into 'dev'
...
do not add timestamp to the photo src. caching is handled in mod photo now.
See merge request hubzilla/core!1448
2018-12-21 15:19:36 +01:00
Mario Vavti
e34853e19e
do not add timestamp to the photo src. caching is handled in mod photo now.
2018-12-21 12:51:19 +01:00
Mario Vavti
6cbdb1b4c3
Merge remote-tracking branch 'mike/master' into dev
2018-12-21 12:19:52 +01:00
Max Kostikov
60f890ce0d
Fix for cURL with default HTTP/2
2018-12-20 21:13:05 +01:00
Max Kostikov
c82c0a9812
Merge branch 'dev' into 'dev'
...
Dev
See merge request kostikov/core!2
2018-12-20 21:09:16 +01:00
Max Kostikov
123b1d4002
Merge branch 'revert-090fe394' into 'dev'
...
Revert "Fix cURL with HTTP/2"
See merge request hubzilla/core!1446
2018-12-20 21:04:12 +01:00
Max Kostikov
e4958d5bb9
Revert "Fix cURL with HTTP/2"
...
This reverts commit 090fe394e4
2018-12-20 20:58:48 +01:00
Max Kostikov
89e734dcca
Merge branch 'dev' into 'dev'
...
Sync dev
See merge request kostikov/core!1
2018-12-20 20:51:26 +01:00
Max Kostikov
090fe394e4
Fix cURL with HTTP/2
2018-12-20 20:38:35 +01:00
zotlabs
389b4beba4
like permission issue
2018-12-20 11:06:52 -08:00
Mario Vavti
d0ee6d1ad2
missing observer check
...
(cherry picked from commit ec769bc9f9
2018-12-20 19:45:59 +01:00
Mario Vavti
ec769bc9f9
missing observer check
2018-12-20 19:45:11 +01:00
Mario Vavti
6b259070f0
Merge remote-tracking branch 'mike/master' into dev
2018-12-20 12:59:04 +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
