Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|/ / | |||||
* | | 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 |
|\ \ | |||||
| * | | use highlight in ac-list for hl bbcode | Mario Vavti | 2016-12-01 | 1 | -1/+2 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-12-01 | 3 | -4/+4 |
| |\ \ | |||||
| * | | | whitespace fixes | Mario Vavti | 2016-12-01 | 1 | -266/+260 |
| | | | | |||||
* | | | | allow plugins to cancel item_store() and item_store_update() | zotlabs | 2016-12-01 | 1 | -0/+11 |
| |/ / |/| | | |||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-12-01 | 2 | -50/+48 |
|\| | | |||||
| * | | more wiki cleanup | Mario Vavti | 2016-12-01 | 2 | -7/+6 |
| | | | |||||
| * | | wiki cleanup - wip. please watch out for eventual regressions | Mario Vavti | 2016-12-01 | 2 | -45/+44 |
| | | | |||||
* | | | issue #607 parens not recognised inside urls | zotlabs | 2016-12-01 | 3 | -4/+4 |
|/ / | |||||
* | | issue #606, postgres binary data handling under PDO and HHVM when passed null | zotlabs | 2016-11-30 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #605 from anaqreon/doco | zotlabs | 2016-12-01 | 9 | -114/+558 |
|\ \ | | | | | | | Another iteration of documentation | ||||
| * | | Add resources and links. Fix bug where table of contents was not generated ↵ | Andrew Manning | 2016-11-30 | 2 | -1/+8 |
| | | | | | | | | | | | | if URL had a sectionspecified like /help/blah#anchor | ||||
| * | | Reverted governance to previous version accidentally clobbered. Removed ↵ | Andrew Manning | 2016-11-30 | 1 | -241/+92 |
| | | | | | | | | | | | | history page. Added credits. | ||||
| * | | Added some vertical offset to headings so that the table of contents links ↵ | Andrew Manning | 2016-11-30 | 3 | -1/+19 |
| | | | | | | | | | | | | do not hide the heading under the navbar. Added the About this Hub content | ||||
| * | | Merge remote-tracking branch 'upstream/dev' into doco | Andrew Manning | 2016-11-30 | 18 | -211/+410 |
| |\ \ | |/ / |/| | | |||||
* | | | advanced crypto restricted by server role | zotlabs | 2016-11-30 | 2 | -0/+6 |
| | | | |||||
* | | | zot 1.2 | zotlabs | 2016-11-30 | 11 | -169/+307 |
| | | | |||||
* | | | do not call purify_html() at this place | Mario Vavti | 2016-11-30 | 1 | -2/+4 |
| | | | |||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-11-30 | 1 | -2/+2 |
|\ \ \ | |||||
| * \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-11-30 | 1 | -13/+13 |
| |\ \ \ | |||||
| * | | | | pubsites: don't list dead sites | zotlabs | 2016-11-30 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | go live with wiki mimetypes - you can now choose if a wiki will contain ↵ | Mario Vavti | 2016-11-30 | 5 | -26/+79 |
| |/ / / |/| | | | | | | | | | | | markdown or bb-code markup | ||||
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-11-30 | 9 | -84/+96 |
|\| | | | |||||
| * | | | provide role on siteinfo page | zotlabs | 2016-11-29 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-11-29 | 1 | -1/+1 |
|\ \ \ \ | |||||
* | | | | | rename function | Mario Vavti | 2016-11-29 | 1 | -13/+13 |
| | | | | | |||||
| | | * | | Merge remote-tracking branch 'upstream/dev' into doco | Andrew Manning | 2016-11-29 | 16 | -806/+840 |
| | | |\ \ | | | |/ / | | |/| | |