aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-11-291-1/+1
|\|
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-11-291-31/+40
| |\
| * | missed this from the earlier checkinzotlabs2016-11-291-1/+1
* | | rename functionMario Vavti2016-11-291-13/+13
| |/ |/|
* | more work on wiki mimetypesMario Vavti2016-11-291-27/+30
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-11-291-4/+4
|\|
| * minor re-arrangezotlabs2016-11-281-4/+4
* | some basic work for implementing mimetypes for wikisMario Vavti2016-11-281-5/+11
|/
* Merge pull request #602 from anaqreon/docogit-marijus2016-11-282-2/+44
|\
| * Integrating lots of member guide contentAndrew Manning2016-11-271-0/+3
| * Add some identity-aware parsing to HTML content using parseIdentityAwareHTML()Andrew Manning2016-11-272-1/+40
| * Add ability to include page assets in documentation pages such as images. Upd...Andrew Manning2016-11-271-1/+1
* | wiki: move delete page functionality to the widgetMario Vavti2016-11-281-5/+18
|/
* whitespace and minor fixesMario Vavti2016-11-231-1/+1
* missing plugins in zot-infozotlabs2016-11-221-1/+1
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-11-224-14/+12
|\
| * use plural since we can have more than one wikiMario Vavti2016-11-222-2/+2
| * display wiki list on wiki landing page.Mario Vavti2016-11-221-1/+1
| * move the remote user homebutton to the user menu. this way everything remote ...Mario Vavti2016-11-201-10/+8
| * fix #594Mario Vavti2016-11-201-1/+1
* | db update required for Zot2zotlabs2016-11-223-9/+15
* | wrong functionzotlabs2016-11-211-3/+3
* | zot: specify crypto methodzotlabs2016-11-203-7/+8
|/
* Do not render maps for Diaspora destinations.zotlabs2016-11-191-0/+6
* Move page list back out to the side menu, but with the new page form below th...Andrew Manning2016-11-181-0/+1
* Wiki pages display in tab to the left of the edit pane tab. Home is always fi...Andrew Manning2016-11-181-1/+4
* revert simple checkboxMario Vavti2016-11-181-1/+1
* add a simple checkbox template for use in widgetsMario Vavti2016-11-181-2/+2
* dba_pdo: return false on q() DB error like the old driver didzotlabs2016-11-171-1/+1
* wiki list fixesMario Vavti2016-11-171-2/+4
* Highlight active wiki in list in preparation for removing active wiki name fr...Andrew Manning2016-11-171-1/+13
* Move new wiki dialog directly underneath new wiki button in wiki list widgetAndrew Manning2016-11-161-25/+65
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-11-161-4/+15
|\
| * only turn [] and [x] into checkboxes if it is found inside a checklistMario Vavti2016-11-161-4/+15
* | use item from DB for return valuezotlabs2016-11-162-2/+1
* | export issuezotlabs2016-11-161-1/+1
|/
* wiki: simplify permission model, reduce duplicate calls to get the same chann...zotlabs2016-11-151-13/+15
* still a bit of wiki permission weirdness, this should catch the major oneszotlabs2016-11-151-2/+3
* wiki: permissions issues, untranslated strings in templates and some minor ch...zotlabs2016-11-151-2/+10
* xchan_fetch() returns a simplified structurezotlabs2016-11-141-3/+3
* update api perm_allowed to return all perms if no perm specifiedzotlabs2016-11-141-5/+16
* API: add GET /api/z/1.0/perm_allowedzotlabs2016-11-141-0/+24
* API: add GET /api/z/1.0/abconfigzotlabs2016-11-141-0/+17
* API: add GET api/z/1.0/abookzotlabs2016-11-141-0/+19
* show wiki controls only to owner and whitespace fixesMario Vavti2016-11-141-1/+1
* api: allow group member list to use a group name or idzotlabs2016-11-131-14/+16
* move all the zid related stuff to one filezotlabs2016-11-135-225/+232
* provide 'per-page' caching for is_matrix_url() results to reduce duplicate qu...zotlabs2016-11-131-2/+12
* zidify wiki contentzotlabs2016-11-131-0/+31
* attach_rename: flaw in duplicate filename detection resulted in filename(1)(1...zotlabs2016-11-101-0/+4