| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #4077 from nextcloud/better-navigation-management | Morris Jobke | 2017-03-26 | 12 | -250/+279 |
| |\ | | | | | Register the app management in the normal way | ||||
| | * | Allow to specify the id | Joas Schilling | 2017-03-26 | 1 | -1/+2 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Make sure help is always after users | Joas Schilling | 2017-03-26 | 1 | -1/+1 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Fix order as @jancborchardt requested | Morris Jobke | 2017-03-26 | 1 | -2/+2 |
| | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| | * | Fix the tests | Joas Schilling | 2017-03-26 | 1 | -1/+9 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Don't use the dropdown for one item only | Joas Schilling | 2017-03-26 | 2 | -3/+13 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Allow multiple navigation links from info.xml | Joas Schilling | 2017-03-26 | 4 | -91/+119 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Allow apps to register a setting via info.xml | Joas Schilling | 2017-03-26 | 1 | -0/+2 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Move app management to the settings menu | Joas Schilling | 2017-03-26 | 4 | -33/+9 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Manage the right side menu via the navigation manager as well | Joas Schilling | 2017-03-26 | 5 | -110/+145 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Register the app management in the normal way | Joas Schilling | 2017-03-26 | 4 | -43/+12 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | Merge pull request #4068 from nextcloud/use-eval-instead-of-get-script | Morris Jobke | 2017-03-26 | 1 | -9/+14 |
| |\ \ | | | | | | | Use eval instead of $.script | ||||
| | * | | Cleanup code as suggested by @icewind1991 | Lukas Reschke | 2017-03-26 | 1 | -16/+8 |
| | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| | * | | Make async | Lukas Reschke | 2017-03-26 | 1 | -4/+2 |
| | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| | * | | Fix callback | Lukas Reschke | 2017-03-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| | * | | Use eval instead of $.script | Lukas Reschke | 2017-03-26 | 1 | -8/+23 |
| | | | | | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/4067 Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | Merge pull request #4065 from nextcloud/bump_scss | Morris Jobke | 2017-03-26 | 1 | -0/+0 |
| |\ \ \ | | | | | | | | | [3rdparty] Bump SCSSphp | ||||
| | * | | | [3rdparty] Bump SCSSphp | Roeland Jago Douma | 2017-03-26 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | Merge pull request #4075 from nextcloud/search-hover-feedback | Lukas Reschke | 2017-03-26 | 1 | -1/+5 |
| |\ \ \ \ | | | | | | | | | | | add hover feedback for search, and opacity on use | ||||
| | * | | | | add hover feedback for search, and opacity on use | Jan-Christoph Borchardt | 2017-03-26 | 1 | -1/+5 |
| | | |/ / | |/| | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | | Merge pull request #4074 from nextcloud/replace-name-with-icon | Morris Jobke | 2017-03-26 | 5 | -34/+21 |
| |\ \ \ \ | | | | | | | | | | | replace name in top right with icon for less noise | ||||
| | * | | | | replace name in top right with icon for less noise | Jan-Christoph Borchardt | 2017-03-26 | 5 | -34/+21 |
| | |/ / / | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | | Merge pull request #4069 from nextcloud/fix-emptycontent-font-color | Morris Jobke | 2017-03-26 | 1 | -1/+1 |
| |\ \ \ \ | |_|_|/ |/| | | | fix emptycontent font color lightness | ||||
| | * | | | fix emptycontent font color lightness | Jan-Christoph Borchardt | 2017-03-26 | 1 | -1/+1 |
| | |/ / | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | Merge pull request #4063 from nextcloud/bump_dompurify | Christoph Wurst | 2017-03-26 | 3 | -8/+7 |
| |\ \ \ | |/ / |/| | | Bump dompurify | ||||
| | * | | Update bundled core.js | Roeland Jago Douma | 2017-03-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | * | | [js] Bump DOMPurify | Roeland Jago Douma | 2017-03-26 | 2 | -7/+6 |
| | |/ | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | Merge pull request #3895 from ↵ | Roeland Jago Douma | 2017-03-26 | 5 | -52/+158 |
| |\ \ | |/ |/| | | | | | nextcloud/create-notification-when-update-server-not-reachable Create a notification when the update server couldn't be reached for … | ||||
| | * | Fix unit test | Joas Schilling | 2017-03-26 | 1 | -1/+1 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Also remove failure notification if no update is available | Morris Jobke | 2017-03-26 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | * error happened and vanished the notification should also vanish even if no update is available Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| | * | Create a notification when the update server couldn't be reached for some days | Joas Schilling | 2017-03-26 | 5 | -51/+155 |
| |/ | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | Merge pull request #4053 from nextcloud/bump-zxcvbn | Morris Jobke | 2017-03-26 | 2 | -8/+7 |
| |\ | | | | | [3rdparty] Bump zxcvbn | ||||
| | * | [3rdparty] Bump zxcvbn | Roeland Jago Douma | 2017-03-25 | 2 | -8/+7 |
| | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-26 | 34 | -24/+76 |
| |/ | |||||
| * | Merge pull request #4049 from nextcloud/fix-installation-again | Roeland Jago Douma | 2017-03-25 | 2 | -29/+206 |
| |\ | | | | | Don't run JSCombiner when not installed | ||||
| | * | Don't run JSCombiner when not installed | Lukas Reschke | 2017-03-25 | 2 | -29/+206 |
| |/ | | | | | | When the instance is not installed don't run the JSCombiner as the appdata folder does not yet exist. Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-25 | 50 | -86/+494 |
| | | |||||
| * | Merge pull request #4037 from nextcloud/downstream-27421 | Morris Jobke | 2017-03-24 | 1 | -6/+7 |
| |\ | | | | | Use authType BASIC for Sabre client in integration tests | ||||
| | * | Use authType BASIC for Sabre client in integration tests | Vincent Petry | 2017-03-24 | 1 | -6/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | This helps massively reduce the numerous useless 401 exceptions that appears in the test log. These appear only because Sabre first connects without any auth type to receive the challenge and then sends the authentication data. With this change it will directly use basic auth. Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | Merge pull request #4043 from nextcloud/merge-js-for-template-prepend | Morris Jobke | 2017-03-24 | 2 | -23/+21 |
| |\ \ | | | | | | | Merge JS for template prepend | ||||
| | * | | Merge JS for template prepend | Lukas Reschke | 2017-03-24 | 2 | -23/+21 |
| | | | | | | | | | | | | | | | | | | | Shaves off 14 requests. Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | Merge pull request #4044 from nextcloud/merge-login-js | Morris Jobke | 2017-03-24 | 2 | -5/+6 |
| |\ \ \ | | | | | | | | | Merge login JS | ||||
| | * | | | Merge login JS | Lukas Reschke | 2017-03-24 | 2 | -5/+6 |
| |/ / / | | | | | | | | | | | | | | | | Removes 2 requests. Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | Merge pull request #4041 from nextcloud/merge-systemtags-js | Lukas Reschke | 2017-03-24 | 3 | -9/+15 |
| |\ \ \ | | | | | | | | | Merge systemtags JS | ||||
| | * | | | Merge systemtags JS | Lukas Reschke | 2017-03-24 | 3 | -9/+15 |
| | | |/ | |/| | | | | | | | | | | | | | Shaves off 7 requests. Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | Merge pull request #4040 from nextcloud/merge-js-for-versions | Lukas Reschke | 2017-03-24 | 2 | -4/+7 |
| |\ \ \ | | | | | | | | | Merge JS for files_versions | ||||
| | * | | | Merge JS for files_versions | Lukas Reschke | 2017-03-24 | 2 | -4/+7 |
| | |/ / | | | | | | | | | | | | | | | | Shaves off 3 requests. Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | Merge pull request #4042 from nextcloud/merge-js-forsharing-code | Lukas Reschke | 2017-03-24 | 2 | -9/+13 |
| |\ \ \ | |_|/ |/| | | Merge sharing backend JS | ||||
| | * | | Merge sharing backend JS | Lukas Reschke | 2017-03-24 | 2 | -9/+13 |
| | |/ | | | | | | | | | | | Removes 8 requests. Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | Merge pull request #4038 from nextcloud/merge-js-for-fileview | Morris Jobke | 2017-03-24 | 2 | -30/+30 |
| |\ \ | | | | | | | Merge file view JS files | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |