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
zotlabs
7a55dd512a
reverse activity mapping improvements
2018-12-19 20:03:31 -08:00
Mario Vavti
774dd6d5e3
use count() instead of sizeof()
2018-12-19 11:08:28 +01:00
Mario
4cbaddf4c4
Merge branch 'dark-fix-dev' into 'dev'
...
fix for dark theme; includes one changes to bbcode.php and redbasic/css/style.css
See merge request hubzilla/core!1442
2018-12-19 10:14:29 +01:00
Mario
10f1da2736
Merge branch 'util-reload_addons' into 'dev'
...
Add reload to util/addons
See merge request hubzilla/core!1434
2018-12-19 10:12:59 +01:00
M. Dent
0e5d76e735
Add reload to util/addons
2018-12-19 10:12:59 +01:00
Mario Vavti
339c9cceec
check if we deal with an array before sizeof()
2018-12-19 10:05:18 +01: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
Max Kostikov
fe80f8179c
Merge branch 'channel_b64_enc_mid' into 'dev'
...
make mod channel deal with b64 encoded mid's
See merge request hubzilla/core!1443
2018-12-18 15:10:58 +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
Mario Vavti
bc6d384ca9
make mod channel deal with b64 encoded mid\s
...
;
2018-12-18 10:43:06 +01:00
Mario
6fc8c174f9
Merge branch 'dev' into 'dev'
...
Remove scale_external_images()
See merge request hubzilla/core!1441
2018-12-18 10:17:57 +01:00
Mario Vavti
63b205c601
Merge remote-tracking branch 'mike/master' into dev
2018-12-18 09:59:34 +01:00
zotlabs
15ce8bc79b
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
2018-12-17 18:45:42 -08:00
zotlabs
8d70b91955
regression: mail from dev to core not delivering
2018-12-17 18:14:32 -08:00
zotlabs
a33ed05bec
fix default values for affinity tool and other information which could be lost when approving a connection without the entire form provided by connedit.
2018-12-17 11:32:59 -08: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
d80b8ff30f
Merge branch 'dev' into dark-fix-dev
2018-12-17 15:18:24 +00:00
Max Kostikov
3a66255576
Remove scale_external_images()
2018-12-17 13:29:37 +01:00
Max Kostikov
1541f67eab
Remove scale_external_images()
2018-12-17 13:28:58 +01:00
