4c0378eeae
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
2019-01-21 12:04:57 +01:00
39128c34cc
Merge branch 'dev' into 'dev'
...
Some fixes in include/help.php.
See merge request hubzilla/core!1479
2019-01-19 05:21:53 +01:00
90a62405ca
Fix wrong variable name in include/plugin.php.
2019-01-19 00:28:01 +01:00
bba20c27fe
Some fixes in include/help.php.
...
Remove unused variables and a wrong function name.
2019-01-18 22:37:05 +01:00
96deae43fa
this should fix the rest of the event stuff
2019-01-17 11:47:55 -08:00
7e29bd10b6
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
2019-01-16 16:52:21 -08:00
eaa375936f
more z6 compatibility fixes
2019-01-16 15:28:30 -08:00
4450a01014
do not return if delivery report could not bedecrypted
2019-01-16 15:09:18 +01:00
90f6abfa7c
Merge branch 'patch-20190113a' into 'dev'
...
Add collect_public_recipients hook
See merge request hubzilla/core!1467
2019-01-14 10:29:19 +01:00
b4c1ca88f3
move order by and rewrite similar in update_queue_item()
2019-01-13 14:41:44 -05:00
ab074f52fe
outq_created not outq_scheduled
2019-01-13 14:10:35 -05:00
121fa834d5
FIX: aggregated query error in MYSQL
2019-01-13 14:06:36 -05:00
598cbf2210
Add collect_public_recipients hook
2019-01-12 22:37:44 -05:00
8aa117e4ae
FIX: memory exhaustion on zot message pickup with large message queue
2019-01-12 09:22:37 +01:00
dc8da4717f
Merge remote-tracking branch 'mike/master' into dev
2019-01-11 10:14:06 +01:00
7b30fc4b82
failure to import mail
2019-01-10 15:02:58 -08:00
90b6afe06b
we must sslify all possible content variables
2019-01-10 00:29:05 +01:00
312e0dcbc8
Update bbcode
2019-01-07 17:09:00 +01:00
b93bc142d3
missing closing parenthesis
2019-01-03 19:18:49 +01:00
ab9b8b8b0a
fix content type check
2019-01-03 19:13:56 +01:00
3bf1866f4a
Revert "Merge branch 'check_content_type' into 'dev'"
...
This reverts merge request !1453
2019-01-03 17:13:40 +01:00
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
da2688403e
Merge remote-tracking branch 'mike/master' into dev
2019-01-02 23:07:37 +01:00
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
f3f106c21f
check suppported type if we get content type from header
2019-01-02 17:49:21 +01:00
60f890ce0d
Fix for cURL with default HTTP/2
2018-12-20 21:13:05 +01:00
e4958d5bb9
Revert "Fix cURL with HTTP/2"
...
This reverts commit 090fe394e4
2018-12-20 20:58:48 +01:00
090fe394e4
Fix cURL with HTTP/2
2018-12-20 20:38:35 +01:00
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
aaab905e72
remove some fancy formatting.
2018-12-18 12:37:51 +01:00
6fc8c174f9
Merge branch 'dev' into 'dev'
...
Remove scale_external_images()
See merge request hubzilla/core!1441
2018-12-18 10:17:57 +01:00
63b205c601
Merge remote-tracking branch 'mike/master' into dev
2018-12-18 09:59:34 +01:00
15ce8bc79b
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
2018-12-17 18:45:42 -08:00
8d70b91955
regression: mail from dev to core not delivering
2018-12-17 18:14:32 -08:00
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
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
3a66255576
Remove scale_external_images()
2018-12-17 13:29:37 +01:00
1541f67eab
Remove scale_external_images()
2018-12-17 13:28:58 +01:00
a2959c6e9e
Remove scale_external_images()
2018-12-17 13:28:18 +01:00
e4c60d70b0
Merge remote-tracking branch 'mike/master' into dev
2018-12-17 10:12:53 +01:00
04a45a407e
default curl to http/1.1
2018-12-16 14:38:58 -08:00
3ed6763da9
Merge branch 'custom-item-types' into 'dev'
...
Add ITEM_TYPE_CUSTOM and hooks for processing custom item types
See merge request hubzilla/core!1431
2018-12-15 20:55:28 +01:00
09b2cdd618
Add ITEM_TYPE_CUSTOM and hooks for processing custom item types
2018-12-14 20:20:26 -05:00
3416190e4b
Set min/maxversion for plugins to STD_VERSION unless otherwise specified
2018-12-14 14:22:28 -05:00
c771d2809f
Merge remote-tracking branch 'mike/master' into dev
2018-12-14 10:28:55 +01:00
fc78206049
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
2018-12-13 16:13:13 -08:00
6464099364
regression: the ability to order apps messed up since adding pinned apps to the ordering
2018-12-12 19:11:30 -08:00
993db01400
return on readImageBlob() exception
2018-12-11 12:21:09 +01:00
15a689c6f5
Merge remote-tracking branch 'mike/master' into dev
2018-12-10 10:38:06 +01:00
214b81e491
rmagic discovery for z6 networks
2018-12-09 16:37:15 -08:00
Mario Vavti
M. Dent
Klaus Weidenbach
zotlabs
DM42.Net (Matt Dent)
Max Kostikov
phani00