Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
| * | display wiki list on wiki landing page. | Mario Vavti | 2016-11-22 | 8 | -91/+171 |
| | | |||||
| * | Merge pull request #595 from git-marijus/dev | zotlabs | 2016-11-21 | 2 | -12/+11 |
| |\ | | | | | | | move the remote user homebutton to the user menu. this way everything… | ||||
| | * | move the remote user homebutton to the user menu. this way everything remote ↵ | Mario Vavti | 2016-11-20 | 2 | -12/+11 |
| | | | | | | | | | | | | user related is in one place. | ||||
| * | | Merge pull request #593 from mjfriaza/dev | git-marijus | 2016-11-20 | 2 | -53/+53 |
| |\ \ | | |/ | |/| | Updated ES-ES: better revision of some plugins | ||||
| | * | Updated ES-ES: better revision of some plugins | Manuel Jiménez Friaza | 2016-11-20 | 2 | -53/+53 |
| | | | |||||
| * | | fix #594 | Mario Vavti | 2016-11-20 | 1 | -1/+1 |
| | | | |||||
* | | | db update required for Zot2 | zotlabs | 2016-11-22 | 7 | -11/+28 |
| | | | |||||
* | | | wrong function | zotlabs | 2016-11-21 | 1 | -3/+3 |
| | | | |||||
* | | | zot: specify crypto method | zotlabs | 2016-11-20 | 4 | -7/+12 |
|/ / | |||||
* | | Do not render maps for Diaspora destinations. | zotlabs | 2016-11-19 | 1 | -0/+6 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-11-19 | 3 | -6176/+10026 |
|\ \ | |||||
| * | | Merge pull request #592 from mjfriaza/dev | zotlabs | 2016-11-19 | 3 | -6176/+10026 |
| |\| | | | | | | | Updated the Spanish translation and fixed a grammatical concordance error at file connedit in Spanish contextual help | ||||
| | * | Fixed a grammatical concordance error at file connedit in Spanish contextual ↵ | Manuel Jiménez Friaza | 2016-11-19 | 1 | -1/+1 |
| | | | | | | | | | | | | help | ||||
| | * | Updated the Spanish translation | Manuel Jiménez Friaza | 2016-11-19 | 2 | -6175/+10025 |
| | | | |||||
* | | | redmatrix is no longer considered a supported platform and will not be ↵ | zotlabs | 2016-11-19 | 3 | -5/+11 |
|/ / | | | | | | | listed in pubsites as of 2.x | ||||
* | | string update | zotlabs | 2016-11-18 | 1 | -2773/+2827 |
| | | |||||
* | | Merge pull request #591 from anaqreon/wiki-gui | zotlabs | 2016-11-19 | 6 | -55/+83 |
|\ \ | | | | | | | Wiki UI improvements | ||||
| * | | Hide all content if no wiki is selected except for a message saying to ↵ | Andrew Manning | 2016-11-18 | 2 | -3/+9 |
| | | | | | | | | | | | | choose one. | ||||
| * | | Move page list back out to the side menu, but with the new page form below ↵ | Andrew Manning | 2016-11-18 | 6 | -41/+49 |
| | | | | | | | | | | | | the new page button like the new wiki form. Disable text editing if viewer lacks edit permission, and change the tab label to Source instead of Edit in that case. | ||||
| * | | Wiki pages display in tab to the left of the edit pane tab. Home is always ↵ | Andrew Manning | 2016-11-18 | 2 | -6/+9 |
| | | | | | | | | | | | | first in the list. | ||||
| * | | Merge branch 'dev' into wiki-gui | Andrew Manning | 2016-11-18 | 3 | -8/+4 |
| |\ \ | |/ / |/| | | |||||
* | | | revert simple checkbox | Mario Vavti | 2016-11-18 | 4 | -10/+3 |
| | | | |||||
* | | | add a simple checkbox template for use in widgets | Mario Vavti | 2016-11-18 | 3 | -7/+10 |
| |/ |/| | |||||
| * | move commit message and save button into edit pane. Change page list tab ↵ | Andrew Manning | 2016-11-18 | 2 | -19/+20 |
| | | | | | | | | label to Pages and move current page name back to section header. | ||||
| * | Remove page widget completely. Render the page list in a tab alongside ↵ | Andrew Manning | 2016-11-17 | 2 | -16/+26 |
|/ | | | | History Edit and renamed View tabs. Move new page form below new page button within this page list tab. | ||||
* | dba_pdo: return false on q() DB error like the old driver did | zotlabs | 2016-11-17 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-11-17 | 8 | -85/+152 |
|\ | |||||
| * | Merge pull request #590 from encyclomundi/dev | zotlabs | 2016-11-18 | 4 | -1/+5 |
| |\ | | | | | | | Minor Change: add Guest Access Token permission option. | ||||
| | * | added member OpenID member URL | Your Name | 2016-11-17 | 1 | -1/+1 |
| | | | |||||
| | * | added Guest Access Token | Your Name | 2016-11-17 | 1 | -0/+1 |
| | | | |||||
| | * | Added observer.webname | Your Name | 2016-11-17 | 1 | -0/+1 |
| | | | |||||
| | * | Minor Change: add Guest Access Token permission option. | Your Name | 2016-11-17 | 1 | -0/+2 |
| | | | |||||
| * | | wiki list fixes | Mario Vavti | 2016-11-17 | 3 | -54/+54 |
| |/ | |||||
| * | Merge pull request #589 from anaqreon/wiki-gui | git-marijus | 2016-11-17 | 3 | -70/+124 |
| |\ | | | | | | | Active wiki highlighting, move wiki edit panel into wiki list | ||||
| | * | Highlight active wiki in list in preparation for removing active wiki name ↵ | Andrew Manning | 2016-11-17 | 2 | -2/+14 |
| | | | | | | | | | | | | from content section header to make room for page list viewer | ||||
| | * | Merge remote-tracking branch 'upstream/dev' into wiki-gui | Andrew Manning | 2016-11-17 | 1 | -7/+16 |
| | |\ | | |/ | |/| | |||||
| * | | remove redundant comma | Mario Vavti | 2016-11-17 | 1 | -1/+1 |
| | | | |||||
| * | | configure ace with setOptions, get rid of redundant scrollbars | Mario Vavti | 2016-11-17 | 1 | -7/+16 |
| | | | |||||
| | * | Hide edit dialog if new wiki dialog opens | Andrew Manning | 2016-11-16 | 1 | -1/+1 |
| | | | |||||
| | * | Create wiki edit dialogs directly underneath the wiki name in the wiki list | Andrew Manning | 2016-11-16 | 2 | -42/+43 |
| | | | |||||
| | * | Move new wiki dialog directly underneath new wiki button in wiki list widget | Andrew Manning | 2016-11-16 | 3 | -54/+95 |
| |/ | |||||
* / | issue #588, change 'Bug Report' app to 'Report Bug' | zotlabs | 2016-11-17 | 4 | -21/+14 |
|/ | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-11-16 | 3 | -10/+26 |
|\ |