| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
|\ |
|
| * | Add resources and links. Fix bug where table of contents was not generated if... | Andrew Manning | 2016-11-30 | 2 | -1/+8 |
| * | Reverted governance to previous version accidentally clobbered. Removed histo... | Andrew Manning | 2016-11-30 | 1 | -241/+92 |
| * | Added some vertical offset to headings so that the table of contents links do... | Andrew Manning | 2016-11-30 | 3 | -1/+19 |
| * | 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 markd... | Mario Vavti | 2016-11-30 | 5 | -26/+79 |
| |/ /
|/| | |
|
* | | | 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 knowledge... | zotlabs | 2016-11-29 | 3 | -6/+9 |
| | * | | 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 |
| | * | | 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 d... | zotlabs | 2016-11-28 | 1 | -1/+1 |
| * | | 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 t... | Andrew Manning | 2016-11-29 | 8 | -126/+674 |
| | * | Toggle section folder icon between open and closed when selected. A bug preve... | Andrew Manning | 2016-11-29 | 1 | -5/+19 |
| | * | 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 |
|\ \ \ |
|
* | | | | minor cleanup and remove more double encoding | Mario Vavti | 2016-11-28 | 3 | -18/+11 |
* | | | | wiki: move delete page functionality to the widget | Mario Vavti | 2016-11-28 | 6 | -40/+99 |
| | | * | Autoscroll page table of contents near top of side nav menu if on large scree... | Andrew Manning | 2016-11-28 | 1 | -5/+11 |
| | |/
| |/| |
|
| * | | Use the jquery.toc.js library to auto-generate a table of contents for the lo... | Andrew Manning | 2016-11-27 | 3 | -26/+35 |
| * | | Integrating lots of member guide content | Andrew Manning | 2016-11-27 | 4 | -17/+480 |
| * | | Add some identity-aware parsing to HTML content using parseIdentityAwareHTML() | Andrew Manning | 2016-11-27 | 25 | -1036/+63 |