aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-12-109-4918/+5277
|\
| * Merge pull request #617 from anaqreon/docogit-marijus2016-12-104-8/+30
| |\
| | * Only display h1 headings in sticky side nav. Toggle display of detailed TOC a...Andrew Manning2016-12-094-8/+30
| * | Merge pull request #618 from phellmes/devgit-marijus2016-12-102-4897/+4995
| |\ \ | | |/ | |/|
| | * Update DE translation stringsphellmes2016-12-102-4897/+4995
| |/
| * bring back a few of the doc edits from overlapping checkinszotlabs2016-12-092-7/+240
| * router error reportingzotlabs2016-12-091-6/+12
* | wiki fullscreen optimisationMario Vavti2016-12-103-8/+35
|/
* superblock issue + string updatezotlabs2016-12-092-105/+109
* Merge pull request #616 from anaqreon/docozotlabs2016-12-097-28/+175
|\
| * Condense sticky nav TOC to h1 only. Add deep TOC to top of each page. Adjust ...Andrew Manning2016-12-083-11/+25
| * Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2016-12-082-1/+8
| |\ | |/ |/|
* | Report the WebDAV endpoint on the settings page (under the reddress) if the a...zotlabs2016-12-082-1/+8
* | Merge pull request #615 from anaqreon/docozotlabs2016-12-0914-1498/+2151
|\ \
| | * Add hub snapshot tool page to admin sectionAndrew Manning2016-12-082-0/+128
| | * Replace Hubzilla with $Projectname more. Revise code block side-scrollAndrew Manning2016-12-083-17/+22
| |/
| * 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