summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Fix the testsJoas Schilling2017-03-261-1/+9
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Allow multiple navigation links from info.xmlJoas Schilling2017-03-262-6/+8
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Manage the right side menu via the navigation manager as wellJoas Schilling2017-03-261-1/+9
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* 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-264-42/+144
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* [tx-robot] updated from transifexNextcloud bot2017-03-2620-14/+36
|
* [tx-robot] updated from transifexNextcloud bot2017-03-2530-84/+468
|
* Merge pull request #4041 from nextcloud/merge-systemtags-jsLukas Reschke2017-03-242-9/+8
|\ | | | | Merge systemtags JS
| * Merge systemtags JSLukas Reschke2017-03-242-9/+8
| | | | | | | | | | | | 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 #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 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-242-3/+6
|\ | | | | [PoC] JS Combiner
| * Combine additional files_sharing scriptsRoeland Jago Douma2017-03-242-3/+6
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | 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>
* | Merge pull request #4013 from nextcloud/bundle_vendor_jsLukas Reschke2017-03-241-2/+0
|\ \ | | | | | | Bundle vendor js
| * | Handlebars is already loaded by core.jsRoeland Jago Douma2017-03-231-2/+0
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2017-03-2472-324/+346
| | |
* | | Merge pull request #3879 from nextcloud/downstream-26915Morris Jobke2017-03-231-1/+1
|\ \ \ | | | | | | | | Added integration tests for sharees using v2.php
| * | | Make deleting a group compatible with ocs v2Joas Schilling2017-03-231-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #4007 from nextcloud/backport-27155Morris Jobke2017-03-2312-78/+98
|\ \ \ \ | | | | | | | | | | Change showTemporary notifications for closable ones
| * | | | added quit option in commentstabview.jsnoveens2017-03-2312-78/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added quit option in notif in app.js added quit option in notif in file-upload.js added quit option in notif in fileinfomodel.js added quit option in notif in filelist.js added quit option in notif in filelist.js added quit option in notif in tagsplugin.js added quit option in notif in statusmanager.js added quit option in notif in external.js added quit option in notif in versionstabview.js added quit option in notif in notification.js changes according to the latest review. timeout removed since there is a button to close it translation capability added typo fixed test files updated small errors fixed Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #3953 from nextcloud/downstream-27027Morris Jobke2017-03-232-2/+56
|\ \ \ \ \ | | | | | | | | | | | | Ignore NoUserException for shares from ghosts
| * | | | | set cache to failedcache when shared storage init failsRobin Appelman2017-03-232-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | return failed cache if the shared storage failed to setupRobin Appelman2017-03-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | also set nonmaskedstorage in error casesRobin Appelman2017-03-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | Ignore NoUserException for shares from ghostsVincent Petry2017-03-202-2/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add unit tests for FailedStorage init from SharedStorage Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #3965 from nextcloud/downstream-27343Morris Jobke2017-03-231-4/+33
|\ \ \ \ \ \ | | | | | | | | | | | | | | Providing --path option to transfer-ownership
| * | | | | | improve file transfer codeMorris Jobke2017-03-221-26/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | Providing --path option to transfer-ownershipSujith H2017-03-201-4/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will help user to selectively move the folders specified using --path option, instead of moving entire folder under files directory. Signed-off-by: Sujith H <sharidasan@owncloud.com> Update the integration test for transfer-ownership Update the integration test for transfer-ownership as the new option --path is introduced in the command. Signed-off-by: Sujith H <sharidasan@owncloud.com> Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #3998 from nextcloud/backport-27032Roeland Jago Douma2017-03-231-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use the expected method depending on the target being a file or folder
| * | | | | | | Use the expected method depending on the target being a file or folderJuan Pablo Villafáñez2017-03-221-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | Merge pull request #4000 from nextcloud/backport-27216Lukas Reschke2017-03-231-0/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | allow configuring authType for DAV backend
| * | | | | | | allow configuring authType for DAV backendJörn Friedrich Dreyer2017-03-221-0/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #3995 from nextcloud/files_scan_appdataLukas Reschke2017-03-232-1/+286
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add files:scanAppData command
| * | | | | | | Use proper name and code styleMorris Jobke2017-03-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | | Add files:scanAppData commandRoeland Jago Douma2017-03-222-1/+286
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/3041 Add a dedicated command to scan the special appdata dir Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | Merge pull request #3948 from nextcloud/downstream-27271Lukas Reschke2017-03-231-3/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Tooltip in trashbin with previous location
| * | | | | | | | fix path for files from root folderMorris Jobke2017-03-221-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | | | In the real world id is an initial filenameVictor Dubiniuk2017-03-201-3/+4
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>