aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* logger typoszotlabs2016-12-301-2/+2
|
* Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_mergezotlabs2016-12-2748-4277/+3167
|\
| * Merge branch '2.0RC'Mario Vavti2016-12-2348-4277/+3167
| |\
| | * fix a glitch in sticky-kit and comment out alt_pager() in ↵Mario Vavti2016-12-211-1/+1
| | | | | | | | | | | | widget_conversations since it will not work there
| | * deprecate bb_iframezotlabs2016-12-181-9/+9
| | |
| | * z_fetch_url incorrect variablezotlabs2016-12-151-5/+5
| | |
| | * postgres is picky about this stuffzotlabs2016-12-141-2/+2
| | |
| | * Merge branch '2.0RC' of https://github.com/redmatrix/hubzilla into 2.0RC_mergezotlabs2016-12-141-1/+2
| | |\
| | | * fix regexMario Vavti2016-12-141-1/+1
| | | |
| | | * wiki: do not show revert buttons if we do not have write perms and minor cleanupMario Vavti2016-12-141-1/+2
| | | |
| | * | markdown regexzotlabs2016-12-141-2/+3
| | |/
| | * bring lockview to wikilistMario Vavti2016-12-131-1/+2
| | |
| | * simplify wikilist widgetMario Vavti2016-12-131-82/+11
| | |
| | * move the rest of superblock out of corezotlabs2016-12-111-47/+13
| | |
| | * clone sync missing for some item delete operationszotlabs2016-12-111-28/+28
| | |
| | * fix embed-image for fullscreen mode and some adjustments for /helpMario Vavti2016-12-101-1/+1
| | |
| | * superblock issue + string updatezotlabs2016-12-091-2/+2
| | |
| | * don't alter received/changed timestamps when editingzotlabs2016-12-081-14/+2
| | |
| | * only update the 'changed' timestamp for recent item_store eventszotlabs2016-12-081-10/+14
| | |
| | * always check api_userzotlabs2016-12-071-8/+19
| | |
| | * document the api filedata callzotlabs2016-12-071-2/+2
| | |
| | * attach_list_files bugfixzotlabs2016-12-062-2/+8
| | |
| | * 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 videos
| | | | * 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 ↵zotlabs2016-12-031-4/+4
| | | |/ | | | | | | | | | | | | hosting environments.
| | * / Remove classes from the doco content region to simplify the appearance. ↵Andrew Manning2016-12-031-0/+1
| | |/ | | | | | | | | | Instead of loading /doc/main.bb, redirect to /doc/about/about_hubzilla/. These edits are minimal for demo purposes and not the proper way to do it.
| | * 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 ↵zotlabs2016-12-021-6/+6
| | | | | | | | | | | | | | | | | | its purpose. It can also be used to store an edit of an existing item. I believe this is a reasonably safe change at this time as I don't believe there is any software currently making use of this call - instead using the Twitter API which is now a plugin. Also some work to make the install documentation agnostic to project name variations. This is not yet complete.
| | * fix the forum widget for forums with custom permszotlabs2016-12-022-10/+22
| | |
| | * bb_highlight: if somebody enters an unsupported language for code syntax ↵zotlabs2016-12-011-3/+3
| | | | | | | | | | | | highlighting (like fortran or cobol or whatever) use 'php' instead of returning a completely unformatted code block. This choice was somewhat arbitrary. It could be difficult to analyse the intention which could be literally anything and provide the closest match.
| | * 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
| | |