aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Merge branch 'embedphotos' into 'dev'Mario2019-01-221-53/+69
| |\ \ \ \ \
| | * | | | | Try to fix some warnings in Zotlabs\Module\Embedphotos.Klaus Weidenbach2019-01-221-53/+69
| * | | | | | Merge branch 'patch-20190114a' into 'dev'Mario2019-01-222-2/+10
| |\ \ \ \ \ \
| | * | | | | | Add remaining hook insertionsM. Dent2019-01-222-2/+10
| |/ / / / / /
| * | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2019-01-212-50/+48
| |\| | | | |
| | * | | | | Merge branch 'dev' into 'dev'M. Dent2019-01-191-14/+12
| | |\ \ \ \ \
| | | * | | | | Some fixes in include/help.php.Klaus Weidenbach2019-01-181-14/+12
| | * | | | | | Merge branch 'bugfix-plugin' into 'dev'M. Dent2019-01-191-36/+36
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Fix wrong variable name in include/plugin.php.Klaus Weidenbach2019-01-191-36/+36
| | |/ / / / /
| * | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-211-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-182-15/+26
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'QA' into 'dev'Mario2019-01-182-22/+58
| |\ \ \ \ \ \ \
| | * | | | | | | Add PostgreSQL to gitlab-ci setup.Klaus Weidenbach2019-01-172-22/+58
| * | | | | | | | Merge branch 'dreport_fixes' into 'dev'M. Dent2019-01-183-2/+8
| |\ \ \ \ \ \ \ \
| | * | | | | | | | add spaceMario Vavti2019-01-171-1/+1
| | * | | | | | | | fix delivery report for zot6 connectionsMario Vavti2019-01-173-2/+8
| * | | | | | | | | Merge branch 'core_fixes' into 'dev'M. Dent2019-01-181-0/+3
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | possible fix for #1326Mario Vavti2019-01-171-0/+3
| |/ / / / / / / /
* | | | | | | | / block private reshares from zot6 due to different parentszotlabs2019-01-281-0/+11
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | share fixeszotlabs2019-01-272-0/+6
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | cleanup of cli admin toolzotlabs2019-01-261-5/+1
* | | | | | | command line tool for managing site adminszotlabs2019-01-261-0/+64
| |_|_|_|_|/ |/| | | | |
* | | | | | support photo items between zot and zot6zotlabs2019-01-242-1/+37
| |_|_|/ / |/| | | |
* | | | | comment permission fixzotlabs2019-01-201-1/+1
| |_|/ / |/| | |
* | | | more specific network checking in several places and remove some old debuggin...zotlabs2019-01-171-11/+13
* | | | this should fix the rest of the event stuffzotlabs2019-01-171-4/+13
|/ / /
* / / channel connect issuezotlabs2019-01-171-1/+1
|/ /
* | event attendance testing continued (now works at a basic level from one direc...zotlabs2019-01-161-1/+1
* | more z6 event workzotlabs2019-01-161-1/+27
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2019-01-1656-477/+725
|\ \
| * \ Merge branch 'fix_dreport_issue' into devMario Vavti2019-01-162-2/+19
| |\ \
| | * | change logic for consistencyMario Vavti2019-01-161-3/+6
| | * | fix legacy zot dreport not passing the is_storable checkMario Vavti2019-01-153-2/+25
| * | | Merge branch 'queue_fixes_1' into 'dev'M. Dent2019-01-161-17/+32
| |\ \ \ | | |/ / | |/| |
| | * | do not return if delivery report could not bedecryptedMario Vavti2019-01-161-17/+32
| |/ /
| * | Merge branch 'core_fixes' into 'dev'Mario2019-01-153-8/+12
| |\ \
| | * | whitespaceMario Vavti2019-01-141-2/+0
| | * | fix a new instance of autocomplete created on each conversation updateMario Vavti2019-01-141-5/+11
| | * | Merge branch 'dev' into core_fixesMario Vavti2019-01-145-10/+36
| | |\ \
| | * | | only load new content onpopstate if the mid has actually changedMario Vavti2019-01-141-1/+1
| * | | | Merge branch 'patch-20190113c' into 'dev'Mario2019-01-146-1/+57
| |\ \ \ \
| | * | | | Remove stray $DM42.Net (Matt Dent)2019-01-131-1/+1
| | * | | | Add privacygroup_extras_post/drop hooksDM42.Net (Matt Dent)2019-01-135-1/+51
| | * | | | Add pgrp_extras hook & displayDM42.Net (Matt Dent)2019-01-132-0/+6
| * | | | | Merge branch 'patch-20190113a' into 'dev'Mario2019-01-143-2/+62
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Add collect_public_recipients hookDM42.Net (Matt Dent)2019-01-123-2/+62
| * | | | | Merge branch 'patch-20190113b' into 'dev'Max Kostikov2019-01-132-3/+3
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | move order by and rewrite similar in update_queue_item()DM42.Net (Matt Dent)2019-01-132-3/+3
| | * | | | outq_created not outq_scheduledDM42.Net (Matt Dent)2019-01-131-1/+1
| | * | | | FIX: aggregated query error in MYSQLDM42.Net (Matt Dent)2019-01-131-1/+1
| |/ / / /