M. Dent
|
bef5324fea
|
Merge branch 'cherry-pick-cac0672a' into 'dev'
issue #1401
See merge request hubzilla/core!1750
|
2019-10-08 14:26:17 +02:00 |
|
Mario Vavti
|
c2655370e0
|
issue #1401
(cherry picked from commit cac0672a49cd710b3eced1d66f1bfb18747ddbf8)
|
2019-10-08 11:28:36 +02:00 |
|
Max Kostikov
|
d017e34795
|
Merge branch 'dev' into 'dev'
Dev sync
See merge request kostikov/core!1
|
2019-10-06 19:26:23 +02:00 |
|
Max Kostikov
|
aa44da35ba
|
Revert "Remove visible channels list from pubstream tags cloud creation procedure"
This reverts commit 5c4c6e68f6
|
2019-10-06 19:24:28 +02:00 |
|
Max Kostikov
|
5c4c6e68f6
|
Remove visible channels list from pubstream tags cloud creation procedure
|
2019-10-06 12:02:45 +02:00 |
|
Max Kostikov
|
a435363b94
|
Merge branch 'cherry-pick-d8b8d8ce' into 'dev'
fix zap->hubzlla event title compatibility
See merge request hubzilla/core!1749
|
2019-10-06 11:18:35 +02:00 |
|
Mario Vavti
|
d6634eb14e
|
fix zap->hubzlla event title compatibility
(cherry picked from commit d8b8d8ceb5cc9d701f91dac26834af15f3257cce)
|
2019-10-05 22:04:23 +02:00 |
|
Mario
|
afee2cf71a
|
Merge branch 'dev' into 'dev'
Allow addons to process forum posts published through mentions
See merge request hubzilla/core!1745
|
2019-10-05 10:31:47 +02:00 |
|
Max Kostikov
|
79b0a6ba9c
|
Allow addons to process forum posts published through mentions
|
2019-10-05 10:31:47 +02:00 |
|
Mario
|
0c2438b36a
|
Merge branch 'cherry-pick-79bcc157' into 'dev'
fix bbcode event reshare timezone issue
See merge request hubzilla/core!1747
|
2019-10-05 10:31:26 +02:00 |
|
Mario
|
d6da46f94b
|
Merge branch 'dev' into 'dev'
another timezone fix
See merge request hubzilla/core!1748
|
2019-10-05 10:31:11 +02:00 |
|
Zot
|
562e39c9c5
|
another timezone fix
|
2019-10-05 10:31:11 +02:00 |
|
zotlabs
|
2d08e0955a
|
Merge branch 'dev' of https://framagit.org/zot/core into dev
|
2019-10-04 14:31:21 -07:00 |
|
zotlabs
|
baffa969d3
|
another timezone fix
|
2019-10-04 14:28:31 -07:00 |
|
Mario Vavti
|
1fbc8739b9
|
fix bbcode event reshare timezone issue
(cherry picked from commit 79bcc157bf8f0c67a8ee41ae9c53a9dec969f8d1)
|
2019-10-04 09:25:39 +02:00 |
|
zotlabs
|
b9dec84489
|
fix event timezones for zot6
|
2019-10-03 22:16:11 -07:00 |
|
Max Kostikov
|
6feb864c38
|
Allow processing of forum posts through mentions in addons
|
2019-10-03 18:28:29 +02:00 |
|
Max Kostikov
|
b6db1898b1
|
Get extended channel info using channelx_by_hash()
|
2019-10-03 18:27:25 +02:00 |
|
Max Kostikov
|
de902d179e
|
Allow processing of forum posts through mentions in addons
|
2019-10-03 18:25:57 +02:00 |
|
Max Kostikov
|
58b77e3427
|
Merge branch 'cherry-pick-2c7ed093' into 'dev'
fix missing summary in mod article_edit
See merge request hubzilla/core!1744
|
2019-10-02 11:43:41 +02:00 |
|
Mario Vavti
|
cdcac86256
|
fix missing summary in mod article_edit
(cherry picked from commit 2c7ed093699ea0c0f68068fdd8a035454b9a76a3)
|
2019-10-02 11:05:24 +02:00 |
|
Mario
|
79b05e48e8
|
Merge branch 'dev' into 'dev'
Add 'Connect' button for not connected at this location channels
See merge request hubzilla/core!1743
|
2019-10-01 11:15:29 +02:00 |
|
Max Kostikov
|
541146e8ce
|
Add 'Connect' button for not connected at this location channels
|
2019-10-01 11:15:29 +02:00 |
|
Max Kostikov
|
97b161c536
|
Merge branch 'dev' into 'dev'
Fix empty string quotation; remove trailing spaces
See merge request hubzilla/core!1742
|
2019-09-30 16:54:35 +02:00 |
|
Max Kostikov
|
ba3a6ecb52
|
Fix empty string quotation; remove trailing spaces
|
2019-09-30 16:50:24 +02:00 |
|
Mario
|
cf27b7440d
|
Merge branch 'dev' into 'dev'
Sync private items with clones; avoid sync if no local connection with thread owner
See merge request hubzilla/core!1739
|
2019-09-30 16:19:39 +02:00 |
|
Max Kostikov
|
407b9c9cd7
|
Sync private items with clones; avoid sync if no local connection with thread owner
|
2019-09-30 16:19:39 +02:00 |
|
Mario
|
d0055310ba
|
Merge branch 'dev' into 'dev'
issue with bearcap tests
See merge request hubzilla/core!1738
|
2019-09-28 10:36:38 +02:00 |
|
zotlabs
|
02f5fa32af
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-09-26 18:36:06 -07:00 |
|
zotlabs
|
b6590e95b5
|
issue with bearcap tests
|
2019-09-26 18:34:08 -07:00 |
|
M. Dent
|
ec65211d54
|
Merge branch 'admindoc' into 'dev'
Improve admin documentation
See merge request hubzilla/core!1737
|
2019-09-24 23:36:32 +02:00 |
|
Ale Abdo
|
8dfa08f146
|
Improve admin documentation
|
2019-09-24 15:37:47 +02:00 |
|
M. Dent
|
daef2d0546
|
Merge branch 'dev' into 'dev'
Update plink type for MySQL schema
See merge request hubzilla/core!1736
|
2019-09-23 19:21:27 +02:00 |
|
M. Dent
|
15eaa80301
|
Merge branch 'cherry-pick-9aa928ec' into 'dev'
composer update simplepie/simplepie
See merge request hubzilla/core!1735
|
2019-09-23 19:20:45 +02:00 |
|
M. Dent
|
1e924a8530
|
Merge branch 'cherry-pick-e4336578' into 'dev'
composer update vendor/league/html-to-markdown/.github/
See merge request hubzilla/core!1734
|
2019-09-23 19:18:53 +02:00 |
|
M. Dent
|
23995ccb07
|
Merge branch 'cherry-pick-38cb094e' into 'dev'
composer update ezyang/htmlpurifier
See merge request hubzilla/core!1733
|
2019-09-23 19:16:59 +02:00 |
|
M. Dent
|
a4f2603454
|
Merge branch 'cherry-pick-a34ce790' into 'dev'
composer update ezyang/htmlpurifier
See merge request hubzilla/core!1732
|
2019-09-23 19:16:38 +02:00 |
|
M. Dent
|
cc860b4a76
|
Merge branch 'cherry-pick-53b8ee78' into 'dev'
composer update blueimp/jquery-file-upload
See merge request hubzilla/core!1731
|
2019-09-23 19:08:47 +02:00 |
|
Max Kostikov
|
0be82602ce
|
Update schema_mysql.sql
|
2019-09-23 14:23:47 +02:00 |
|
Max Kostikov
|
b42c42692e
|
Update plink type for MySQL
|
2019-09-23 14:14:02 +02:00 |
|
Mario Vavti
|
7fcbff3ceb
|
composer update simplepie/simplepie
(cherry picked from commit 9aa928ec8f378c6df2a0c8bbe892ff971c3bc672)
|
2019-09-23 12:22:35 +02:00 |
|
Mario Vavti
|
efec0af394
|
composer update vendor/league/html-to-markdown/.github/
(cherry picked from commit e4336578388b3e59ba8130123649ccdc9b8487d0)
|
2019-09-23 12:22:08 +02:00 |
|
Mario Vavti
|
aafecd9d1e
|
composer update ezyang/htmlpurifier
(cherry picked from commit 38cb094ede8a389ef0b8bb331c1e6a3befd666a8)
|
2019-09-23 12:21:04 +02:00 |
|
Mario Vavti
|
e37c43ea06
|
composer update ezyang/htmlpurifier
(cherry picked from commit a34ce790129bdd729a5019895ea6cd4c59f08ba4)
|
2019-09-23 12:20:28 +02:00 |
|
Mario Vavti
|
3fac7b5bb7
|
composer update blueimp/jquery-file-upload
(cherry picked from commit 53b8ee7866eb1394980b08b90153a63563832391)
|
2019-09-23 12:19:33 +02:00 |
|
Mario
|
9b90114d03
|
Merge branch 'customitem-delivery' into 'dev'
Notify on custom items - rework hooks
See merge request hubzilla/core!1730
|
2019-09-23 10:11:27 +02:00 |
|
M. Dent
|
7c5cfe6697
|
Notify on custom items - rework hooks
|
2019-09-23 10:11:27 +02:00 |
|
Mario
|
d1fd69337f
|
Merge branch 'encode-comment-policy' into 'dev'
Encode comment policy into AS(Z6) packets.
See merge request hubzilla/core!1729
|
2019-09-23 10:10:56 +02:00 |
|
DM42.Net Zap Dev
|
3fc218111a
|
Add dependency
|
2019-09-21 23:03:42 -04:00 |
|
DM42.Net Zap Dev
|
c63fb0fc6b
|
comment policy default for ordered items
|
2019-09-21 13:37:20 -04:00 |
|