Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |\ | | | |/ | | |/| | |||||
| | * | | This isn't the most elegant solution as it requires a bit of arcane ↵ | zotlabs | 2016-11-29 | 3 | -6/+9 |
| | | | | | | | | | | | | | | | | knowledge, but provide a way to step through connections with a specific tab/panel open in the connection editor. It does not close the default panel, but merely opens the one specified by a §ion= URL parameter (closing the default panel would require a major refactoring of the default panel logic). Valid choices for section currently are affinity, filter, and perms. This tab/panel selection should persist across form posting and 'prev/next'. | ||||
| | * | | wrong link | zotlabs | 2016-11-29 | 1 | -1/+1 |
| | | | | |||||
| | * | | provide a fresh new look and cleaner layout and more relevant information to ↵ | zotlabs | 2016-11-29 | 5 | -78/+81 |
| | | | | | | | | | | | | | | | | siteinfo | ||||
| | * | | highlight | zotlabs | 2016-11-29 | 2 | -1/+7 |
| |/ / | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-11-29 | 3 | -39/+50 |
| |\ \ | |/ / |/| | | |||||
* | | | more work on wiki mimetypes | Mario Vavti | 2016-11-29 | 2 | -31/+35 |
| | | | |||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-11-29 | 4 | -682/+693 |
|\ \ \ | |||||
* | | | | some basic work for implementing mimetypes for wikis | Mario Vavti | 2016-11-28 | 3 | -9/+16 |
| | | | | |||||
| | * | | missed this from the earlier checkin | zotlabs | 2016-11-29 | 1 | -1/+1 |
| |/ / | |||||
| * | | roll standard version to ensure that dba_pdo is the default and make this a ↵ | zotlabs | 2016-11-28 | 1 | -1/+1 |
| | | | | | | | | | | | | dependency for the cdav plugin | ||||
| * | | minor re-arrange | zotlabs | 2016-11-28 | 1 | -4/+4 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-11-28 | 52 | -97/+2005 |
| |\ \ | |/ / |/| | | |||||
| * | | connedit prev/next: sort in the db. | zotlabs | 2016-11-26 | 2 | -677/+688 |
| | | | |||||
| | * | Major changes to accordion nav menu. Table of contents auto-generated below ↵ | Andrew Manning | 2016-11-29 | 8 | -126/+674 |
| | | | | | | | | | | | | the loaded page. Removed manual TOCs from individual pages. TOC uses jQuery plugin Sticky to remain visible when it would scroll out of view. | ||||
| | * | Toggle section folder icon between open and closed when selected. A bug ↵ | Andrew Manning | 2016-11-29 | 1 | -5/+19 |
| | | | | | | | | | | | | prevents it from working properly the first time a section is opened. | ||||
| | * | Merge remote-tracking branch 'upstream/dev' into doco | Andrew Manning | 2016-11-28 | 7 | -58/+110 |
| | |\ | |_|/ |/| | | |||||
* | | | Merge pull request #602 from anaqreon/doco | git-marijus | 2016-11-28 | 44 | -23/+1866 |
|\ \ \ | | | | | | | | | Update context help content and context page element focus feature. |