aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2016-12-081-24/+16
|\
| * 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
* | Convert consolidated pages back to BBcode and Markdown where possibleAndrew Manning2016-12-088-1291/+1139
* | Convert about sections back to bbcode, update some formatting.Andrew Manning2016-12-076-207/+1012
|/
* always check api_userzotlabs2016-12-071-8/+19
* api_albumszotlabs2016-12-072-19/+85
* document the api filedata callzotlabs2016-12-073-4/+70
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-072-258/+278
|\
| * Merge pull request #614 from mjfriaza/devzotlabs2016-12-082-258/+278
| |\
| | * Updated the Spanish translationManuel Jiménez Friaza2016-12-072-258/+278
* | | doc updateszotlabs2016-12-071-6/+6
|/ /
* | attach_list_files bugfixzotlabs2016-12-062-2/+8
* | link from indexzotlabs2016-12-061-1/+1
* | api files improvements/fixes and documentationzotlabs2016-12-063-3/+112
* | Merge pull request #612 from anaqreon/devzotlabs2016-12-072-1/+1
|\ \
| * | Prepare for dev pull requestAndrew Manning2016-12-061-2/+0
| * | Remove local CSS that overrides the redbasic theme.Andrew Manning2016-12-061-20/+0
| * | Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2016-12-061-244/+261
| |\ \ | |/ / |/| |
* | | Providing more frequent string updates at the momentzotlabs2016-12-051-244/+261
| * | Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2016-12-0520-76/+278
| |\ \ | |/ / |/| |
* | | minor changes to config api and markdown_to_bbzotlabs2016-12-058-30/+32
* | | typozotlabs2016-12-041-1/+1
* | | minor optimisation to reduce code duplicationzotlabs2016-12-041-11/+7
* | | setup: a bit more text cleanupzotlabs2016-12-041-1/+1
* | | setup: we actually don't require proc_open any more, so remove that check.zotlabs2016-12-041-9/+3
* | | api_zot: implement /api/z/1.0/network/stream and fix /api/z/1.0/channel/streamzotlabs2016-12-043-4/+54
* | | text syntaxzotlabs2016-12-041-1/+1
* | | setup changes to check for shell_exec and exec functionszotlabs2016-12-041-10/+21
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-048-15/+33
|\ \ \
| * | | translateable stringMario Vavti2016-12-042-1/+2
| * | | implement content type in wiki listMario Vavti2016-12-043-6/+8
| * | | leave toc title for the authorMario Vavti2016-12-041-2/+2
* | | | bugfix for api group_memberszotlabs2016-12-043-5/+151
| | * | Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2016-12-0419-5048/+5367
| | |\ \ | | |/ / | |/| |
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-12-043-0/+108
| |\ \ \ | |/ / / |/| | |
* | | | more zot api documentationzotlabs2016-12-043-0/+108
| * | | fixes for toc bbcode and bbcode wiki tocMario Vavti2016-12-045-9/+24
|/ / /
* | | mod_item: better exception handling for api usezotlabs2016-12-031-3/+27
* | | correct the docozotlabs2016-12-031-2/+2
* | | item_store: parent wasn't being returned in api callzotlabs2016-12-031-0/+1
* | | Merge pull request #609 from mjfriaza/devzotlabs2016-12-042-4927/+4933
|\ \ \ | | |/ | |/|
| * | Updated the Spanish translationManuel Jiménez Friaza2016-12-032-4927/+4933
* | | 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
* | | | put all the api related stuff in the api folderzotlabs2016-12-034-0/+0
* | | | rename api endpoint yet again. item/store appears to be blacklisted in some h...zotlabs2016-12-033-108/+229
* | | | api xchan doczotlabs2016-12-031-0/+44
|/ / /
| | * Remove borders and box-shadow with CSS without removing the classes from help...Andrew Manning2016-12-042-3/+27
| | * Remove classes from the doco content region to simplify the appearance. Inste...Andrew Manning2016-12-032-5/+3
| |/ |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 11:07:51 +0000