Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | string update | zotlabs | 2016-10-30 | 1 | -2/+2 |
| | |||||
* | add embed bbcode to the autocomplete list | Mario Vavti | 2016-10-30 | 1 | -1/+1 |
| | |||||
* | fix https://zothub.de/display/9d9078d212862c5f58 | Mario Vavti | 2016-10-30 | 2 | -1/+2 |
| | |||||
* | modernise chanview, which has a renewed purpose - to provide a connect link ↵ | zotlabs | 2016-10-26 | 1 | -2/+1 |
| | | | | to foreign network members. The iframe no longer works due to content security policies, and people hated this with a passion anyway; so just provide a URL to visit. | ||||
* | Merge pull request #565 from anaqreon/wiki-download | zotlabs | 2016-10-23 | 2 | -0/+5 |
|\ | | | | | Add wiki download button to export the selected wiki repo to a zip file | ||||
| * | Add wiki download button to export the selected wiki repo to a zip file | Andrew Manning | 2016-10-22 | 2 | -0/+5 |
| | | |||||
* | | provide lockstate for events and remove obsolete code | Mario Vavti | 2016-10-22 | 2 | -12/+1 |
|/ | |||||
* | better fix for navbar channel autocomplete, refrain from search until a ↵ | zotlabs | 2016-10-21 | 1 | -1/+1 |
| | | | | minimum of 3 chars entered. 2 typically gives way too many results and usually low quality results. | ||||
* | Change the behaviour of 'use existing photo for profile'. For a channel with ↵ | zotlabs | 2016-10-18 | 1 | -0/+5 |
| | | | | one profile, works just as it did previously. For multiple profiles, go back to the "upload form" but with a pre-existing file selected so that the correct profile can be selected. The text on this page and the resulting form are changed to remove the 'upload' text and file selection; but falls through to cropping in either case. | ||||
* | change event behaviour - share by default. | zotlabs | 2016-10-18 | 1 | -4/+0 |
| | |||||
* | issue #549, ACL has 'public' selected even when restrictive ACL is being used. | zotlabs | 2016-10-17 | 1 | -3/+3 |
| | |||||
* | fix connected time not shown on ajax loaded connections | Mario Vavti | 2016-10-12 | 2 | -6/+7 |
| | |||||
* | Provide better explanation of server_roles in the config template | zotlabs | 2016-10-09 | 1 | -2/+3 |
| | |||||
* | don't show diaspora protocol info in the hcard if the diaspora protocol is ↵ | zotlabs | 2016-10-08 | 1 | -0/+1 |
| | | | | not installed. This really needs to be moved to the plugin but this was a quick fix. | ||||
* | merge usermenu and caret when using pro | redmatrix | 2016-10-06 | 1 | -0/+7 |
| | |||||
* | Updating strings for it, nl and es. | jeroenpraat | 2016-10-05 | 6 | -19029/+19366 |
| | |||||
* | add some more stuff to admin/account_edit (service class, language, and ↵ | redmatrix | 2016-10-03 | 3 | -0/+45 |
| | | | | techlevel if appropriate). Fix en-au and en-gb so they are listed as languages, and move language selector stuff to include/language.php instead of include/text.php; new file Zotlabs/Lib/Techlevels.php so we only need to write the selection array once. | ||||
* | provide ability for admin to change account password | redmatrix | 2016-09-30 | 2 | -2/+16 |
| | |||||
* | omit autoscrolling to toplevel items | Mario Vavti | 2016-09-29 | 1 | -1/+1 |
| | |||||
* | highlight the displayed mid and css fixes | Mario Vavti | 2016-09-29 | 3 | -17/+27 |
| | |||||
* | fixes for make scroll to mid work properly with collapsed threads: unhide ↵ | Mario Vavti | 2016-09-29 | 1 | -2/+3 |
| | | | | the hidden items before scrolling to it, slideDown() is to slow - we must use show() here) | ||||
* | do not scroll items behind the navbar | Mario Vavti | 2016-09-27 | 1 | -1/+1 |
| | |||||
* | remove logging | Mario Vavti | 2016-09-27 | 1 | -1/+0 |
| | |||||
* | catch js error if the notification mid is for e.g. a like and class ↵ | Mario Vavti | 2016-09-27 | 1 | -1/+2 |
| | | | | .item_123def... does not exist | ||||
* | catch js error if there are no collapsed comments | Mario Vavti | 2016-09-26 | 1 | -4/+6 |
| |