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 |
|
DM42.Net Zap Dev
|
6fe4ac241d
|
encode/decode comment_policy for Z6
|
2019-09-21 13:30:42 -04:00 |
|
Max Kostikov
|
c385b80807
|
Merge branch 'cherry-pick-394f263d' into 'dev'
fix issue #1331
See merge request hubzilla/core!1728
|
2019-09-19 12:41:47 +02:00 |
|
Mario Vavti
|
97f36fa46f
|
fix issue #1331
(cherry picked from commit 394f263ddd648e25ff3967bfbe3b0e25dccf89a0)
|
2019-09-19 12:34:01 +02:00 |
|
Mario
|
856d4b39d1
|
Merge branch 'dev' into 'dev'
change event formatting slightly for Zot6 and ActivityStreams.
See merge request hubzilla/core!1727
|
2019-09-18 12:43:45 +02:00 |
|
Mario
|
01abd73a2a
|
Merge branch 'fix_homeinstall_for_Debian_10' into 'dev'
Fix homeinstall for debian 10
See merge request hubzilla/core!1725
|
2019-09-18 12:42:56 +02:00 |
|
zotlabs
|
375c2a87c7
|
change event formatting slightly for Zot6 and ActivityStreams.
|
2019-09-16 23:27:41 -07:00 |
|
Max Kostikov
|
6ca507f8dd
|
Merge branch 'dev' into 'dev'
Prevent image blurring
See merge request hubzilla/core!1726
|
2019-09-15 09:23:22 +02:00 |
|
Max Kostikov
|
86b4a53858
|
Prevent image blurring
|
2019-09-15 09:18:42 +02:00 |
|
OJ Random
|
8959ba9b82
|
hominstall - readme
|
2019-09-14 19:14:31 +02:00 |
|
OJ Random
|
a62a230d3d
|
hominstall - fix url rewriting and minor changes.
|
2019-09-14 19:09:26 +02:00 |
|
Max Kostikov
|
cc45129e9f
|
Merge branch 'dev' into 'dev'
Add selected text quote on comment reply
See merge request hubzilla/core!1724
|
2019-09-10 10:41:53 +02:00 |
|
Max Kostikov
|
bffc9d5aba
|
Merge branch 'daemon-qwfix' into 'dev'
Return in the case of further processing
See merge request hubzilla/core!1711
|
2019-09-10 10:41:34 +02:00 |
|
Max Kostikov
|
f2b121cd58
|
Merge branch 'dev' into 'dev'
Zot -> Zot6 translation issue, liking a "new friend" activity
See merge request hubzilla/core!1723
|
2019-09-10 10:40:53 +02:00 |
|
Max Kostikov
|
fd30be7644
|
Add selected text quote on comment reply
|
2019-09-09 12:35:47 +02:00 |
|
zotlabs
|
d9052c7e3c
|
Zot -> Zot6 translation issue, liking a "new friend" activity
|
2019-09-03 17:00:10 -07:00 |
|
Max Kostikov
|
dcfe10b691
|
Merge branch 'dev' into 'dev'
Add CalDAV / CardDAV autodiscovery
See merge request hubzilla/core!1719
|
2019-09-03 14:33:37 +02:00 |
|
Max Kostikov
|
914a096b42
|
Merge branch 'dev' into 'dev'
improved conversion of emoji reactions from zot to zot6
See merge request hubzilla/core!1720
|
2019-09-03 14:33:09 +02:00 |
|
Max Kostikov
|
5fa9dcbc7e
|
Merge branch 'dev' into 'dev'
More nofollow tags to discourage backlink farmers
See merge request hubzilla/core!1722
|
2019-09-03 14:32:52 +02:00 |
|
Terrox
|
93ec01e0a1
|
More nofollow tags to discourage backlink farmers
|
2019-09-03 14:32:52 +02:00 |
|
zotlabs
|
bbc98db6b4
|
Clarify private mail deletion policy. Related to issue #1391.
|
2019-08-31 14:43:08 -07:00 |
|
zotlabs
|
1f8d29a221
|
improved conversion of emoji reactions from zot to zot6
|
2019-08-31 14:04:10 -07:00 |
|
Max Kostikov
|
d267dd2515
|
Update Well_known.php
|
2019-08-30 00:55:36 +02:00 |
|
Max Kostikov
|
51954c7f3d
|
Add CalDAV / CardDAV autodiscovery
|
2019-08-30 00:51:46 +02:00 |
|
Max Kostikov
|
df842a8e8d
|
Merge branch 'dev' into 'dev'
Better spoiler BBcode tag conversion to Markdown
See merge request hubzilla/core!1718
|
2019-08-24 00:00:58 +02:00 |
|
Max Kostikov
|
60919488f1
|
Better spoiler BBcode tag conversion to Markdown
|
2019-08-23 23:58:07 +02:00 |
|
Max Kostikov
|
4dbaaa63bb
|
Merge branch 'dev' into 'dev'
issues with image import to zot6 - wrong mid. Also label source project of...
See merge request hubzilla/core!1717
|
2019-08-23 23:09:14 +02:00 |
|
zotlabs
|
8cc4003837
|
issues with image import to zot6 - wrong mid. Also label source project of zotfeed since it is not completely compatible across projects.
|
2019-08-22 19:39:11 -07:00 |
|
Max Kostikov
|
35790c584b
|
Merge branch 'dev' into 'dev'
possible for DB to return hublocs with no sitekey
See merge request hubzilla/core!1713
|
2019-08-22 20:29:53 +02:00 |
|
Max Kostikov
|
09d7cf2cc1
|
Merge branch 'dev' into 'dev'
Fix attach permissions sync for clonned channel
See merge request hubzilla/core!1716
|
2019-08-22 20:25:57 +02:00 |
|
Max Kostikov
|
58d7c7f6ae
|
Fix attach permissions sync for clonned channel
|
2019-08-22 20:20:54 +02:00 |
|
Max Kostikov
|
cab24836d8
|
Merge branch 'dev' into 'dev'
Fix spoiler displaying while convert BBcode to markdown
See merge request hubzilla/core!1715
|
2019-08-22 20:20:44 +02:00 |
|
Max Kostikov
|
cf9ef615c9
|
Fix spoiler displaying while convert BBcode to markdown
|
2019-08-22 20:17:22 +02:00 |
|
zotlabs
|
8c96032b2b
|
Merge branch 'dev' of https://framagit.org/zot/core into dev
|
2019-08-21 18:51:25 -07:00 |
|
zotlabs
|
d256551907
|
possible for DB to return hublocs with no sitekey
|
2019-08-21 18:50:38 -07:00 |
|
DM42.Net Zap Dev
|
e800e2db2b
|
Return in the case of further processing
|
2019-08-19 23:13:19 -04:00 |
|
Mario Vavti
|
e5539c0d01
|
update changelog
|
2019-08-16 20:19:49 +02:00 |
|
Mario
|
ea8621d6ec
|
Merge branch 'dev' into 'dev'
zot6 compatibility: when posting from a non-primary clone the actor->id is...
See merge request hubzilla/core!1710
|
2019-08-16 19:32:08 +02:00 |
|
zotlabs
|
ac05a2ede7
|
support "bearcaps" in Activity library
|
2019-08-15 21:30:47 -07:00 |
|