Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | 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 | |
| | | | ||||||
* | | | Merge branch 'fix_homeinstall_for_Debian_10' into 'dev' | Mario | 2019-09-18 | 2 | -78/+102 | |
|\ \ \ | | | | | | | | | | | | | | | | | Fix homeinstall for debian 10 See merge request hubzilla/core!1725 | |||||
| * | | | hominstall - readme | OJ Random | 2019-09-14 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | hominstall - fix url rewriting and minor changes. | OJ Random | 2019-09-14 | 2 | -77/+101 | |
| | | | | ||||||
* | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-09-15 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | Prevent image blurring See merge request hubzilla/core!1726 | |||||
| * | | Prevent image blurring | Max Kostikov | 2019-09-15 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-09-10 | 1 | -2/+2 | |
|\| | | | | | | | | | | | | | | Add selected text quote on comment reply See merge request hubzilla/core!1724 | |||||
| * | | Add selected text quote on comment reply | Max Kostikov | 2019-09-09 | 1 | -2/+2 | |
| | | | ||||||
* | | | Merge branch 'daemon-qwfix' into 'dev' | Max Kostikov | 2019-09-10 | 4 | -6/+6 | |
|\ \ \ | | | | | | | | | | | | | | | | | Return in the case of further processing See merge request hubzilla/core!1711 | |||||
| * | | | Return in the case of further processing | DM42.Net Zap Dev | 2019-08-19 | 4 | -6/+6 | |
| | | | | ||||||
* | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-09-10 | 2 | -8/+17 | |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | Zot -> Zot6 translation issue, liking a "new friend" activity See merge request hubzilla/core!1723 | |||||
| * | | | Zot -> Zot6 translation issue, liking a "new friend" activity | zotlabs | 2019-09-03 | 2 | -8/+17 | |
| | | | | ||||||
* | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-09-03 | 1 | -0/+12 | |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | Add CalDAV / CardDAV autodiscovery See merge request hubzilla/core!1719 | |||||
| * | | | Update Well_known.php | Max Kostikov | 2019-08-30 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Add CalDAV / CardDAV autodiscovery | Max Kostikov | 2019-08-30 | 1 | -0/+12 | |
| | | | | ||||||
* | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-09-03 | 2 | -0/+24 | |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | improved conversion of emoji reactions from zot to zot6 See merge request hubzilla/core!1720 | |||||
| * | | | Clarify private mail deletion policy. Related to issue #1391. | zotlabs | 2019-08-31 | 1 | -0/+5 | |
| | | | | ||||||
| * | | | improved conversion of emoji reactions from zot to zot6 | zotlabs | 2019-08-31 | 1 | -0/+19 | |
| | | | | ||||||
* | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-09-03 | 6 | -7/+7 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | More nofollow tags to discourage backlink farmers See merge request hubzilla/core!1722 | |||||
| * | | | | More nofollow tags to discourage backlink farmers | Terrox | 2019-09-03 | 6 | -7/+7 | |
|/ / / / | ||||||
* | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-08-24 | 1 | -1/+1 | |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | Better spoiler BBcode tag conversion to Markdown See merge request hubzilla/core!1718 | |||||
| * | | | Better spoiler BBcode tag conversion to Markdown | Max Kostikov | 2019-08-23 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-08-23 | 2 | -2/+2 | |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | issues with image import to zot6 - wrong mid. Also label source project of... See merge request hubzilla/core!1717 | |||||
| * | | | issues with image import to zot6 - wrong mid. Also label source project of ↵ | zotlabs | 2019-08-22 | 2 | -2/+2 | |
|/ / / | | | | | | | | | | zotfeed since it is not completely compatible across projects. |