Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | |||||
| * | | | put all the api related stuff in the api folder | zotlabs | 2016-12-03 | 4 | -0/+0 |
| | | | | |||||
| * | | | rename api endpoint yet again. item/store appears to be blacklisted in some ↵ | zotlabs | 2016-12-03 | 3 | -108/+229 |
| | | | | | | | | | | | | | | | | hosting environments. | ||||
| * | | | api xchan doc | zotlabs | 2016-12-03 | 1 | -0/+44 |
| |/ / | |||||
* | | | Remove borders and box-shadow with CSS without removing the classes from ↵ | Andrew Manning | 2016-12-04 | 2 | -3/+27 |
| | | | | | | | | | | | | help.tpl. | ||||
* | | | Remove classes from the doco content region to simplify the appearance. ↵ | Andrew Manning | 2016-12-03 | 2 | -5/+3 |
|/ / | | | | | | | 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 doco | zotlabs | 2016-12-02 | 3 | -6/+17 |
| | | |||||
* | | edits | zotlabs | 2016-12-02 | 1 | -1/+2 |
| | | |||||
* | | initial doco for the item/store api call | zotlabs | 2016-12-02 | 1 | -0/+91 |
| | | |||||
* | | api function item/new renamed to item/store as that more closely reflects ↵ | zotlabs | 2016-12-02 | 2 | -30/+57 |
| | | | | | | | | | | | | 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 perms | zotlabs | 2016-12-02 | 2 | -10/+22 |
| | | |||||
* | | string update | zotlabs | 2016-12-02 | 1 | -3619/+3609 |
| | | |||||
* | | fix embed image for text/bbcode | Mario Vavti | 2016-12-02 | 1 | -0/+5 |
| | | |||||
* | | fallback directory servers need to be in the same realm | zotlabs | 2016-12-01 | 1 | -3/+1 |
| | | |||||
* | | upgraded zotlabs.com to https | zotlabs | 2016-12-01 | 1 | -1/+1 |
| | | |||||
* | | bb_highlight: if somebody enters an unsupported language for code syntax ↵ | zotlabs | 2016-12-01 | 1 | -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 conversation | zotlabs | 2016-12-01 | 1 | -1/+1 |
| | | |||||
* | | trim both key and iv on other ciphers | zotlabs | 2016-12-01 | 1 | -0/+2 |
| | | |||||
* | | trim iv in STD_encapsulate | zotlabs | 2016-12-01 | 2 | -0/+3 |
| | | |||||
* | | versioning for permission additions to ensure we're using the same set of files | zotlabs | 2016-12-01 | 3 | -0/+14 |
| | | |||||
* | | extensible perms: the really, really hard part - figuring out what to do ↵ | zotlabs | 2016-12-01 | 3 | -10/+69 |
| | | | | | | | | about people with custom permissions so as to set sane defaults. | ||||
* | | compatible_project: we are only concerned with the default realm | zotlabs | 2016-12-01 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-12-01 | 2 | -267/+262 |
|\ \ |