aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'unfriend_delete_posts_bug' into 'dev'Mario2019-05-031-3/+20
|\
| * when removed items for unfriended connections, check if the parent has been r...zotlabs2019-05-021-3/+20
* | calendar merge: use b64 encoded mid for plinkMario Vavti2019-05-021-1/+1
* | Merge branch 'xmlify' into 'dev'Max Kostikov2019-05-011-2/+12
|\ \
| * | address xmlify/unxmlify performance issueMario Vavti2019-05-011-2/+12
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-011-4/+1
|\ \ \ | |/ / |/| |
| * | Preserve parent_mid with threaded commentsMax Kostikov2019-05-011-4/+1
* | | Merge branch 'dev' into 'dev'Mario2019-05-012-1/+12
|\| | | |/ |/|
| * Add 'reply on comment' featureMax Kostikov2019-04-291-0/+8
| * Add initial threaded comment supportMax Kostikov2019-04-291-2/+5
* | possible sql performance improvementMario Vavti2019-04-271-1/+1
* | import/export zot6 hublocs+xchansZot2019-04-261-0/+7
* | hubloc confusion in magic authZot2019-04-253-21/+60
* | Fix infinite loop using postgres as backendDaniel Lowe2019-04-211-12/+6
* | Merge branch 'dev' into calendar_mergeMario Vavti2019-04-191-1/+6
|\ \
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-155-46/+92
| |\|
| * | add attachments to zot6 event objects, add zot6 to federated transports (webf...zotlabs2019-04-151-1/+6
* | | calendar merge initial commitMario Vavti2019-04-191-0/+4
| |/ |/|
* | Update xchan profile edited date only onceMax Kostikov2019-04-131-9/+10
* | Set 'os_syspath' with local pathMax Kostikov2019-04-121-1/+2
* | Override received 'content' if we saving thumbnail in filesystemMax Kostikov2019-04-121-0/+1
* | Fix 'os_syspath' if we store thumbnails in filesystemMax Kostikov2019-04-121-1/+3
* | Add comment on required changes in upcoming releasesMax Kostikov2019-04-121-31/+47
* | Store thumbnails in filesystem or databaseMax Kostikov2019-04-121-6/+3
* | Fetch thumbnails and store it in filesystem or DB; update xchan profile edit ...Max Kostikov2019-04-121-4/+22
* | Fix use UNIX socket file to connect DBMax Kostikov2019-04-101-1/+1
* | Merge branch 'dev' into 'dev'Mario2019-04-101-4/+12
|\|
| * Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into devzotlabs2019-04-071-8/+0
| |\
| * | permissions cleanupzotlabs2019-04-051-4/+12
* | | Revert "Update htconfig.sample.php"Max Kostikov2019-04-102-5/+15
| |/ |/|
* | Merge branch 'dev' into 'dev'Mario2019-04-061-3/+3
|\|
| * Merge branch 'dev' of ../hz into devzotlabs2019-04-051-3/+3
| |\
| | * security: perms_pending not evaluated correctlyzotlabs2019-04-051-3/+3
* | | Remove suggest channels from featuresMario2019-04-021-8/+0
|/ /
* | check service class limits when syncing fileszotlabs2019-03-301-0/+14
* | Merge branch 'z6_discover_fixes' into 'dev'Max Kostikov2019-03-291-4/+6
|\ \
| * | another fix for z6_discover() and create a zot6 hubloc if applicableMario Vavti2019-03-281-1/+1
| * | fix various issues in z6_discover()Mario Vavti2019-03-271-3/+5
* | | Fix wrong bracketMax Kostikov2019-03-271-2/+2
* | | Fix wrong permissions on attached images in personal messagesMax Kostikov2019-03-271-2/+2
|/ /
* | if we have an uuid deduplicate by uuid otherwise by midMario Vavti2019-03-251-5/+15
* | fix wrong field nameMario Vavti2019-03-241-2/+2
* | Revert "item_store(): deduplicate by mid OR uuid"Mario Vavti2019-03-241-2/+1
* | item_store(): deduplicate by mid OR uuidMario Vavti2019-03-241-1/+2
* | Merge branch 'dev' into 'dev'Mario2019-03-211-0/+1
|\ \
| * | hubzilla core issue #1356 , permissions not getting decrypted on followzotlabs2019-03-201-0/+1
| |/
* | another whitespace to trigger testsMario Vavti2019-03-211-1/+0
* | just whitespace to trigger a new build testMario Vavti2019-03-201-1/+0
* | VideoMario2019-03-201-0/+22
|/
* Merge branch 'dev' of ../hz into devzotlabs2019-03-181-2/+6
|\