zotlabs
|
39de8e28da
|
make Apps::get_base_apps() pluggable
|
2019-01-08 14:14:55 -08:00 |
|
Mario Vavti
|
06beb59628
|
slightly improve item.is_new rendering
|
2019-01-08 15:23:08 +01:00 |
|
harukin
|
2dbe567e3b
|
edit translation
|
2019-01-08 21:48:31 +09: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 |
|
Mario
|
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 |
|
Mario Vavti
|
dbd230da74
|
update composer libs
|
2019-01-02 22:41:03 +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 |
|
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 |
|