summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4112 from nextcloud/swift-configRobin Appelman2017-03-281-5/+80
|\
| * better error messages for invalid regions, urltypes and service namesRobin Appelman2017-03-281-4/+63
| * better error messages when swift authentication failsRobin Appelman2017-03-281-1/+17
* | Merge pull request #4101 from nextcloud/header-detailMorris Jobke2017-03-281-6/+1
|\ \
| * | show active indicator on current app even when hovering other iconsJan-Christoph Borchardt2017-03-271-6/+1
* | | Merge pull request #4082 from nextcloud/fix-menuJohn Molakvoæ2017-03-282-19/+26
|\ \ \
| * | | highlight active entry in personal info menu againJan-Christoph Borchardt2017-03-271-5/+5
| * | | Fix pop over menu opacityMorris Jobke2017-03-262-18/+25
| | |/ | |/|
* | | [tx-robot] updated from transifexNextcloud bot2017-03-2888-52/+254
* | | Merge pull request #4107 from nextcloud/users-settings-labelMorris Jobke2017-03-271-2/+2
|\ \ \
| * | | add Settings label to users settings for consistencyJan-Christoph Borchardt2017-03-281-2/+2
|/ / /
* | | Merge pull request #4084 from nextcloud/fix-log-spam-with-too-few-navigation-...Morris Jobke2017-03-271-5/+3
|\ \ \
| * | | Don't spam the log with "Undefined index showInHeader"Joas Schilling2017-03-271-5/+3
* | | | Merge pull request #4083 from nextcloud/update-strengthifyMorris Jobke2017-03-275-10/+15
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update strengthify and fix password strengthMorris Jobke2017-03-275-10/+15
|/ / /
* | | Merge pull request #4094 from nextcloud/ldap-descriptionMorris Jobke2017-03-271-2/+2
|\ \ \
| * \ \ Merge branch 'master' of https://github.com/nextcloud/serverMarius Blüm2017-03-272-17/+49
| |\ \ \
| * | | | Fix LDAP descriptionMarius Blüm2017-03-271-2/+2
* | | | | Merge pull request #4092 from nextcloud/theme-favicon-mask-colorMorris Jobke2017-03-273-3/+3
|\ \ \ \ \
| * | | | | use theming colors for favicon on macOSJan-Christoph Borchardt2017-03-273-3/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #4096 from nextcloud/touch-floorMorris Jobke2017-03-272-1/+18
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | round the mtime in touchRobin Appelman2017-03-272-1/+18
| | |_|/ | |/| |
* | | | Merge pull request #4027 from nextcloud/better-spreed-call-urlsRobin Appelman2017-03-272-17/+49
|\ \ \ \ | |_|_|/ |/| | |
| * | | Throw a nice HintException when the apps are missingJoas Schilling2017-03-241-10/+30
| * | | Allow to use short URLs for callsJoas Schilling2017-03-241-0/+6
| * | | Allow to push a non-query URL to the browser historyJoas Schilling2017-03-241-9/+15
* | | | Merge pull request #4072 from nextcloud/move-x-frame-options-into-phpGeorg Ehrke2017-03-272-2/+1
|\ \ \ \
| * | | | Move X-Frame-Options into PHPLukas Reschke2017-03-262-2/+1
* | | | | Merge pull request #4073 from nextcloud/secure-dropRoeland Jago Douma2017-03-271-1/+1
|\ \ \ \ \
| * | | | | Rename File drop to Secure dropOlivier Paroz2017-03-261-1/+1
| |/ / / /
* | | | | Merge pull request #4064 from nextcloud/update-momentRoeland Jago Douma2017-03-277-24507/+1017
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | use moments.js min in core.jsRoeland Jago Douma2017-03-265-25950/+1009
| * | | | [js] Bump momentjsRoeland Jago Douma2017-03-263-11263/+12714
* | | | | [tx-robot] updated from transifexNextcloud bot2017-03-27700-15258/+1184
* | | | | Merge pull request #4077 from nextcloud/better-navigation-managementMorris Jobke2017-03-2612-250/+279
|\ \ \ \ \
| * | | | | Allow to specify the idJoas Schilling2017-03-261-1/+2
| * | | | | Make sure help is always after usersJoas Schilling2017-03-261-1/+1
| * | | | | Fix order as @jancborchardt requestedMorris Jobke2017-03-261-2/+2
| * | | | | Fix the testsJoas Schilling2017-03-261-1/+9
| * | | | | Don't use the dropdown for one item onlyJoas Schilling2017-03-262-3/+13
| * | | | | Allow multiple navigation links from info.xmlJoas Schilling2017-03-264-91/+119
| * | | | | Allow apps to register a setting via info.xmlJoas Schilling2017-03-261-0/+2
| * | | | | Move app management to the settings menuJoas Schilling2017-03-264-33/+9
| * | | | | Manage the right side menu via the navigation manager as wellJoas Schilling2017-03-265-110/+145
| * | | | | Register the app management in the normal wayJoas Schilling2017-03-264-43/+12
| | |_|_|/ | |/| | |
* | | | | Merge pull request #4068 from nextcloud/use-eval-instead-of-get-scriptMorris Jobke2017-03-261-9/+14
|\ \ \ \ \
| * | | | | Cleanup code as suggested by @icewind1991Lukas Reschke2017-03-261-16/+8
| * | | | | Make asyncLukas Reschke2017-03-261-4/+2
| * | | | | Fix callbackLukas Reschke2017-03-261-1/+1
| * | | | | Use eval instead of $.scriptLukas Reschke2017-03-261-8/+23
| | |_|/ / | |/| | |