Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2019-10-05 | 2 | -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 mentions | Max Kostikov | 2019-10-05 | 2 | -7/+4 | |
|/ / / | ||||||
* | | | Merge branch 'cherry-pick-79bcc157' into 'dev' | Mario | 2019-10-05 | 2 | -0/+7 | |
|\ \ \ | | | | | | | | | | | | | | | | | fix bbcode event reshare timezone issue See merge request hubzilla/core!1747 | |||||
| * | | | fix bbcode event reshare timezone issue | Mario Vavti | 2019-10-04 | 2 | -0/+7 | |
| | | | | | | | | | | | | (cherry picked from commit 79bcc157bf8f0c67a8ee41ae9c53a9dec969f8d1) | |||||
* | | | | Merge branch 'dev' into 'dev' | Mario | 2019-10-05 | 1 | -2/+7 | |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | another timezone fix See merge request hubzilla/core!1748 | |||||
| * | | | another timezone fix | Zot | 2019-10-05 | 1 | -2/+7 | |
|/ / / | ||||||
| * | | Revert "Remove visible channels list from pubstream tags cloud creation ↵ | Max Kostikov | 2019-10-06 | 1 | -3/+2 | |
| | | | | | | | | | | | | | | | procedure" This reverts commit 5c4c6e68f600d50deed8ddb32dd6702af9b52853 | |||||
| * | | Remove visible channels list from pubstream tags cloud creation procedure | Max Kostikov | 2019-10-06 | 1 | -2/+3 | |
| | | | ||||||
| * | | Allow processing of forum posts through mentions in addons | Max Kostikov | 2019-10-03 | 1 | -1/+1 | |
| | | | ||||||
| * | | Get extended channel info using channelx_by_hash() | Max Kostikov | 2019-10-03 | 1 | -5/+2 | |
| | | | ||||||
| * | | Allow processing of forum posts through mentions in addons | Max Kostikov | 2019-10-03 | 1 | -1/+1 | |
|/ / | ||||||
| * | Merge branch 'dev' of https://framagit.org/zot/core into dev | zotlabs | 2019-10-04 | 1 | -0/+1 | |
| |\ | ||||||
| | * | fix event timezones for zot6 | zotlabs | 2019-10-03 | 1 | -0/+13 | |
| | | | ||||||
| | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-09-26 | 80 | -423/+835 | |
| | |\ | ||||||
| * | | | another timezone fix | zotlabs | 2019-10-04 | 1 | -2/+6 | |
|/ / / | ||||||
* | | | Merge branch 'cherry-pick-2c7ed093' into 'dev' | Max Kostikov | 2019-10-02 | 1 | -3/+2 | |
|\ \ \ | | | | | | | | | | | | | | | | | fix missing summary in mod article_edit See merge request hubzilla/core!1744 | |||||
| * | | | fix missing summary in mod article_edit | Mario Vavti | 2019-10-02 | 1 | -3/+2 | |
|/ / / | | | | | | | (cherry picked from commit 2c7ed093699ea0c0f68068fdd8a035454b9a76a3) | |||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2019-10-01 | 4 | -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 channels | Max Kostikov | 2019-10-01 | 4 | -13941/+14039 | |
|/ / / | ||||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-09-30 | 1 | -8/+10 | |
|\ \ \ | | | | | | | | | | | | | | | | | Fix empty string quotation; remove trailing spaces See merge request hubzilla/core!1742 | |||||
| * | | | Fix empty string quotation; remove trailing spaces | Max Kostikov | 2019-09-30 | 1 | -8/+10 | |
|/ / / | ||||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2019-09-30 | 2 | -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 Kostikov | 2019-09-30 | 2 | -8/+19 | |
|/ / / | | | | | | | | | | thread owner | |||||
* | / | Merge branch 'dev' into 'dev' | Mario | 2019-09-28 | 1 | -0/+1 | |
|\| | | |/ |/| | | | | | issue with bearcap tests See merge request hubzilla/core!1738 | |||||
| * | issue with bearcap tests | zotlabs | 2019-09-26 | 1 | -0/+1 | |
| | | ||||||
* | | Merge branch 'admindoc' into 'dev' | M. Dent | 2019-09-24 | 3 | -9/+36 | |
|\ \ | | | | | | | | | | | | | Improve admin documentation See merge request hubzilla/core!1737 | |||||
| * | | Improve admin documentation | Ale Abdo | 2019-09-24 | 3 | -9/+36 | |
|/ / | ||||||
* | | Merge branch 'dev' into 'dev' | M. Dent | 2019-09-23 | 1 | -1/+1 | |
|\ \ | | | | | | | | | | | | | Update plink type for MySQL schema See merge request hubzilla/core!1736 | |||||
| * | | Update schema_mysql.sql | Max Kostikov | 2019-09-23 | 1 | -1/+1 | |
| | | | ||||||
| * | | Update plink type for MySQL | Max Kostikov | 2019-09-23 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'cherry-pick-9aa928ec' into 'dev' | M. Dent | 2019-09-23 | 6 | -21/+55 | |
|\ \ \ | | | | | | | | | | | | | | | | | composer update simplepie/simplepie See merge request hubzilla/core!1735 | |||||
| * | | | composer update simplepie/simplepie | Mario Vavti | 2019-09-23 | 6 | -21/+55 | |
| | | | | | | | | | | | | (cherry picked from commit 9aa928ec8f378c6df2a0c8bbe892ff971c3bc672) | |||||
* | | | | Merge branch 'cherry-pick-e4336578' into 'dev' | M. Dent | 2019-09-23 | 7 | -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 Vavti | 2019-09-23 | 7 | -25/+56 | |
| |/ / / | | | | | | | | | (cherry picked from commit e4336578388b3e59ba8130123649ccdc9b8487d0) | |||||
* | | | | Merge branch 'cherry-pick-38cb094e' into 'dev' | M. Dent | 2019-09-23 | 3 | -0/+130 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | composer update ezyang/htmlpurifier See merge request hubzilla/core!1733 | |||||
| * | | | | composer update ezyang/htmlpurifier | Mario Vavti | 2019-09-23 | 3 | -0/+130 | |
| |/ / / | | | | | | | | | (cherry picked from commit 38cb094ede8a389ef0b8bb331c1e6a3befd666a8) | |||||
* | | | | Merge branch 'cherry-pick-a34ce790' into 'dev' | M. Dent | 2019-09-23 | 32 | -327/+318 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | composer update ezyang/htmlpurifier See merge request hubzilla/core!1732 | |||||
| * | | | | composer update ezyang/htmlpurifier | Mario Vavti | 2019-09-23 | 32 | -327/+318 | |
| |/ / / | | | | | | | | | (cherry picked from commit a34ce790129bdd729a5019895ea6cd4c59f08ba4) | |||||
* | | | | Merge branch 'cherry-pick-53b8ee78' into 'dev' | M. Dent | 2019-09-23 | 7 | -23/+60 | |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | composer update blueimp/jquery-file-upload See merge request hubzilla/core!1731 | |||||
| * | | | composer update blueimp/jquery-file-upload | Mario Vavti | 2019-09-23 | 7 | -23/+60 | |
|/ / / | | | | | | | (cherry picked from commit 53b8ee7866eb1394980b08b90153a63563832391) | |||||
* | | | Merge branch 'customitem-delivery' into 'dev' | Mario | 2019-09-23 | 10 | -30/+88 | |
|\ \ \ | | | | | | | | | | | | | | | | | Notify on custom items - rework hooks See merge request hubzilla/core!1730 | |||||
| * | | | Notify on custom items - rework hooks | M. Dent | 2019-09-23 | 10 | -30/+88 | |
|/ / / | ||||||
* | | | Merge branch 'encode-comment-policy' into 'dev' | Mario | 2019-09-23 | 2 | -0/+63 | |
|\ \ \ | | | | | | | | | | | | | | | | | Encode comment policy into AS(Z6) packets. See merge request hubzilla/core!1729 | |||||
| * | | | Add dependency | DM42.Net Zap Dev | 2019-09-21 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | comment policy default for ordered items | DM42.Net Zap Dev | 2019-09-21 | 1 | -0/+21 | |
| | | | | ||||||
| * | | | encode/decode comment_policy for Z6 | DM42.Net Zap Dev | 2019-09-21 | 2 | -0/+41 | |
|/ / / | ||||||
* | | | Merge branch 'cherry-pick-394f263d' into 'dev' | Max Kostikov | 2019-09-19 | 1 | -1/+6 | |
|\ \ \ | | | | | | | | | | | | | | | | | fix issue #1331 See merge request hubzilla/core!1728 | |||||
| * | | | fix issue #1331 | Mario Vavti | 2019-09-19 | 1 | -1/+6 | |
|/ / / | | | | | | | (cherry picked from commit 394f263ddd648e25ff3967bfbe3b0e25dccf89a0) | |||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2019-09-18 | 1 | -2/+9 | |
|\ \ \ | | |/ | |/| | | | | | | | change event formatting slightly for Zot6 and ActivityStreams. See merge request hubzilla/core!1727 | |||||
| * | | change event formatting slightly for Zot6 and ActivityStreams. | zotlabs | 2019-09-16 | 1 | -2/+9 | |
| | | |