Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/dev' into doco | Andrew Manning | 2016-12-05 | 7 | -34/+78 |
|\ | |||||
| * | minor changes to config api and markdown_to_bb | zotlabs | 2016-12-05 | 2 | -14/+16 |
| | | |||||
| * | typo | zotlabs | 2016-12-04 | 1 | -1/+1 |
| | | |||||
| * | minor optimisation to reduce code duplication | zotlabs | 2016-12-04 | 1 | -11/+7 |
| | | |||||
| * | api_zot: implement /api/z/1.0/network/stream and fix /api/z/1.0/channel/stream | zotlabs | 2016-12-04 | 2 | -3/+49 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-12-04 | 2 | -5/+7 |
| |\ | |||||
| | * | implement content type in wiki list | Mario Vavti | 2016-12-04 | 1 | -1/+1 |
| | | | |||||
| | * | leave toc title for the author | Mario Vavti | 2016-12-04 | 1 | -2/+2 |
| | | | |||||
| * | | bugfix for api group_members | zotlabs | 2016-12-04 | 1 | -2/+2 |
| | | | |||||
* | | | Merge remote-tracking branch 'upstream/dev' into doco | Andrew Manning | 2016-12-04 | 4 | -9/+12 |
|\ \ \ | | |/ | |/| | |||||
| * | | fixes for toc bbcode and bbcode wiki toc | Mario Vavti | 2016-12-04 | 1 | -4/+6 |
| |/ | |||||
| * | item_store: parent wasn't being returned in api call | zotlabs | 2016-12-03 | 1 | -0/+1 |
| | | |||||
| * | 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 |
| | | | |||||
| * | | rename api endpoint yet again. item/store appears to be blacklisted in some ↵ | zotlabs | 2016-12-03 | 1 | -4/+4 |
| |/ | | | | | | | hosting environments. | ||||
* / | Remove classes from the doco content region to simplify the appearance. ↵ | Andrew Manning | 2016-12-03 | 1 | -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 doco | zotlabs | 2016-12-02 | 1 | -4/+3 |
| | |||||
* | api function item/new renamed to item/store as that more closely reflects ↵ | zotlabs | 2016-12-02 | 1 | -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 perms | zotlabs | 2016-12-02 | 2 | -10/+22 |
| | |||||
* | 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 | 1 | -0/+2 |
| | |||||
* | allow plugins to cancel item_store() and item_store_update() | zotlabs | 2016-12-01 | 1 | -0/+11 |
| | |||||
* | issue #607 parens not recognised inside urls | zotlabs | 2016-12-01 | 1 | -1/+1 |
| | |||||
* | issue #606, postgres binary data handling under PDO and HHVM when passed null | zotlabs | 2016-11-30 | 1 | -1/+1 |
| | |||||
* | advanced crypto restricted by server role | zotlabs | 2016-11-30 | 2 | -0/+6 |
| | |||||
* | zot 1.2 | zotlabs | 2016-11-30 | 3 | -162/+270 |
| | |||||
* | go live with wiki mimetypes - you can now choose if a wiki will contain ↵ | Mario Vavti | 2016-11-30 | 1 | -2/+1 |
| | | | | markdown or bb-code markup | ||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-11-30 | 1 | -0/+6 |
|\ | |||||
| * | highlight | zotlabs | 2016-11-29 | 1 | -0/+6 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-11-29 | 1 | -1/+1 |
|\| | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-11-29 | 1 | -31/+40 |
| |\ | |||||
| * | | missed this from the earlier checkin | zotlabs | 2016-11-29 | 1 | -1/+1 |
| | | | |||||
* | | | rename function | Mario Vavti | 2016-11-29 | 1 | -13/+13 |
| |/ |/| | |||||
* | | more work on wiki mimetypes | Mario Vavti | 2016-11-29 | 1 | -27/+30 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-11-29 | 1 | -4/+4 |
|\| | |||||
| * | minor re-arrange | zotlabs | 2016-11-28 | 1 | -4/+4 |
| | | |||||
* | | some basic work for implementing mimetypes for wikis | Mario Vavti | 2016-11-28 | 1 | -5/+11 |
|/ | |||||
* | Merge pull request #602 from anaqreon/doco | git-marijus | 2016-11-28 | 2 | -2/+44 |
|\ | | | | | Update context help content and context page element focus feature. | ||||
| * | Integrating lots of member guide content | Andrew Manning | 2016-11-27 | 1 | -0/+3 |
| | | |||||
| * | Add some identity-aware parsing to HTML content using parseIdentityAwareHTML() | Andrew Manning | 2016-11-27 | 2 | -1/+40 |
| | | |||||
| * | Add ability to include page assets in documentation pages such as images. ↵ | Andrew Manning | 2016-11-27 | 1 | -1/+1 |
| | | | | | | | | Updated Personal Channel tutorial to use local images using this new capability. | ||||
* | | wiki: move delete page functionality to the widget | Mario Vavti | 2016-11-28 | 1 | -5/+18 |
|/ | |||||
* | whitespace and minor fixes | Mario Vavti | 2016-11-23 | 1 | -1/+1 |
| | |||||
* | missing plugins in zot-info | zotlabs | 2016-11-22 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-11-22 | 4 | -14/+12 |
|\ | |||||
| * | use plural since we can have more than one wiki | Mario Vavti | 2016-11-22 | 2 | -2/+2 |
| | | |||||
| * | display wiki list on wiki landing page. | Mario Vavti | 2016-11-22 | 1 | -1/+1 |
| | | |||||
| * | move the remote user homebutton to the user menu. this way everything remote ↵ | Mario Vavti | 2016-11-20 | 1 | -10/+8 |
| | | | | | | | | user related is in one place. |