 Mario
|
6ec1bfebec
|
Merge branch 'patch-20190106a' into 'dev'
Remove Experimental Worker Queue from CORE - add hook 'daemon_master_release'
See merge request hubzilla/core!1461
|
2019-01-09 10:16:53 +01:00 |
|
 M. DentandMario
|
5d88326915
|
Remove Experimental Worker Queue from CORE - add hook 'daemon_master_release'
|
2019-01-09 10:16:53 +01:00 |
|
|
Mario
|
24354b9dcc
|
Merge branch 'patch-20190107a' into 'dev'
Tweak to deal with changes that may happen within the same second.
See merge request hubzilla/core!1462
|
2019-01-09 10:16:05 +01:00 |
|
 DM42.Net (Matt Dent)
|
563a5088be
|
Tweak to deal with changes that may happen within the same second.
|
2019-01-07 19:48:14 -05:00 |
|
|
M. Dent
|
c10c59db4b
|
Merge branch 'browser_compatibility' into 'dev'
fix issue with IE
See merge request hubzilla/core!1460
|
2019-01-07 17:09:26 +01:00 |
|
|
M. Dent
|
463f084b3e
|
Merge branch 'update_bbcode' into 'dev'
Update bbcode
See merge request hubzilla/core!1459
|
2019-01-07 17:09:00 +01:00 |
|
|
MarioandM. Dent
|
312e0dcbc8
|
Update bbcode
|
2019-01-07 17:09:00 +01:00 |
|
|
Mario Vavti
|
6f93001658
|
fix issue with IE
|
2019-01-07 09:47:08 +01:00 |
|
 Max Kostikov
|
48821a6da5
|
Merge branch 'check_content_type-1' into 'dev'
fix content type check
See merge request hubzilla/core!1458
|
2019-01-03 19:41:00 +01:00 |
|
|
Mario Vavti
|
b93bc142d3
|
missing closing parenthesis
|
2019-01-03 19:18:49 +01:00 |
|
|
Mario Vavti
|
ab9b8b8b0a
|
fix content type check
|
2019-01-03 19:13:56 +01:00 |
|
|
Max Kostikov
|
1c4a90626a
|
Merge branch 'revert-3f61d24d' into 'dev'
Revert "Merge branch 'check_content_type' into 'dev'"
See merge request hubzilla/core!1456
|
2019-01-03 17:18:52 +01:00 |
|
|
Max Kostikov
|
3bf1866f4a
|
Revert "Merge branch 'check_content_type' into 'dev'"
This reverts merge request !1453
|
2019-01-03 17:13:40 +01:00 |
|
|
Max Kostikov
|
1a652b555f
|
Merge branch 'update_boot' into 'dev'
add zotsite.net to directory fallback servers
See merge request hubzilla/core!1454
|
2019-01-03 16:32:31 +01:00 |
|
|
Max Kostikov
|
3f61d24d0a
|
Merge branch 'check_content_type' into 'dev'
check suppported type if we get content type from header
See merge request hubzilla/core!1453
|
2019-01-03 16:31:48 +01:00 |
|
|
Max Kostikov
|
16064d5614
|
Merge branch 'fix_pconfig' into 'dev'
fix preg_match(): Delimiter must not be alphanumeric or backslash warning
See merge request hubzilla/core!1452
|
2019-01-03 16:30:14 +01:00 |
|
|
Mario Vavti
|
d9f21db623
|
Merge remote-tracking branch 'mike/master' into dev
|
2019-01-03 14:05:08 +01:00 |
|
 zotlabs
|
8ac541e634
|
better handling of notification updates while commenting
|
2019-01-02 23:33:33 -08:00 |
|
|
Mario Vavti
|
da2688403e
|
Merge remote-tracking branch 'mike/master' into dev
|
2019-01-02 23:07:37 +01:00 |
|
|
zotlabs
|
f660530ef5
|
allow notification updates when composing comments. This was disabled when it was possible to have liveUpdate run automatically while composing comments, but it seems that live update is no longer possible (however the setting still remains - this should probably be removed).
|
2019-01-02 12:49:04 -08:00 |
|
|
Mario
|
a19563e139
|
Revert "Use subselect"
This reverts commit a50433dd95
|
2019-01-02 19:56:11 +01:00 |
|
|
Mario
|
c4400cf72a
|
Merge branch 'patch-20181230a' into 'dev'
Use subselect
See merge request hubzilla/core!1451
|
2019-01-02 19:47:39 +01:00 |
|
|
Mario Vavti
|
aae4943e64
|
add zotsite.net to directory fallback servers
|
2019-01-02 19:43:52 +01:00 |
|
|
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 |
|
|
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 |
|
|
Mario Vavti
|
cdb85f1309
|
update changelog
|
2018-12-22 21:00:01 +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
|
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 |
|
|
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
|
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. DentandMario
|
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 |
|