| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'cherry-pick-e4336578' into 'dev' | M. Dent | 2019-09-23 | 7 | -25/+56 |
| |\ | |||||
| | * | composer update vendor/league/html-to-markdown/.github/ | Mario Vavti | 2019-09-23 | 7 | -25/+56 |
| * | | Merge branch 'cherry-pick-38cb094e' into 'dev' | M. Dent | 2019-09-23 | 3 | -0/+130 |
| |\ \ | |||||
| | * | | composer update ezyang/htmlpurifier | Mario Vavti | 2019-09-23 | 3 | -0/+130 |
| | |/ | |||||
| * | | Merge branch 'cherry-pick-a34ce790' into 'dev' | M. Dent | 2019-09-23 | 32 | -327/+318 |
| |\ \ | |||||
| | * | | composer update ezyang/htmlpurifier | Mario Vavti | 2019-09-23 | 32 | -327/+318 |
| | |/ | |||||
| * | | Merge branch 'cherry-pick-53b8ee78' into 'dev' | M. Dent | 2019-09-23 | 7 | -23/+60 |
| |\ \ | |/ |/| | |||||
| | * | composer update blueimp/jquery-file-upload | Mario Vavti | 2019-09-23 | 7 | -23/+60 |
| |/ | |||||
| * | Merge branch 'customitem-delivery' into 'dev' | Mario | 2019-09-23 | 10 | -30/+88 |
| |\ | |||||
| | * | 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 |
| |\ | |||||
| | * | 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 | Mario Vavti | 2019-09-19 | 1 | -1/+6 |
| |/ | |||||
| * | Merge branch 'dev' into 'dev' | Mario | 2019-09-18 | 1 | -2/+9 |
| |\ | |||||
| | * | 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 |
| |\ \ | |||||
| | * | | 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 | 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 | 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 | 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 | zotlabs | 2019-09-03 | 2 | -8/+17 |
| * | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-09-03 | 1 | -0/+12 |
| |\ \ \ \ | | |_|/ | |/| | | |||||
| | * | | | 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 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | 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 | 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 | 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 zo... | zotlabs | 2019-08-22 | 2 | -2/+2 |
| |/ / / | |||||
| * | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-08-22 | 2 | -2/+2 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'dev' of https://framagit.org/zot/core into dev | zotlabs | 2019-08-21 | 12 | -553/+591 |
| | |\ \ \ | |||||
| | * | | | | possible for DB to return hublocs with no sitekey | zotlabs | 2019-08-21 | 2 | -2/+2 |
| * | | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-08-22 | 1 | -2/+2 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | | Fix attach permissions sync for clonned channel | Max Kostikov | 2019-08-22 | 1 | -2/+2 |
| * | | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-08-22 | 1 | -0/+3 |
| |\| | | | | |_|_|/ |/| | | | |||||
| | * | | | Fix spoiler displaying while convert BBcode to markdown | Max Kostikov | 2019-08-22 | 1 | -0/+3 |
| |/ / / | |||||
| * | | | update changelog | Mario Vavti | 2019-08-16 | 1 | -0/+6 |
| * | | | Merge branch 'dev' into 'dev' | Mario | 2019-08-16 | 12 | -553/+591 |
| |\ \ \ | |/ / |/| / | |/ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |