Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/dev' into doco | Andrew Manning | 2016-12-08 | 2 | -1/+8 |
|\ | |||||
| * | Report the WebDAV endpoint on the settings page (under the reddress) if the ↵ | zotlabs | 2016-12-08 | 2 | -1/+8 |
| | | | | | | | | account techlevel suggests the viewer isn't going to run away screaming and have epileptic seizures when they see the term 'WebDAV'. | ||||
| * | Merge pull request #615 from anaqreon/doco | zotlabs | 2016-12-09 | 14 | -1498/+2151 |
| |\ | | | | | | | Doco sprint | ||||
* | | | Add hub snapshot tool page to admin section | Andrew Manning | 2016-12-08 | 2 | -0/+128 |
| | | | |||||
* | | | Replace Hubzilla with $Projectname more. Revise code block side-scroll | Andrew Manning | 2016-12-08 | 3 | -17/+22 |
| |/ |/| | |||||
* | | Merge remote-tracking branch 'upstream/dev' into doco | Andrew Manning | 2016-12-08 | 1 | -24/+16 |
|\| | |||||
| * | don't alter received/changed timestamps when editing | zotlabs | 2016-12-08 | 1 | -14/+2 |
| | | |||||
| * | only update the 'changed' timestamp for recent item_store events | zotlabs | 2016-12-08 | 1 | -10/+14 |
| | | |||||
* | | Convert consolidated pages back to BBcode and Markdown where possible | Andrew Manning | 2016-12-08 | 8 | -1291/+1139 |
| | | |||||
* | | Convert about sections back to bbcode, update some formatting. | Andrew Manning | 2016-12-07 | 6 | -207/+1012 |
|/ | |||||
* | always check api_user | zotlabs | 2016-12-07 | 1 | -8/+19 |
| | |||||
* | api_albums | zotlabs | 2016-12-07 | 2 | -19/+85 |
| | |||||
* | document the api filedata call | zotlabs | 2016-12-07 | 3 | -4/+70 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-12-07 | 2 | -258/+278 |
|\ | |||||
| * | Merge pull request #614 from mjfriaza/dev | zotlabs | 2016-12-08 | 2 | -258/+278 |
| |\ | | | | | | | Translated new strings into es_ES | ||||
| | * | Updated the Spanish translation | Manuel Jiménez Friaza | 2016-12-07 | 2 | -258/+278 |
| | | | |||||
* | | | doc updates | zotlabs | 2016-12-07 | 1 | -6/+6 |
|/ / | |||||
* | | attach_list_files bugfix | zotlabs | 2016-12-06 | 2 | -2/+8 |
| | | |||||
* | | link from index | zotlabs | 2016-12-06 | 1 | -1/+1 |
| | | |||||
* | | api files improvements/fixes and documentation | zotlabs | 2016-12-06 | 3 | -3/+112 |
| | | |||||
* | | Merge pull request #612 from anaqreon/dev | zotlabs | 2016-12-07 | 2 | -1/+1 |
|\ \ | | | | | | | Doco merge | ||||
| * | | Prepare for dev pull request | Andrew Manning | 2016-12-06 | 1 | -2/+0 |
| | | | |||||
| * | | Remove local CSS that overrides the redbasic theme. | Andrew Manning | 2016-12-06 | 1 | -20/+0 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/dev' into doco | Andrew Manning | 2016-12-06 | 1 | -244/+261 |
| |\ \ | |/ / |/| | | |||||
* | | | Providing more frequent string updates at the moment | zotlabs | 2016-12-05 | 1 | -244/+261 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/dev' into doco | Andrew Manning | 2016-12-05 | 20 | -76/+278 |
| |\ \ | |/ / |/| | | |||||
* | | | minor changes to config api and markdown_to_bb | zotlabs | 2016-12-05 | 8 | -30/+32 |
| | | | |||||
* | | | typo | zotlabs | 2016-12-04 | 1 | -1/+1 |
| | | | |||||
* | | | minor optimisation to reduce code duplication | zotlabs | 2016-12-04 | 1 | -11/+7 |
| | | | |||||
* | | | setup: a bit more text cleanup | zotlabs | 2016-12-04 | 1 | -1/+1 |
| | | | |||||
* | | | setup: we actually don't require proc_open any more, so remove that check. | zotlabs | 2016-12-04 | 1 | -9/+3 |
| | | | |||||
* | | | api_zot: implement /api/z/1.0/network/stream and fix /api/z/1.0/channel/stream | zotlabs | 2016-12-04 | 3 | -4/+54 |
| | | | |||||
* | | | text syntax | zotlabs | 2016-12-04 | 1 | -1/+1 |
| | | | |||||
* | | | setup changes to check for shell_exec and exec functions | zotlabs | 2016-12-04 | 1 | -10/+21 |
| | | | |||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-12-04 | 8 | -15/+33 |
|\ \ \ | |||||
| * | | | translateable string | Mario Vavti | 2016-12-04 | 2 | -1/+2 |
| | | | | |||||
| * | | | implement content type in wiki list | Mario Vavti | 2016-12-04 | 3 | -6/+8 |
| | | | | |||||
| * | | | leave toc title for the author | Mario Vavti | 2016-12-04 | 1 | -2/+2 |
| | | | | |||||
* | | | | bugfix for api group_members | zotlabs | 2016-12-04 | 3 | -5/+151 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'upstream/dev' into doco | Andrew Manning | 2016-12-04 | 19 | -5048/+5367 |
| | |\ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-12-04 | 3 | -0/+108 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | more zot api documentation | zotlabs | 2016-12-04 | 3 | -0/+108 |
| | | | | |||||
| * | | | fixes for toc bbcode and bbcode wiki toc | Mario Vavti | 2016-12-04 | 5 | -9/+24 |
|/ / / | |||||
* | | | mod_item: better exception handling for api use | zotlabs | 2016-12-03 | 1 | -3/+27 |
| | | | |||||
* | | | correct the doco | zotlabs | 2016-12-03 | 1 | -2/+2 |
| | | | |||||
* | | | item_store: parent wasn't being returned in api call | zotlabs | 2016-12-03 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #609 from mjfriaza/dev | zotlabs | 2016-12-04 | 2 | -4927/+4933 |
|\ \ \ | | |/ | |/| | Updated the Spanish version | ||||
| * | | Updated the Spanish translation | Manuel Jiménez Friaza | 2016-12-03 | 2 | -4927/+4933 |
| | | | |||||
* | | | Merge pull request #608 from redmatrix/jeroenpraat-patch-1 | zotlabs | 2016-12-04 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix full screen for embedded videos | ||||
| * | | | Fix full screen for embedded videos | Jeroen van Riet Paap | 2016-12-03 | 1 | -1/+1 |
| | | | |