aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #595 from git-marijus/devzotlabs2016-11-211-2/+3
|\ | | | | 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 Vavti2016-11-201-2/+3
| | | | | | | | user related is in one place.
* | Merge pull request #593 from mjfriaza/devgit-marijus2016-11-202-53/+53
|\ \ | |/ |/| Updated ES-ES: better revision of some plugins
| * Updated ES-ES: better revision of some pluginsManuel Jiménez Friaza2016-11-202-53/+53
| |
* | Merge pull request #592 from mjfriaza/devzotlabs2016-11-192-6175/+10025
|\| | | | | Updated the Spanish translation and fixed a grammatical concordance error at file connedit in Spanish contextual help
| * Updated the Spanish translationManuel Jiménez Friaza2016-11-192-6175/+10025
| |
* | Hide all content if no wiki is selected except for a message saying to ↵Andrew Manning2016-11-181-1/+6
| | | | | | | | choose one.
* | Move page list back out to the side menu, but with the new page form below ↵Andrew Manning2016-11-184-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 Manning2016-11-181-5/+5
| | | | | | | | first in the list.
* | Merge branch 'dev' into wiki-guiAndrew Manning2016-11-182-6/+2
|\ \
| * | revert simple checkboxMario Vavti2016-11-183-9/+2
| | |
| * | add a simple checkbox template for use in widgetsMario Vavti2016-11-182-5/+8
| |/
* | move commit message and save button into edit pane. Change page list tab ↵Andrew Manning2016-11-182-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 Manning2016-11-172-16/+26
|/ | | | History Edit and renamed View tabs. Move new page form below new page button within this page list tab.
* wiki list fixesMario Vavti2016-11-172-52/+50
|
* Highlight active wiki in list in preparation for removing active wiki name ↵Andrew Manning2016-11-171-1/+1
| | | | from content section header to make room for page list viewer
* Merge remote-tracking branch 'upstream/dev' into wiki-guiAndrew Manning2016-11-171-7/+16
|\
| * remove redundant commaMario Vavti2016-11-171-1/+1
| |
| * configure ace with setOptions, get rid of redundant scrollbarsMario Vavti2016-11-171-7/+16
| |
* | Hide edit dialog if new wiki dialog opensAndrew Manning2016-11-161-1/+1
| |
* | Create wiki edit dialogs directly underneath the wiki name in the wiki listAndrew Manning2016-11-162-42/+43
| |
* | Move new wiki dialog directly underneath new wiki button in wiki list widgetAndrew Manning2016-11-162-29/+30
|/
* remove print margin and set wrap mode to freeMario Vavti2016-11-161-0/+2
|
* remove redundant function callMario Vavti2016-11-161-4/+3
|
* use modal-lg instead of width 80%Mario Vavti2016-11-161-2/+1
|
* minor wiki changesMario Vavti2016-11-162-2/+7
|
* still a bit of wiki permission weirdness, this should catch the major oneszotlabs2016-11-152-6/+1
|
* use same icon with rest of appzotlabs2016-11-151-1/+1
|
* wiki: permissions issues, untranslated strings in templates and some minor ↵zotlabs2016-11-153-15/+19
| | | | changes to provide a consistent UI with the rest of the app.
* Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-11-142-582/+612
|\
| * Update DE translation stringsphellmes2016-11-142-582/+612
| |
| * show wiki controls only to owner and whitespace fixesMario Vavti2016-11-141-5/+7
| |
* | Moved delete wiki button into new edit wiki form, opened by edit wiki icon ↵Andrew Manning2016-11-142-28/+29
| | | | | | | | in wiki list
* | Moved new wiki and new page buttons to widgetsAndrew Manning2016-11-143-348/+391
|/
* Bring Ace editor into focus when Edit tab is clicked to allow immediate text ↵Andrew Manning2016-11-121-2/+6
| | | | entry.
* Removed wiki list dropdown menus, moving the download and delete icons to ↵Andrew Manning2016-11-121-14/+6
| | | | beside the open wiki link.
* Moved save to bottom. Created Wiki Tools dropdown to be consistent, moved ↵Andrew Manning2016-11-121-20/+49
| | | | page tools in there as well as new page and new wiki
* Move save button to tab barAndrew Manning2016-11-121-3/+5
|
* Wiki control dropdown menu improvementAndrew Manning2016-11-121-9/+9
|
* typo when consolidating iconszotlabs2016-11-081-1/+1
|
* use a single iconzotlabs2016-11-081-2/+2
|
* let's use the bar-chart icon for voting to make the look consistent with the ↵zotlabs2016-11-071-1/+1
| | | | event attendance button and hint at its function
* distinguish the buttons for voting and attendance by adding a calendar icon ↵zotlabs2016-11-071-1/+1
| | | | to the button used for attendance
* cleanup and re-organise the voting and attendance buttonszotlabs2016-11-072-19/+36
|
* reorganise emoticonszotlabs2016-11-061-4/+4
|
* some fixes for the recent changes in the personal menu dropdownMario Vavti2016-11-042-2/+6
|
* Collapse navbar-collapse-1 if avatar menu is clicked.Andrew Manning2016-11-031-0/+6
|
* provide merged usermenu div for all server roleszotlabs2016-11-021-4/+0
|
* convert manual page updates to a display setting instead of a featurezotlabs2016-11-021-0/+1
|
* allow your own likes/comments to be updated when in static update modezotlabs2016-11-022-6/+7
|