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
harukin
b13c3979c2
edit translation
2018-12-20 16:59:24 +09:00
zotlabs
7a55dd512a
reverse activity mapping improvements
2018-12-19 20:03:31 -08:00
harukin
fdd0dbd973
edit translation
2018-12-19 20:48:05 +09: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
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
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
Max Kostikov
a2959c6e9e
Remove scale_external_images()
2018-12-17 13:28:18 +01:00
zotlabs
06c71eec65
default curl to http/1.1
...
(cherry picked from commit 04a45a407e
2018-12-17 12:17:44 +01:00
phani00
70a7661711
remove my dark theme fixes.
2018-12-17 10:08:45 +00:00
Mario
d190b1995b
Merge branch 'dev' into 'dev'
...
Keep remote site headers to respect caching policy
See merge request hubzilla/core!1440
2018-12-17 10:55:53 +01:00
Mario
a6f8230063
Merge branch 'memory-warn2' into 'dev'
...
add warning if upload_filesize < 4MB.
See merge request hubzilla/core!1438
2018-12-17 10:55:29 +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
Mario Vavti
e4c60d70b0
Merge remote-tracking branch 'mike/master' into dev
2018-12-17 10:12:53 +01:00
Max Kostikov
4d8a815932
Keep remote site headers for caching
2018-12-17 09:34:30 +01:00
Max Kostikov
b0e5f5973a
Merge branch 'dev' into 'dev'
...
Move SSLify code from Photo cache addon
See merge request hubzilla/core!1439
2018-12-17 09:19:08 +01:00
Max Kostikov
05cb4fd897
Move SSLify code from Photo cache addon
2018-12-17 09:13:03 +01:00
Max Kostikov
72dc6ea77c
Revert Photos.php code
2018-12-17 01:16:08 +01:00
Max Kostikov
1b0a6fe9eb
SSLify cached URL on redirect if needed
2018-12-17 00:58:46 +01:00
Max Kostikov
363ad01bce
SSLify cached URL on redirect if needed
2018-12-17 00:30:36 +01:00
zotlabs
04a45a407e
default curl to http/1.1
2018-12-16 14:38:58 -08:00
phani00
14735e0a48
Update Zotlabs/Module/Setup.php
2018-12-16 22:04:28 +01:00
