summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Manage the right side menu via the navigation manager as wellJoas Schilling2017-03-265-110/+145
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Register the app management in the normal wayJoas Schilling2017-03-264-43/+12
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #4063 from nextcloud/bump_dompurifyChristoph Wurst2017-03-263-8/+7
|\ | | | | Bump dompurify
| * Update bundled core.jsRoeland Jago Douma2017-03-261-1/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * [js] Bump DOMPurifyRoeland Jago Douma2017-03-262-7/+6
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #3895 from ↵Roeland Jago Douma2017-03-265-52/+158
|\ \ | |/ |/| | | | | nextcloud/create-notification-when-update-server-not-reachable Create a notification when the update server couldn't be reached for …
| * Fix unit testJoas Schilling2017-03-261-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Also remove failure notification if no update is availableMorris Jobke2017-03-261-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 daysJoas Schilling2017-03-265-51/+155
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #4053 from nextcloud/bump-zxcvbnMorris Jobke2017-03-262-8/+7
|\ | | | | [3rdparty] Bump zxcvbn
| * [3rdparty] Bump zxcvbnRoeland Jago Douma2017-03-252-8/+7
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [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 installed
| * Don't run JSCombiner when not installedLukas Reschke2017-03-252-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 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 tests
| * Use authType BASIC for Sabre client in integration testsVincent Petry2017-03-241-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-prependMorris Jobke2017-03-242-23/+21
|\ \ | | | | | | Merge JS for template prepend
| * | Merge JS for template prependLukas Reschke2017-03-242-23/+21
| | | | | | | | | | | | | | | | | | Shaves off 14 requests. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #4044 from nextcloud/merge-login-jsMorris Jobke2017-03-242-5/+6
|\ \ \ | | | | | | | | Merge login JS
| * | | Merge login JSLukas Reschke2017-03-242-5/+6
|/ / / | | | | | | | | | | | | | | | Removes 2 requests. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #4041 from nextcloud/merge-systemtags-jsLukas Reschke2017-03-243-9/+15
|\ \ \ | | | | | | | | Merge systemtags JS
| * | | Merge systemtags JSLukas Reschke2017-03-243-9/+15
| | |/ | |/| | | | | | | | | | | | | Shaves off 7 requests. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #4040 from nextcloud/merge-js-for-versionsLukas Reschke2017-03-242-4/+7
|\ \ \ | | | | | | | | Merge JS for files_versions
| * | | Merge JS for files_versionsLukas Reschke2017-03-242-4/+7
| |/ / | | | | | | | | | | | | | | | Shaves off 3 requests. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #4042 from nextcloud/merge-js-forsharing-codeLukas Reschke2017-03-242-9/+13
|\ \ \ | |_|/ |/| | Merge sharing backend JS
| * | Merge sharing backend JSLukas Reschke2017-03-242-9/+13
| |/ | | | | | | | | | | Removes 8 requests. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #4038 from nextcloud/merge-js-for-fileviewMorris Jobke2017-03-242-30/+30
|\ \ | | | | | | Merge file view JS files
| * | Merge file view JS filesLukas Reschke2017-03-242-30/+30
| |/ | | | | | | | | | | Removes 26 requests on the file list loading Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #4039 from nextcloud/merge-js-for-commentsMorris Jobke2017-03-242-7/+10
|\ \ | |/ |/| Merge JS for comments
| * Merge JS for commentsLukas Reschke2017-03-242-7/+10
|/ | | | | | Shaves off 6 requests. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Merge pull request #3988 from nextcloud/jscombinerLukas Reschke2017-03-2415-5/+727
|\ | | | | [PoC] JS Combiner
| * Update autoloaderRoeland Jago Douma2017-03-242-0/+4
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * TestsRoeland Jago Douma2017-03-245-0/+384
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add returnRoeland Jago Douma2017-03-241-1/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add debug modeRoeland Jago Douma2017-03-243-2/+41
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add cachingRoeland Jago Douma2017-03-242-7/+44
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Combine additional files_sharing scriptsRoeland Jago Douma2017-03-242-3/+6
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * [PoC] JS CombinerRoeland Jago Douma2017-03-246-2/+257
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #4021 from nextcloud/update-dependenciesMorris Jobke2017-03-241-0/+0
|\ \ | | | | | | Update dependencies
| * | Update dependenciesMorris Jobke2017-03-241-0/+0
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #3825 from nextcloud/federation-fixesBjörn Schießle2017-03-246-65/+121
|\ \ \ | |_|/ |/| | create correct VCard and return correct error codes
| * | fix testsBjoern Schiessle2017-03-242-8/+28
| | | | | | | | | | | | | | | | | | calling getAbsoluteBundlePath() in the constructor makes other tests fail Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | Load cert file before syncing addressbooks and contactsJoas Schilling2017-03-241-16/+31
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | use right format for avatarsBjoern Schiessle2017-03-242-5/+5
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | don't add empty values to the vcardBjoern Schiessle2017-03-243-40/+56
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | only execute code if exception was thrown by the corresponding controllerBjoern Schiessle2017-03-242-3/+7
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | fix the way we create a new vcard to avoid to have multiple UIDsBjoern Schiessle2017-03-241-1/+2
|/ / | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #4010 from nextcloud/fac-58-mimetype-on-creating-directoriesJoas Schilling2017-03-241-0/+6
|\ \ | | | | | | Fix workflow engine mimetype detection when creating a directory
| * | Fix workflow engine mimetype detection when creating a directoryJoas Schilling2017-03-231-0/+6
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-14 23:21:01 +0000