aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
| * db update to add index to item.resource_id we query this in wikis a lotMario Vavti2017-09-164-3/+19
* | wiki download: only include the latest page revisionzotlabs2017-09-161-1/+7
|/
* do not show edit pencil if not allowed to editMario Vavti2017-09-161-0/+4
* set update_title to falseMario2017-09-151-0/+2
* versionMario2017-09-151-1/+1
* implement wiki editingMario2017-09-155-40/+90
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devgit-marijus2017-09-159-19/+111
|\
| * typocheckzotlabs2017-09-141-1/+1
| * provide a hook for importing a channel photo at channel creation timezotlabs2017-09-142-0/+42
| * wiki: lock mimetypezotlabs2017-09-146-9/+32
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-09-142-25/+26
| |\
| * | bring back wiki downloadzotlabs2017-09-143-9/+37
* | | some work on wiki aclgit-marijus2017-09-153-2/+65
| |/ |/|
* | wiki: do not suggest bbcode if mimetype is text/plainMario Vavti2017-09-141-0/+2
* | use the hubzilla iconsMario Vavti2017-09-141-2/+2
* | hubzilla issue #858: Fix: Shortcut icon is not dysplayed when Admin or Channe...Sergey Lukin2017-09-141-23/+22
|/
* add text/plain type to wikizotlabs2017-09-133-9/+19
* make wiki page mimetype default to wiki mimetype (this was the original inten...zotlabs2017-09-132-2/+4
* more zot6zotlabs2017-09-134-6/+26
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-09-132-37/+41
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2017-09-1310-23/+54
| |\
| * | rename activity notifications links - one moreMario Vavti2017-09-121-1/+1
| * | rename activity notifications linksMario Vavti2017-09-121-2/+2