aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2016-12-0419-5048/+5367
|\
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-12-043-0/+108
| |\
| | * more zot api documentationzotlabs2016-12-043-0/+108
| * | fixes for toc bbcode and bbcode wiki tocMario Vavti2016-12-045-9/+24
| |/
| * mod_item: better exception handling for api usezotlabs2016-12-031-3/+27
| * correct the docozotlabs2016-12-031-2/+2
| * item_store: parent wasn't being returned in api callzotlabs2016-12-031-0/+1
| * Merge pull request #609 from mjfriaza/devzotlabs2016-12-042-4927/+4933
| |\
| | * Updated the Spanish translationManuel Jiménez Friaza2016-12-032-4927/+4933
| * | Merge pull request #608 from redmatrix/jeroenpraat-patch-1zotlabs2016-12-041-1/+1
| |\ \
| | * | Fix full screen for embedded videosJeroen van Riet Paap2016-12-031-1/+1
| * | | put all the api related stuff in the api folderzotlabs2016-12-034-0/+0
| * | | rename api endpoint yet again. item/store appears to be blacklisted in some h...zotlabs2016-12-033-108/+229
| * | | api xchan doczotlabs2016-12-031-0/+44
| |/ /
* | | Remove borders and box-shadow with CSS without removing the classes from help...Andrew Manning2016-12-042-3/+27
* | | Remove classes from the doco content region to simplify the appearance. Inste...Andrew Manning2016-12-032-5/+3
|/ /
* | more api work for item/store and docozotlabs2016-12-023-6/+17
* | editszotlabs2016-12-021-1/+2
* | initial doco for the item/store api callzotlabs2016-12-021-0/+91
* | api function item/new renamed to item/store as that more closely reflects its...zotlabs2016-12-022-30/+57
* | fix the forum widget for forums with custom permszotlabs2016-12-022-10/+22
* | string updatezotlabs2016-12-021-3619/+3609
* | fix embed image for text/bbcodeMario Vavti2016-12-021-0/+5
* | fallback directory servers need to be in the same realmzotlabs2016-12-011-3/+1
* | upgraded zotlabs.com to httpszotlabs2016-12-011-1/+1
* | bb_highlight: if somebody enters an unsupported language for code syntax high...zotlabs2016-12-011-3/+3
* | sql error in fetch conversationzotlabs2016-12-011-1/+1
* | trim both key and iv on other cipherszotlabs2016-12-011-0/+2
* | trim iv in STD_encapsulatezotlabs2016-12-012-0/+3
* | versioning for permission additions to ensure we're using the same set of fileszotlabs2016-12-013-0/+14
* | extensible perms: the really, really hard part - figuring out what to do abou...zotlabs2016-12-013-10/+69
* | compatible_project: we are only concerned with the default realmzotlabs2016-12-011-0/+4
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-012-267/+262
|\ \
| * | use highlight in ac-list for hl bbcodeMario Vavti2016-12-011-1/+2
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-12-013-4/+4
| |\ \
| * | | whitespace fixesMario Vavti2016-12-011-266/+260
* | | | allow plugins to cancel item_store() and item_store_update()zotlabs2016-12-011-0/+11
| |/ / |/| |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-012-50/+48
|\| |
| * | more wiki cleanupMario Vavti2016-12-012-7/+6
| * | wiki cleanup - wip. please watch out for eventual regressionsMario Vavti2016-12-012-45/+44
* | | issue #607 parens not recognised inside urlszotlabs2016-12-013-4/+4
|/ /
* | issue #606, postgres binary data handling under PDO and HHVM when passed nullzotlabs2016-11-301-1/+1
* | Merge pull request #605 from anaqreon/docozotlabs2016-12-019-114/+558
|\ \
| * | Add resources and links. Fix bug where table of contents was not generated if...Andrew Manning2016-11-302-1/+8
| * | Reverted governance to previous version accidentally clobbered. Removed histo...Andrew Manning2016-11-301-241/+92
| * | Added some vertical offset to headings so that the table of contents links do...Andrew Manning2016-11-303-1/+19
| * | Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2016-11-3018-211/+410
| |\ \ | |/ / |/| |
* | | advanced crypto restricted by server rolezotlabs2016-11-302-0/+6
* | | zot 1.2zotlabs2016-11-3011-169/+307
* | | do not call purify_html() at this placeMario Vavti2016-11-301-2/+4