Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #592 from mjfriaza/dev | zotlabs | 2016-11-19 | 2 | -6175/+10025 |
|\ | | | | | Updated the Spanish translation and fixed a grammatical concordance error at file connedit in Spanish contextual help | ||||
| * | Updated the Spanish translation | Manuel Jiménez Friaza | 2016-11-19 | 2 | -6175/+10025 |
| | | |||||
* | | Hide all content if no wiki is selected except for a message saying to ↵ | Andrew Manning | 2016-11-18 | 1 | -1/+6 |
| | | | | | | | | choose one. | ||||
* | | Move page list back out to the side menu, but with the new page form below ↵ | Andrew Manning | 2016-11-18 | 4 | -41/+47 |
| | | | | | | | | 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 | 1 | -5/+5 |
| | | | | | | | | first in the list. | ||||
* | | Merge branch 'dev' into wiki-gui | Andrew Manning | 2016-11-18 | 2 | -6/+2 |
|\ \ | |||||
| * | | revert simple checkbox | Mario Vavti | 2016-11-18 | 3 | -9/+2 |
| | | | |||||
| * | | add a simple checkbox template for use in widgets | Mario Vavti | 2016-11-18 | 2 | -5/+8 |
| |/ | |||||
* | | 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. | ||||
* | wiki list fixes | Mario Vavti | 2016-11-17 | 2 | -52/+50 |
| | |||||
* | Highlight active wiki in list in preparation for removing active wiki name ↵ | Andrew Manning | 2016-11-17 | 1 | -1/+1 |
| | | | | 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 | 2 | -29/+30 |
|/ | |||||
* | remove print margin and set wrap mode to free | Mario Vavti | 2016-11-16 | 1 | -0/+2 |
| | |||||
* | remove redundant function call | Mario Vavti | 2016-11-16 | 1 | -4/+3 |
| | |||||
* | use modal-lg instead of width 80% | Mario Vavti | 2016-11-16 | 1 | -2/+1 |
| | |||||
* | minor wiki changes | Mario Vavti | 2016-11-16 | 2 | -2/+7 |
| | |||||
* | still a bit of wiki permission weirdness, this should catch the major ones | zotlabs | 2016-11-15 | 2 | -6/+1 |
| | |||||
* | use same icon with rest of app | zotlabs | 2016-11-15 | 1 | -1/+1 |
| | |||||
* | wiki: permissions issues, untranslated strings in templates and some minor ↵ | zotlabs | 2016-11-15 | 3 | -15/+19 |
| | | | | changes to provide a consistent UI with the rest of the app. | ||||
* | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-11-14 | 2 | -582/+612 |
|\ | |||||
| * | Update DE translation strings | phellmes | 2016-11-14 | 2 | -582/+612 |
| | | |||||
| * | show wiki controls only to owner and whitespace fixes | Mario Vavti | 2016-11-14 | 1 | -5/+7 |
| | | |||||
* | | Moved delete wiki button into new edit wiki form, opened by edit wiki icon ↵ | Andrew Manning | 2016-11-14 | 2 | -28/+29 |
| | | | | | | | | in wiki list | ||||
* | | Moved new wiki and new page buttons to widgets | Andrew Manning | 2016-11-14 | 3 | -348/+391 |
|/ | |||||
* | Bring Ace editor into focus when Edit tab is clicked to allow immediate text ↵ | Andrew Manning | 2016-11-12 | 1 | -2/+6 |
| | | | | entry. | ||||
* | Removed wiki list dropdown menus, moving the download and delete icons to ↵ | Andrew Manning | 2016-11-12 | 1 | -14/+6 |
| | | | | beside the open wiki link. | ||||
* | Moved save to bottom. Created Wiki Tools dropdown to be consistent, moved ↵ | Andrew Manning | 2016-11-12 | 1 | -20/+49 |
| | | | | page tools in there as well as new page and new wiki | ||||
* | Move save button to tab bar | Andrew Manning | 2016-11-12 | 1 | -3/+5 |
| | |||||
* | Wiki control dropdown menu improvement | Andrew Manning | 2016-11-12 | 1 | -9/+9 |
| | |||||
* | typo when consolidating icons | zotlabs | 2016-11-08 | 1 | -1/+1 |
| | |||||
* | use a single icon | zotlabs | 2016-11-08 | 1 | -2/+2 |
| | |||||
* | let's use the bar-chart icon for voting to make the look consistent with the ↵ | zotlabs | 2016-11-07 | 1 | -1/+1 |
| | | | | event attendance button and hint at its function | ||||
* | distinguish the buttons for voting and attendance by adding a calendar icon ↵ | zotlabs | 2016-11-07 | 1 | -1/+1 |
| | | | | to the button used for attendance | ||||
* | cleanup and re-organise the voting and attendance buttons | zotlabs | 2016-11-07 | 2 | -19/+36 |
| | |||||
* | reorganise emoticons | zotlabs | 2016-11-06 | 1 | -4/+4 |
| | |||||
* | some fixes for the recent changes in the personal menu dropdown | Mario Vavti | 2016-11-04 | 2 | -2/+6 |
| | |||||
* | Collapse navbar-collapse-1 if avatar menu is clicked. | Andrew Manning | 2016-11-03 | 1 | -0/+6 |
| | |||||
* | provide merged usermenu div for all server roles | zotlabs | 2016-11-02 | 1 | -4/+0 |
| | |||||
* | convert manual page updates to a display setting instead of a feature | zotlabs | 2016-11-02 | 1 | -0/+1 |
| | |||||
* | allow your own likes/comments to be updated when in static update mode | zotlabs | 2016-11-02 | 2 | -6/+7 |
| | |||||
* | Merge pull request #574 from zotlabs/static_update | git-marijus | 2016-11-02 | 2 | -0/+8 |
|\ | | | | | feature: static page update as opposed to live update of conversation… | ||||
| * | feature: static page update as opposed to live update of conversations on ↵ | zotlabs | 2016-11-01 | 2 | -0/+8 |
| | | | | | | | | the page. Changes will be queued until the page is reloaded. There may or may not be notifications of pending activity updates depending on your notification preferences. Endless scrolling (append) is still performed either way. This only affects changed and new/unseen items being inserted into the page. | ||||
* | | retry liveupdate up to 10 times if we receive incomplete/truncated html data. | zotlabs | 2016-11-01 | 1 | -1/+22 |
|/ | |||||
* | update DE translation strings | phellmes | 2016-11-01 | 2 | -6139/+9906 |
| |