aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* re-apply after removing from cherry-picked git hash from wrong branchzotlabs2020-05-054-5/+32
* Revert "issue generating photo thumbnails when uploaded via davfs"zotlabs2020-05-054-32/+5
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2020-05-0518-199/+384
|\
| * deal with polls and votes in enotifyMario2020-05-052-10/+18
| * catch the owner_xchan for activity_share items in notifications filterMario2020-05-051-3/+3
| * display complete perminfo only to ownerMario2020-05-041-4/+2
| * Merge branch 'dev' into 'dev'Mario2020-05-022-4/+9
| |\
| | * Display delayed posts on author's channel pageMax Kostikov2020-05-022-4/+9
| * | missing lib includeMario2020-05-021-0/+2
| |/
| * Merge branch 'dev' into 'dev'Max Kostikov2020-04-291-2/+2
| |\
| | * Force browser photo revalidationMax Kostikov2020-04-291-2/+2
| | * Update Item.phpMax Kostikov2020-04-121-3/+3
| | * Remove unnecessary [summary] tag processingMax Kostikov2020-04-121-11/+11
| * | Ãfix photo itemsMario2020-04-291-5/+3
| * | fix mod filestorage and fetch the info from attach if only the hash is provid...Mario2020-04-251-4/+4
| * | more work on deprecating ACTIVITY_OBJ_FILE and adapt mod sharedwithmeMario2020-04-243-46/+58
| * | fix file notificationsMario2020-04-231-2/+5
| * | some work on deprecating ACTIVITY_OBJ_FILEMario2020-04-235-9/+20
| * | the parent id is required later in the processMario2020-04-221-1/+4
| * | fix onepollMario2020-04-211-1/+5
| * | use $mid as plink to prevent to long plinksMario2020-04-202-4/+8
| * | some work on improving federation of item_private and make sure we deal with ...Mario2020-04-202-6/+16
| * | missing lib importMario2020-04-191-0/+1
| * | make sure $post_tags is defined somewhere outsite a clause to prevent PHP war...Mario2020-04-191-1/+2
| * | revertMario2020-04-181-1/+1
| * | just fetch the info we needMario2020-04-181-1/+1
| * | more do not include hublocs with no hubloc_id_urlMario2020-04-181-1/+1
| * | remove debug codeMario2020-04-181-1/+1
| * | de-duplicate $post_tagsMario2020-04-182-3/+3
| * | only return hublocs with hubloc_id_url setMario2020-04-181-1/+1
| * | implement addressing and fix conversation fetchingMario2020-04-182-84/+208
| * | Revert "keychange and request packets via zot6"Mario2020-04-161-8/+6
| * | fix notification filteringMario2020-04-151-3/+3
| * | fetch the item for asld in Lib/Share. This probably fixes addons issue #146Mario2020-04-151-1/+2
| * | Ãfix php warningMario2020-04-151-1/+1
| * | Merge branch 'dev' into 'dev'Mario2020-04-151-10/+10
| |\ \
| | * | Remove unnecessary [summary] tag processingMax Kostikov2020-04-151-10/+10
| * | | keychange and request packets via zot6Mario2020-04-151-6/+8
| |/ /
| * | discover_feed() does not exist yetMario2020-04-121-1/+1
* | | issue generating photo thumbnails when uploaded via davfszotlabs2020-05-054-5/+32
|/ /
* | move from build_sync_packet() to Libsync::build_sync_packet()Mario2020-04-0944-69/+127
* | update 1236: we have seen situations in the wild where a zot6 xchan was prese...Mario2020-04-081-13/+33
|/
* Merge branch 'dev' into 'dev'Max Kostikov2020-04-089-85/+107
|\
| * owa: look for zot6 firstMario2020-04-061-3/+3
| * another import fix and do not allow importing channels < version 4.7.4 for zo...Mario2020-04-051-1/+6
| * more mod import fixesMario2020-04-051-2/+2
| * fix mod importMario2020-04-051-57/+55
| * fix warning if iconfig value is an arrayMario2020-04-051-1/+1
| * show event timezone only if adjust ist set and the offset of the event timezo...Mario2020-04-051-3/+6
| * fix unseen forum posts countMario2020-04-051-1/+1