aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-11-1610-105/+43
| |\ \ \ \ \
| * | | | | | fix update 1228Mario Vavti2018-11-151-1/+0
* | | | | | | more mergingzotlabs2018-12-031-9/+67
* | | | | | | more work on z6 commentingzotlabs2018-12-032-64/+253
* | | | | | | fix generated plinkzotlabs2018-12-031-3/+3
| |_|_|_|_|/ |/| | | | |
* | | | | | allow notification filtering by name or addrzotlabs2018-11-302-1/+8
* | | | | | prevent incompatible export files (osada/zap) from being imported. This is to...zotlabs2018-11-271-0/+9
| |_|_|_|/ |/| | | |
* | | | | Organization actor type was missingzotlabs2018-11-231-1/+1
| |_|_|/ |/| | |
* | | | use uuid in file storagezotlabs2018-11-221-1/+1
| |_|/ |/| |
* | | no mention notifications from mastodon (and pleroma)zotlabs2018-11-211-1/+1
* | | use this form insteadzotlabs2018-11-191-2/+1
* | | push recent changeszotlabs2018-11-193-2/+6
| |/ |/|
* | datetime_convert wrong argszotlabs2018-11-151-1/+1
* | more work on the mid/uuid conversionzotlabs2018-11-151-17/+19
* | add item.uuid to relevant placeszotlabs2018-11-154-19/+16
* | mid -> uuid conversions for basic reactionszotlabs2018-11-152-3/+7
* | remove checkjs and nojszotlabs2018-11-152-65/+0
|/
* separate by networkzotlabs2018-11-141-0/+1
* encrypted header issuezotlabs2018-11-141-1/+1
* extra loggingzotlabs2018-11-141-0/+4
* fix dreport linkzotlabs2018-11-141-2/+5
* Merge branch 'master' into zvizotlabs2018-11-142-10/+11
|\
| * Merge branch 'patch-20181113b' into 'dev'Mario2018-11-141-2/+2
| |\
| | * Fix double escaping after xss fixDM42.Net (Matt Dent)2018-11-131-2/+2
| * | Merge branch 'dev' into 'dev'Mario2018-11-141-8/+9
| |\ \ | | |/ | |/|
| | * Update Photo.phpMax Kostikov2018-11-131-4/+4
| | * Remove uneccessary include/photos.php Max Kostikov2018-11-131-1/+0
| | * Text formatting in Photo.phpMax Kostikov2018-11-131-2/+2
| | * Replace fetch_image_from_url() with z_fetch_url()Max Kostikov2018-11-131-6/+8
* | | db updates for zot6zotlabs2018-11-143-0/+145
* | | Merge branch 'master' into zvizotlabs2018-11-134-21/+44
|\| |
| * | Merge remote-tracking branch red/master into patch-20181113a. Add Mike's fix ...DM42.Net (Matt Dent)2018-11-132-5/+15
| |\ \
| | * | xss in searchzotlabs2018-11-131-3/+3
| | * | enotify::format hook for superblockzotlabs2018-11-121-2/+12
| * | | Revert "Replace fetch_image_from_url() with z_fetch_url()"Max Kostikov2018-11-131-9/+6
| * | | Replace fetch_image_from_url() with z_fetch_url()Max Kostikov2018-11-131-6/+9
| | |/ | |/|
| * | Preserve photo modification dateMax Kostikov2018-11-101-4/+8
| * | Remove unnecessary Zulu timezone mentionMax Kostikov2018-11-101-1/+1
| * | Fixed timezone conversionMax Kostikov2018-11-091-4/+4
| * | Correct "Content-Length:" calculation addedMax Kostikov2018-11-081-1/+1
| * | $data only contains the link to the image if the image is in os storage. The ...Mario Vavti2018-11-081-1/+2
| * | Disable image caching if personal or group permissions enabledMax Kostikov2018-11-071-6/+6
| * | Added `If-Modified-Since` header support for better image caching and fixed a...Max Kostikov2018-11-071-6/+14
| |/
* | item uuid changeszotlabs2018-11-121-1/+3
* | dreport updateszotlabs2018-11-123-9/+102
* | translate zot message packets to zot6 for deliveryzotlabs2018-11-111-12/+35
* | more z6 debuggingzotlabs2018-11-113-2/+9
* | add zot6 delivery methodzotlabs2018-11-081-0/+1
* | begin native summary supportzotlabs2018-11-081-1/+23
* | refresh packetszotlabs2018-11-082-3/+18