aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* api files improvements/fixes and documentationzotlabs2016-12-062-3/+9
* Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2016-12-057-34/+78
|\
| * minor changes to config api and markdown_to_bbzotlabs2016-12-052-14/+16
| * typozotlabs2016-12-041-1/+1
| * minor optimisation to reduce code duplicationzotlabs2016-12-041-11/+7
| * api_zot: implement /api/z/1.0/network/stream and fix /api/z/1.0/channel/streamzotlabs2016-12-042-3/+49
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-042-5/+7
| |\
| | * implement content type in wiki listMario Vavti2016-12-041-1/+1
| | * leave toc title for the authorMario Vavti2016-12-041-2/+2
| * | bugfix for api group_memberszotlabs2016-12-041-2/+2
* | | Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2016-12-044-9/+12
|\ \ \ | | |/ | |/|
| * | fixes for toc bbcode and bbcode wiki tocMario Vavti2016-12-041-4/+6
| |/
| * item_store: parent wasn't being returned in api callzotlabs2016-12-031-0/+1
| * Merge pull request #608 from redmatrix/jeroenpraat-patch-1zotlabs2016-12-041-1/+1
| |\
| | * Fix full screen for embedded videosJeroen van Riet Paap2016-12-031-1/+1
| * | rename api endpoint yet again. item/store appears to be blacklisted in some h...zotlabs2016-12-031-4/+4
| |/
* / Remove classes from the doco content region to simplify the appearance. Inste...Andrew Manning2016-12-031-0/+1
|/
* more api work for item/store and docozotlabs2016-12-021-4/+3
* api function item/new renamed to item/store as that more closely reflects its...zotlabs2016-12-021-6/+6
* fix the forum widget for forums with custom permszotlabs2016-12-022-10/+22
* bb_highlight: if somebody enters an unsupported language for code syntax high...zotlabs2016-12-011-3/+3
* sql error in fetch conversationzotlabs2016-12-011-1/+1
* trim both key and iv on other cipherszotlabs2016-12-011-0/+2
* trim iv in STD_encapsulatezotlabs2016-12-011-0/+2
* allow plugins to cancel item_store() and item_store_update()zotlabs2016-12-011-0/+11
* issue #607 parens not recognised inside urlszotlabs2016-12-011-1/+1
* issue #606, postgres binary data handling under PDO and HHVM when passed nullzotlabs2016-11-301-1/+1
* advanced crypto restricted by server rolezotlabs2016-11-302-0/+6
* zot 1.2zotlabs2016-11-303-162/+270
* go live with wiki mimetypes - you can now choose if a wiki will contain markd...Mario Vavti2016-11-301-2/+1
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-11-301-0/+6
|\
| * highlightzotlabs2016-11-291-0/+6
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 09:58:00 +0000