aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* more work on z6 commentingzotlabs2018-12-033-64/+268
* fix generated plinkzotlabs2018-12-031-3/+3
* typozotlabs2018-11-301-1/+1
* allow notification filtering by name or addrzotlabs2018-11-304-8/+16
* attached photo permissions regressionzotlabs2018-11-301-4/+4
* prevent incompatible export files (osada/zap) from being imported. This is to...zotlabs2018-11-272-0/+32
* Organization actor type was missingzotlabs2018-11-231-1/+1
* use uuid in file storagezotlabs2018-11-222-3/+3
* fix mastodon tag notifications (again)zotlabs2018-11-211-15/+17
* no mention notifications from mastodon (and pleroma)zotlabs2018-11-212-5/+5
* use this form insteadzotlabs2018-11-191-2/+1
* push recent changeszotlabs2018-11-193-2/+6
* datetime_convert wrong argszotlabs2018-11-152-2/+2
* more work on the mid/uuid conversionzotlabs2018-11-151-17/+19
* delivery report issuezotlabs2018-11-151-2/+3
* add item.uuid to relevant placeszotlabs2018-11-1511-32/+44
* 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
* update httpsig unit test which is failingzotlabs2018-11-141-0/+2
* fixes to old z6 deliveryzotlabs2018-11-141-4/+3
* more loggingzotlabs2018-11-141-0/+2
* more loggingzotlabs2018-11-141-0/+1
* check keyidzotlabs2018-11-141-1/+1
* filter by networkzotlabs2018-11-141-2/+2
* crypto fixzotlabs2018-11-141-1/+1
* encrypted header issuezotlabs2018-11-141-1/+1
* extra loggingzotlabs2018-11-141-0/+4
* fix dreport linkzotlabs2018-11-142-3/+6
* change db update counterzotlabs2018-11-141-1/+1
* Merge branch 'master' into zvizotlabs2018-11-146-33/+33
|\
| * version 3.9.5Mario Vavti2018-11-141-1/+1
| * more changelog3.8.4Mario Vavti2018-11-141-0/+2
| * Merge branch 'dev'Mario Vavti2018-11-1433-424/+844
| |\
| | * changelog and versionMario Vavti2018-11-142-1/+19
| | * Merge branch 'patch-20181113b' into 'dev'Mario2018-11-142-3/+3
| | |\
| | | * Fix double escaping after xss fixDM42.Net (Matt Dent)2018-11-131-2/+2
| | | * Revert "Filter search box before display"DM42.Net (Matt Dent)2018-11-131-1/+1
| | * | Merge branch 'dev' into 'dev'Mario2018-11-142-28/+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
| | | * Remove fetch_image_from_url() because of functions duplicateMax Kostikov2018-11-131-20/+0
| * | | version 3.8.33.8.3Mario Vavti2018-11-051-1/+1
| * | | update changelogMario Vavti2018-11-051-0/+14
| * | | update linkinfo from devMario Vavti2018-11-051-7/+30
| * | | Merge branch 'dev'Mario Vavti2018-11-05316-5295/+6481
| |\ \ \
| * \ \ \ Merge branch 'dev'3.8.2Mario Vavti2018-10-291-0/+22
| |\ \ \ \
| * | | | | merge Zotlabs/Access/PermissionLimits.php from devMario Vavti2018-10-291-1/+1