aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add Opengraph functionMax Kostikov2019-10-121-0/+68
|
* Minor Opengraph improvementsMax Kostikov2019-10-111-3/+5
|
* Add Opengraph og:type objectMax Kostikov2019-10-111-0/+2
|
* Better Opengraph markup for channelMax Kostikov2019-10-111-11/+38
|
* Merge branch 'dev' into 'dev'Max Kostikov2019-10-063-3/+16
|\ | | | | | | | | Dev sync See merge request kostikov/core!1
| * Merge branch 'cherry-pick-d8b8d8ce' into 'dev'Max Kostikov2019-10-061-1/+2
| |\ | | | | | | | | | | | | fix zap->hubzlla event title compatibility See merge request hubzilla/core!1749
| | * fix zap->hubzlla event title compatibilityMario Vavti2019-10-051-1/+2
| |/ | | | | (cherry picked from commit d8b8d8ceb5cc9d701f91dac26834af15f3257cce)
| * Merge branch 'dev' into 'dev'Mario2019-10-052-7/+4
| |\ | | | | | | | | | | | | Allow addons to process forum posts published through mentions See merge request hubzilla/core!1745
| | * Allow addons to process forum posts published through mentionsMax Kostikov2019-10-052-7/+4
| |/
| * Merge branch 'cherry-pick-79bcc157' into 'dev'Mario2019-10-052-0/+7
| |\ | | | | | | | | | | | | fix bbcode event reshare timezone issue See merge request hubzilla/core!1747
| | * fix bbcode event reshare timezone issueMario Vavti2019-10-042-0/+7
| | | | | | | | | (cherry picked from commit 79bcc157bf8f0c67a8ee41ae9c53a9dec969f8d1)
| * | Merge branch 'dev' into 'dev'Mario2019-10-051-2/+7
| |\ \ | | |/ | |/| | | | | | | another timezone fix See merge request hubzilla/core!1748
| | * another timezone fixZot2019-10-051-2/+7
| |/
* | Revert "Remove visible channels list from pubstream tags cloud creation ↵Max Kostikov2019-10-061-3/+2
| | | | | | | | | | procedure" This reverts commit 5c4c6e68f600d50deed8ddb32dd6702af9b52853
* | Remove visible channels list from pubstream tags cloud creation procedureMax Kostikov2019-10-061-2/+3
| |
* | Allow processing of forum posts through mentions in addonsMax Kostikov2019-10-031-1/+1
| |
* | Get extended channel info using channelx_by_hash()Max Kostikov2019-10-031-5/+2
| |
* | Allow processing of forum posts through mentions in addonsMax Kostikov2019-10-031-1/+1
|/
* Merge branch 'cherry-pick-2c7ed093' into 'dev'Max Kostikov2019-10-021-3/+2
|\ | | | | | | | | fix missing summary in mod article_edit See merge request hubzilla/core!1744
| * fix missing summary in mod article_editMario Vavti2019-10-021-3/+2
|/ | | (cherry picked from commit 2c7ed093699ea0c0f68068fdd8a035454b9a76a3)
* Merge branch 'dev' into 'dev'Mario2019-10-014-13941/+14039
|\ | | | | | | | | Add 'Connect' button for not connected at this location channels See merge request hubzilla/core!1743
| * Add 'Connect' button for not connected at this location channelsMax Kostikov2019-10-014-13941/+14039
|/
* Merge branch 'dev' into 'dev'Max Kostikov2019-09-301-8/+10
|\ | | | | | | | | Fix empty string quotation; remove trailing spaces See merge request hubzilla/core!1742
| * Fix empty string quotation; remove trailing spaces Max Kostikov2019-09-301-8/+10
|/
* Merge branch 'dev' into 'dev'Mario2019-09-302-8/+19
|\ | | | | | | | | Sync private items with clones; avoid sync if no local connection with thread owner See merge request hubzilla/core!1739
| * Sync private items with clones; avoid sync if no local connection with ↵Max Kostikov2019-09-302-8/+19
|/ | | | thread owner
* Merge branch 'dev' into 'dev'Mario2019-09-281-0/+1
|\ | | | | | | | | issue with bearcap tests See merge request hubzilla/core!1738
| * issue with bearcap testszotlabs2019-09-261-0/+1
| |
* | Merge branch 'admindoc' into 'dev'M. Dent2019-09-243-9/+36
|\ \ | | | | | | | | | | | | Improve admin documentation See merge request hubzilla/core!1737
| * | Improve admin documentationAle Abdo2019-09-243-9/+36
|/ /
* | Merge branch 'dev' into 'dev'M. Dent2019-09-231-1/+1
|\ \ | | | | | | | | | | | | Update plink type for MySQL schema See merge request hubzilla/core!1736
| * | Update schema_mysql.sqlMax Kostikov2019-09-231-1/+1
| | |
| * | Update plink type for MySQLMax Kostikov2019-09-231-1/+1
| | |
* | | Merge branch 'cherry-pick-9aa928ec' into 'dev'M. Dent2019-09-236-21/+55
|\ \ \ | | | | | | | | | | | | | | | | composer update simplepie/simplepie See merge request hubzilla/core!1735
| * | | composer update simplepie/simplepieMario Vavti2019-09-236-21/+55
| | | | | | | | | | | | (cherry picked from commit 9aa928ec8f378c6df2a0c8bbe892ff971c3bc672)
* | | | Merge branch 'cherry-pick-e4336578' into 'dev'M. Dent2019-09-237-25/+56
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | composer update vendor/league/html-to-markdown/.github/ See merge request hubzilla/core!1734
| * | | | composer update vendor/league/html-to-markdown/.github/Mario Vavti2019-09-237-25/+56
| |/ / / | | | | | | | | (cherry picked from commit e4336578388b3e59ba8130123649ccdc9b8487d0)
* | | | Merge branch 'cherry-pick-38cb094e' into 'dev'M. Dent2019-09-233-0/+130
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | composer update ezyang/htmlpurifier See merge request hubzilla/core!1733
| * | | | composer update ezyang/htmlpurifierMario Vavti2019-09-233-0/+130
| |/ / / | | | | | | | | (cherry picked from commit 38cb094ede8a389ef0b8bb331c1e6a3befd666a8)
* | | | Merge branch 'cherry-pick-a34ce790' into 'dev'M. Dent2019-09-2332-327/+318
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | composer update ezyang/htmlpurifier See merge request hubzilla/core!1732
| * | | | composer update ezyang/htmlpurifierMario Vavti2019-09-2332-327/+318
| |/ / / | | | | | | | | (cherry picked from commit a34ce790129bdd729a5019895ea6cd4c59f08ba4)
* | | | Merge branch 'cherry-pick-53b8ee78' into 'dev'M. Dent2019-09-237-23/+60
|\ \ \ \ | |/ / / |/| | | | | | | | | | | composer update blueimp/jquery-file-upload See merge request hubzilla/core!1731
| * | | composer update blueimp/jquery-file-uploadMario Vavti2019-09-237-23/+60
|/ / / | | | | | | (cherry picked from commit 53b8ee7866eb1394980b08b90153a63563832391)
* | | Merge branch 'customitem-delivery' into 'dev'Mario2019-09-2310-30/+88
|\ \ \ | | | | | | | | | | | | | | | | Notify on custom items - rework hooks See merge request hubzilla/core!1730
| * | | Notify on custom items - rework hooksM. Dent2019-09-2310-30/+88
|/ / /
* | | Merge branch 'encode-comment-policy' into 'dev'Mario2019-09-232-0/+63
|\ \ \ | | | | | | | | | | | | | | | | Encode comment policy into AS(Z6) packets. See merge request hubzilla/core!1729
| * | | Add dependencyDM42.Net Zap Dev2019-09-211-0/+1
| | | |
| * | | comment policy default for ordered itemsDM42.Net Zap Dev2019-09-211-0/+21
| | | |
| * | | encode/decode comment_policy for Z6DM42.Net Zap Dev2019-09-212-0/+41
|/ / /
* | | Merge branch 'cherry-pick-394f263d' into 'dev'Max Kostikov2019-09-191-1/+6
|\ \ \ | | | | | | | | | | | | | | | | fix issue #1331 See merge request hubzilla/core!1728