summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 #4063 from nextcloud/bump_dompurifyChristoph Wurst2017-03-263-8/+7
|\
| * Update bundled core.jsRoeland Jago Douma2017-03-261-1/+1
| * [js] Bump DOMPurifyRoeland Jago Douma2017-03-262-7/+6
* | Merge pull request #3895 from nextcloud/create-notification-when-update-serve...Roeland Jago Douma2017-03-265-52/+158
|\ \ | |/ |/|
| * Fix unit testJoas Schilling2017-03-261-1/+1
| * Also remove failure notification if no update is availableMorris Jobke2017-03-261-2/+4
| * Create a notification when the update server couldn't be reached for some daysJoas Schilling2017-03-265-51/+155
|/
* Merge pull request #4053 from nextcloud/bump-zxcvbnMorris Jobke2017-03-262-8/+7
|\
| * [3rdparty] Bump zxcvbnRoeland Jago Douma2017-03-252-8/+7
* | [tx-robot] updated from transifexNextcloud bot2017-03-2634-24/+76
|/
* Merge pull request #4049 from nextcloud/fix-installation-againRoeland Jago Douma2017-03-252-29/+206
|\
| * Don't run JSCombiner when not installedLukas Reschke2017-03-252-29/+206
|/
* [tx-robot] updated from transifexNextcloud bot2017-03-2550-86/+494
* Merge pull request #4037 from nextcloud/downstream-27421Morris Jobke2017-03-241-6/+7
|\
| * Use authType BASIC for Sabre client in integration testsVincent Petry2017-03-241-6/+7
* | Merge pull request #4043 from nextcloud/merge-js-for-template-prependMorris Jobke2017-03-242-23/+21
|\ \
| * | Merge JS for template prependLukas Reschke2017-03-242-23/+21
* | | Merge pull request #4044 from nextcloud/merge-login-jsMorris Jobke2017-03-242-5/+6
|\ \ \
| * | | Merge login JSLukas Reschke2017-03-242-5/+6
|/ / /
* | | Merge pull request #4041 from nextcloud/merge-systemtags-jsLukas Reschke2017-03-243-9/+15
|\ \ \
| * | | Merge systemtags JSLukas Reschke2017-03-243-9/+15
| | |/ | |/|
* | | Merge pull request #4040 from nextcloud/merge-js-for-versionsLukas Reschke2017-03-242-4/+7
|\ \ \
| * | | Merge JS for files_versionsLukas Reschke2017-03-242-4/+7
| |/ /
* | | Merge pull request #4042 from nextcloud/merge-js-forsharing-codeLukas Reschke2017-03-242-9/+13
|\ \ \ | |_|/ |/| |
| * | Merge sharing backend JSLukas Reschke2017-03-242-9/+13
| |/
* | Merge pull request #4038 from nextcloud/merge-js-for-fileviewMorris Jobke2017-03-242-30/+30
|\ \
| * | Merge file view JS filesLukas Reschke2017-03-242-30/+30
| |/
* | Merge pull request #4039 from nextcloud/merge-js-for-commentsMorris Jobke2017-03-242-7/+10
|\ \ | |/ |/|
| * Merge JS for commentsLukas Reschke2017-03-242-7/+10
|/
* Merge pull request #3988 from nextcloud/jscombinerLukas Reschke2017-03-2415-5/+727
|\
| * Update autoloaderRoeland Jago Douma2017-03-242-0/+4
| * TestsRoeland Jago Douma2017-03-245-0/+384
| * Add returnRoeland Jago Douma2017-03-241-1/+1
| * Add debug modeRoeland Jago Douma2017-03-243-2/+41
| * Add cachingRoeland Jago Douma2017-03-242-7/+44
| * Combine additional files_sharing scriptsRoeland Jago Douma2017-03-242-3/+6
| * [PoC] JS CombinerRoeland Jago Douma2017-03-246-2/+257
* | Merge pull request #4021 from nextcloud/update-dependenciesMorris Jobke2017-03-241-0/+0
|\ \
| * | Update dependenciesMorris Jobke2017-03-241-0/+0
* | | Merge pull request #3825 from nextcloud/federation-fixesBjörn Schießle2017-03-246-65/+121
|\ \ \ | |_|/ |/| |
| * | fix testsBjoern Schiessle2017-03-242-8/+28