summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix forbidden backslash DAV integration testsVincent Petry2017-04-261-12/+12
|
* Fix FutureFile MOVE to keep destination nodeVincent Petry2017-04-263-4/+112
| | | | | | Sabre usually deletes the target node on MOVE before proceeding with the actual move operation. This fix prevents this to happen in case the source node is a FutureFile.
* Accept moving FutureFile into a DirectoryVincent Petry2017-04-261-0/+6
|
* Moved unit tests from ObjectTree::move to DirectoryVincent Petry2017-04-263-10/+256
|
* Remove ObjectTree::move and let is use the IMoveTarget approach insteadVincent Petry2017-04-261-98/+0
| | | | This removes the duplicated code
* Ported ObjectTree::move to IMoveTarget in new DAV endpointVincent Petry2017-04-261-4/+110
|
* Added test cases from core 16825Sergio Bertolin2017-04-261-0/+41
|
* Simplified new endpoint move testVincent Petry2017-04-261-9/+4
|
* Added case when final chunk move must not change file idVincent Petry2017-04-261-0/+13
|
* Added test about checking file id after a moveSergio Bertolin2017-04-262-2/+45
|
* Merge pull request #4430 from nextcloud/refactor-authRoeland Jago Douma2017-04-262-14/+10
|\ | | | | Improve readability of login logic
| * Refactor auth methodsJörn Friedrich Dreyer2017-04-262-14/+10
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4478 from nextcloud/improve_settings_helpJoas Schilling2017-04-2614-23/+30
|\ \ | | | | | | adding some documentation hints and some smaller cleanup
| * | Move h2 and settings-hint togetherJan-Christoph Borchardt2017-04-251-0/+1
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | Wording fixesJan-Christoph Borchardt2017-04-257-11/+8
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | Small layout fixes to settings hintsJan-Christoph Borchardt2017-04-253-6/+6
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | change the headline as suggestedFrank Karlitschek2017-04-251-2/+1
| | |
| * | one more hintFrank Karlitschek2017-04-251-0/+1
| | |
| * | adding some documentation hints and some smaller cleanupFrank Karlitschek2017-04-2511-15/+24
| | |
* | | Merge pull request #4467 from nextcloud/lists-for-html-mailsRoeland Jago Douma2017-04-262-22/+138
|\ \ \ | | | | | | | | Add lists to HTML emails
| * | | Allow meta info and iconsJoas Schilling2017-04-252-8/+32
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Add lists to HTML emailsJoas Schilling2017-04-242-22/+114
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #4061 from nextcloud/downstream-26407Roeland Jago Douma2017-04-263-40/+86
|\ \ \ \ | | | | | | | | | | Redis cluster support
| * | | | no ternaryJörn Friedrich Dreyer2017-03-251-2/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | fix constantJörn Friedrich Dreyer2017-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Add Redis Cluster supportRobin McCorkell2017-03-253-40/+78
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #4500 from nextcloud/downstream-27118Morris Jobke2017-04-263-26/+20
|\ \ \ \ \ | | | | | | | | | | | | Restrict proppatch to the proper nodes
| * | | | | Restrict proppatch to the proper nodesVincent Petry2017-04-253-26/+20
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to fetch the node earlier because cancelling from within the handler is not possible. Well, it is but it prevents other node types using the same property names to run because the failure marks the property with status 403.
* | | | | Merge pull request #4416 from gvmura/avoid-duplicate-files-googleMorris Jobke2017-04-261-0/+13
|\ \ \ \ \ | | | | | | | | | | | | Avoid duplicate files in google with the same name
| * \ \ \ \ Merge branch 'avoid-duplicate-files-google' of ↵root2017-04-210-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | https://github.com/gvmura/server into avoid-duplicate-files-google
| | * | | | | avoid duplicate files in google with the same namegvmura2017-04-211-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When it renames the temporary file, it tests if the file is already present. If so, it moves to trash the previous version to avoid duplicate files with the same name (message log: "Ignoring duplicate file name: ... on Google Drive for Google user: ..."). It doesn't handle duplicate files in Google Drive, it tries to avoid them. You'll watch #4279 issue.
| * | | | | | avoid duplicate files in google with the same namegvmura2017-04-211-0/+13
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: gvmura <gvmura@uniss.it>
* | | | | | Merge pull request #4449 from stweil/mimetypesMorris Jobke2017-04-263-0/+36
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Add mimetypes for jp2 and webp
| * | | | | Add test code for new image mime typesStefan Weil2017-04-251-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Stefan Weil <sw@weilnetz.de>
| * | | | | Add repair steps for new image mime typesStefan Weil2017-04-251-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Stefan Weil <sw@weilnetz.de>
| * | | | | Add mimetypes for jp2 and webpStefan Weil2017-04-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those image formats can be processed by Tesseract, so they are needed for improved Nextcloud OCR. Signed-off-by: Stefan Weil <sw@weilnetz.de>
* | | | | | Merge pull request #4486 from nextcloud/fix-js-unitMorris Jobke2017-04-251-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove DOMPurify from srcFiles
| * | | | | | Remove DOMPurify from srcFilesLukas Reschke2017-04-251-2/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is already included via core.json Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #4489 from nextcloud/ldap-gidnumber-sprt-xuanwoMorris Jobke2017-04-256-13/+332
|\ \ \ \ \ \ | | | | | | | | | | | | | | user_ldap: Add support for gidNumber
| * | | | | | Fix usersInGroup retrievalArthur Schiwon2017-04-252-14/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | fix method name due to changes in masterArthur Schiwon2017-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | Merge branch 'master' of https://github.com/Xuanwo/server into Xuanwo-master2Arthur Schiwon2017-04-256-8/+302
| |\ \ \ \ \ \
| | * | | | | | user_ldap: Add support for gidNumberXuanwo2017-04-256-8/+302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is based on the work of @dleeuw (https://github.com/dleeuw) (See https://github.com/nextcloud/server/issues/2640#issuecomment-269615883 for more details). The difference is user & group data will be written into cache to have better performance, and functions splited from primaryGroupID series to make them more readable. Fixed https://github.com/nextcloud/server/issues/2640 Signed-off-by: Xuanwo <xuanwo@yunify.com>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-04-26174-622/+1044
| | | | | | | |
* | | | | | | | Merge pull request #3233 from nextcloud/contactsmenuJan-Christoph Borchardt2017-04-2635-21/+2831
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Contacts menu
| * \ \ \ \ \ \ \ Merge branch 'master' into contactsmenuJan-Christoph Borchardt2017-04-2617-5/+849
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | | | | Merge pull request #4499 from nextcloud/downstream-26984Morris Jobke2017-04-254-2/+72
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Trigger change when a user is enabled/disabled
| * | | | | | | | | Audit log for enabling/disabling a userJoas Schilling2017-04-252-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | | | Trigger change when a user is enabled/disabledJoas Schilling2017-04-252-2/+54
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | | Merge pull request #4508 from nextcloud/fix/remove-js-debug-loggingMorris Jobke2017-04-251-1/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove js debug logging