aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into taggingzotlabs2017-09-2439-128/+364
|\
| * For zot6, allow HTTP Signatures to be encrypted, as they may contain sensitiv...zotlabs2017-09-241-6/+46
| * fix missing content on channel pageMario Vavti2017-09-231-0/+1
| * delivery report decryption is not needed for local deliveryzotlabs2017-09-211-19/+14
| * encrypt delivery reports. This will cause a bit of consternation because this...zotlabs2017-09-212-3/+21
| * no visible feedback when moving the affinity slider and waiting for content t...zotlabs2017-09-211-0/+2
| * pubsites broken and directory server admin selection includes known dead siteszotlabs2017-09-212-2/+3
| * log the lack of http sig infozotlabs2017-09-211-1/+3
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2017-09-211-1/+10
| |\
| | * go back to the un-versioned jsonld contextzotlabs2017-09-211-1/+10
| * | nav_set_selected() and minor whitespace for mod pubstreamMario Vavti2017-09-211-1/+3
| |/
| * provide a space between link header paramszotlabs2017-09-202-2/+2
| * change back to the ugly content-typezotlabs2017-09-201-1/+1
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-09-205-20/+29
| |\
| | * wiki css fixesMario Vavti2017-09-202-13/+14
| | * wiki: translateable strings and move page mimetype selector to options submenuMario Vavti2017-09-204-7/+15
| * | add more signature loggingzotlabs2017-09-202-2/+11
| * | we need this in the plugin, not in corezotlabs2017-09-201-0/+1
| * | add HTTP link header to channel page, making it pluggablezotlabs2017-09-203-0/+40
| * | fix namespace parsing issuezotlabs2017-09-201-5/+9
| |/
| * provide default photo mimetypezotlabs2017-09-203-1/+8
| * use mimetype text description rather than technical name in dropdown choices,...zotlabs2017-09-192-9/+10
| * use frozen jsonld contextszotlabs2017-09-193-6/+10
| * perform caching of jsonld schemaszotlabs2017-09-192-0/+33
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-09-195-11/+9
| |\
| | * Revert "remove some redundant references to sticky_kit"Mario Vavti2017-09-192-0/+3
| | * remove some redundant references to sticky_kitMario Vavti2017-09-192-3/+0
| | * versionMario2017-09-191-1/+1
| | * jquery-3.2.1Mario2017-09-191-4/+4
| | * fix some issues with sticky-kitMario2017-09-193-6/+4
| * | turn common friends into a widgetzotlabs2017-09-196-27/+57
| * | call the follow_accept hook when desiredzotlabs2017-09-192-1/+5
| |/
| * fix various wikipage widget issues (sort pages by name, respect locked mime t...Mario2017-09-192-12/+19
| * fix permission_{accept, reject} hooks not being calledMario Vavti2017-09-191-1/+1
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2017-09-192-2/+13
| |\
| | * pubcrawl: make a good faith effort to handle multi-media contentzotlabs2017-09-181-1/+1
| | * create new hooks for permissions_accept and permissions_rejectzotlabs2017-09-181-1/+7
| | * provide rel=alternate link if no reshare content in postzotlabs2017-09-181-0/+5
| * | changelogMario2017-09-181-0/+8
| * | anonymous comments are not implemented for photos.Mario Vavti2017-09-181-3/+3
| |/
| * acl issue with some ActivityPub completionszotlabs2017-09-171-3/+8
* | acl issue with some ActivityPub completionszotlabs2017-09-171-3/+8
* | more tag stuffzotlabs2017-09-171-1/+1
* | tagging changeszotlabs2017-09-171-4/+11
|/
* more mastodon testingzotlabs2017-09-172-1/+13
* wiki: update acl on child pages when wiki perms changezotlabs2017-09-161-0/+12
* wiki sync - we weren't getting the child pageszotlabs2017-09-161-0/+6
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-09-165-21/+37
|\
| * Moved add wiki page form to top of page list to address issue https://github....Andrew Manning2017-09-161-17/+17
| * Page title is what we need in order to delete pages, not the urlAndrew Manning2017-09-161-1/+1