Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '2.0RC' | Mario Vavti | 2016-12-23 | 48 | -4277/+3167 |
|\ | |||||
| * | fix a glitch in sticky-kit and comment out alt_pager() in ↵ | Mario Vavti | 2016-12-21 | 1 | -1/+1 |
| | | | | | | | | widget_conversations since it will not work there | ||||
| * | deprecate bb_iframe | zotlabs | 2016-12-18 | 1 | -9/+9 |
| | | |||||
| * | z_fetch_url incorrect variable | zotlabs | 2016-12-15 | 1 | -5/+5 |
| | | |||||
| * | postgres is picky about this stuff | zotlabs | 2016-12-14 | 1 | -2/+2 |
| | | |||||
| * | Merge branch '2.0RC' of https://github.com/redmatrix/hubzilla into 2.0RC_merge | zotlabs | 2016-12-14 | 1 | -1/+2 |
| |\ | |||||
| | * | fix regex | Mario Vavti | 2016-12-14 | 1 | -1/+1 |
| | | | |||||
| | * | wiki: do not show revert buttons if we do not have write perms and minor cleanup | Mario Vavti | 2016-12-14 | 1 | -1/+2 |
| | | | |||||
| * | | markdown regex | zotlabs | 2016-12-14 | 1 | -2/+3 |
| |/ | |||||
| * | bring lockview to wikilist | Mario Vavti | 2016-12-13 | 1 | -1/+2 |
| | | |||||
| * | simplify wikilist widget | Mario Vavti | 2016-12-13 | 1 | -82/+11 |
| | | |||||
| * | move the rest of superblock out of core | zotlabs | 2016-12-11 | 1 | -47/+13 |
| | | |||||
| * | clone sync missing for some item delete operations | zotlabs | 2016-12-11 | 1 | -28/+28 |
| | | |||||
| * | fix embed-image for fullscreen mode and some adjustments for /help | Mario Vavti | 2016-12-10 | 1 | -1/+1 |
| | | |||||
| * | superblock issue + string update | zotlabs | 2016-12-09 | 1 | -2/+2 |
| | | |||||
| * | 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 |
| | | |||||
| * | always check api_user | zotlabs | 2016-12-07 | 1 | -8/+19 |
| | | |||||
| * | document the api filedata call | zotlabs | 2016-12-07 | 1 | -2/+2 |
| | | |||||
| * | attach_list_files bugfix | zotlabs | 2016-12-06 | 2 | -2/+8 |
| | | |||||
| * | api files improvements/fixes and documentation | zotlabs | 2016-12-06 | 2 | -3/+9 |
| | | |||||
| * | 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 |