Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
| * | 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 | Mario Vavti | 2016-11-29 | 1 | -1/+1 |
|\| | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-11-29 | 3 | -39/+50 |
| |\ | |||||
| * | | missed this from the earlier checkin | zotlabs | 2016-11-29 | 1 | -1/+1 |
| | | | |||||
* | | | rename function | Mario Vavti | 2016-11-29 | 1 | -13/+13 |
| |/ |/| | |||||
* | | 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 |
|\| | |||||
| * | 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 |
| | | | |||||
* | | | some basic work for implementing mimetypes for wikis | Mario Vavti | 2016-11-28 | 3 | -9/+16 |
| |/ |/| | |||||
* | | 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. | ||||
| * | | Use the jquery.toc.js library to auto-generate a table of contents for the ↵ | Andrew Manning | 2016-11-27 | 3 | -26/+35 |
| | | | | | | | | | | | | loaded page under the side nav menu | ||||
| * | | 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 |
| | | | |||||
| * | | Add ability to include page assets in documentation pages such as images. ↵ | Andrew Manning | 2016-11-27 | 29 | -26/+57 |
| | | | | | | | | | | | | Updated Personal Channel tutorial to use local images using this new capability. | ||||
| * | | Added Tutorials section with a Personal Channel tutorial | Andrew Manning | 2016-11-27 | 3 | -1/+198 |
| | | | |||||
| * | | Restructured main table of contents to link to fewer pages with more ↵ | Andrew Manning | 2016-11-27 | 6 | -31/+965 |
| | | | | | | | | | | | | content. The admin, dev, and member guides are single pages each having a table of contents at the top that is represented in condensed form in the main navigation sidebar. Section links are used to navigate between content sections for simplicity and fewer page loads. | ||||
| * | | Update webpages and wiki context help | Andrew Manning | 2016-11-26 | 2 | -2/+4 |
| | | | |||||
| * | | Update wiki context help. Modify context page element focus feature to do ↵ | Andrew Manning | 2016-11-26 | 29 | -12/+1192 |
| | | | | | | | | | | | | nothing if the target DOM element is not found. | ||||
* | | | 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 |
|/ / | |||||
* | | rearrange buttons | Mario Vavti | 2016-11-25 | 1 | -16/+18 |
| | | |||||
* | | Merge pull request #601 from anaqreon/wiki | git-marijus | 2016-11-25 | 1 | -1/+12 |
|\ \ | |/ |/| | Wiki: Make a git commit when a new page is created | ||||
| * | Make a git commit when a new page is created, recording who created the page. | Andrew Manning | 2016-11-24 | 1 | -1/+12 |
| | | |||||
* | | prev-next navigation for mod_connedit | zotlabs | 2016-11-24 | 2 | -3/+46 |
|/ | |||||
* | missing semicolon | Mario Vavti | 2016-11-23 | 1 | -1/+1 |
| | |||||
* | whitespace and minor fixes | Mario Vavti | 2016-11-23 | 2 | -18/+13 |
| | |||||
* | whitespace and minor fixes | Mario Vavti | 2016-11-23 | 2 | -82/+56 |
| | |||||
* | Merge pull request #599 from anaqreon/wiki | git-marijus | 2016-11-23 | 1 | -30/+41 |
|\ | | | | | Wiki save button | ||||
| * | Toggle save button depending on editor changes and return to editor instead ↵ | Andrew Manning | 2016-11-23 | 1 | -30/+41 |
|/ | | | | of history pane after saving | ||||
* | silence headers already sent warning. issue #596 | Mario Vavti | 2016-11-23 | 1 | -6/+9 |
| | |||||
* | whitespace and coding style | Mario Vavti | 2016-11-23 | 1 | -8/+17 |
| | |||||
* | whitespace cleanup | Mario Vavti | 2016-11-23 | 1 | -25/+25 |
| | |||||
* | finish removing self | zotlabs | 2016-11-22 | 7 | -99/+3 |
| | |||||
* | missing plugins in zot-info | zotlabs | 2016-11-22 | 1 | -1/+1 |
| | |||||
* | notification issue | zotlabs | 2016-11-22 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-11-22 | 14 | -162/+241 |
|\ | |||||
| * | do not use nested section-content-wrapper class | Mario Vavti | 2016-11-22 | 1 | -3/+3 |
| | | |||||
| * | use plural since we can have more than one wiki | Mario Vavti | 2016-11-22 | 2 | -2/+2 |
| | |