summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2897 from nextcloud/revert-2881-update-swift-mailerRoeland Jago Douma2016-12-301-0/+0
|\ | | | | Revert "Update third-party ref"
| * Revert "Update third-party ref"Roeland Jago Douma2016-12-301-0/+0
|/
* Merge pull request #2881 from nextcloud/update-swift-mailerRoeland Jago Douma2016-12-301-0/+0
|\ | | | | Update third-party ref
| * Update third-party refLukas Reschke2016-12-291-0/+0
| | | | | | | | | | | | For https://github.com/nextcloud/3rdparty/pull/25 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #2894 from nextcloud/provisioning_api_middleware_testsRoeland Jago Douma2016-12-301-0/+122
|\ \ | | | | | | Adds provisioning middleware tests
| * | Adds provisioning middleware testsRoeland Jago Douma2016-12-301-0/+122
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #2892 from nextcloud/usercontroller_testsRoeland Jago Douma2016-12-301-0/+76
|\ \ \ | | | | | | | | Adds user controller tests
| * | | Adds user controller testsRoeland Jago Douma2016-12-301-0/+76
| |/ / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #2891 from nextcloud/user_cmd_testRoeland Jago Douma2016-12-302-0/+188
|\ \ \ | | | | | | | | User command enable/disable tests
| * | | User command enable/disable testsRoeland Jago Douma2016-12-302-0/+188
| |/ / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / / [tx-robot] updated from transifexNextcloud bot2016-12-3024-86/+738
|/ /
* | Merge pull request #2877 from nextcloud/webdavapacheRoeland Jago Douma2016-12-293-0/+54
|\ \ | | | | | | Add files_external webdav apache tests
| * | Add files_external webdav apache testsRoeland Jago Douma2016-12-293-0/+54
| |/ | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #2878 from nextcloud/cmd_group_testsRoeland Jago Douma2016-12-293-0/+365
|\ \ | |/ |/| Add Group Command tests
| * Add Group Command testsRoeland Jago Douma2016-12-293-0/+365
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #2876 from nextcloud/composer_updateRoeland Jago Douma2016-12-291-5/+31
|\ | | | | Bump autoloader
| * Bump autoloadearRoeland Jago Douma2016-12-291-5/+31
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2016-12-2936-114/+558
| |
* | Merge pull request #2854 from nextcloud/2fa-redirect-urlRobin Appelman2016-12-282-0/+2
|\ \ | | | | | | Set redirect_url on 2FA challenge page
| * | Set redirect_url on 2FA challenge pageChristoph Wurst2016-12-232-0/+2
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | [tx-robot] updated from transifexNextcloud bot2016-12-2830-46/+968
| | |
* | | Merge pull request #2821 from nextcloud/added-hint-for-specifyingLukas Reschke2016-12-271-0/+3
|\ \ \ | | | | | | | | Fix #24219: Added hint for specifying a port. (#26860)
| * | | Fix #24219: Added hint for specifying a port. (#26860)Sourav Badami2016-12-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added hint for specifying a port. * Minor changes. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #2845 from nextcloud/deleteuser-gethomeearlyLukas Reschke2016-12-272-1/+39
|\ \ \ \ | | | | | | | | | | Get user home folder before deletion
| * | | | Get user home folder before deletionVincent Petry2016-12-232-1/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the deletion getHome() will fail because the user doesn't exist any more, so we need to fetch that value earlier. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | [tx-robot] updated from transifexNextcloud bot2016-12-2730-0/+94
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2016-12-26510-3982/+2702
| |_|/ / |/| | |
* | | | Merge pull request #2763 from nextcloud/fix_maindetailsview_favorite_star-patchLukas Reschke2016-12-234-57/+19
|\ \ \ \ | | | | | | | | | | [downstream] Fix maindetailsview favorite star patch
| * | | | OC.Uploader does not have a 'state' method, therefore theChristoph Wurst2016-12-231-31/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dead code can be removed Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | Fix indentationLukas Reschke2016-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | Style modifications of favorite star on main detail view (#26658)Michael Jobst2016-12-193-26/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Style modifications of favorite star on main detail view * Removed unused opacity change on mouse over * favorite star title fixed * favorite star opacity should always be .7 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #2819 from nextcloud/trash-ext-link-uselinkownerRoeland Jago Douma2016-12-231-0/+10
|\ \ \ \ \ | | | | | | | | | | | | Fallback to share link owner when no owner found
| * | | | | Fallback to share link owner when no owner foundVincent Petry2016-12-221-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating link shares from external storage, the filesystem cannot find an owner in some scenarios (ex: system-wide mounts). In such cases, fall back to using the current user's trashbin which happens to also be the user who created the link share. Fixes an issue where this scenario made deletion impossible due to missing user information. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #2816 from nextcloud/changing_how_favorites_are_serializedRoeland Jago Douma2016-12-232-5/+9
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Return explicit values instead of boolean from sabre (#26654)
| * | | | | Return explicit values instead of boolean from sabre (#26654)Sergio Bertolín2016-12-222-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #2833 from nextcloud/downstream-26750Lukas Reschke2016-12-2315-258/+430
|\ \ \ \ \ \ | | | | | | | | | | | | | | Introduce group display name support (#26750)
| * | | | | | fix more testsArthur Schiwon2016-12-221-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | fix testsArthur Schiwon2016-12-221-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | declare fieldArthur Schiwon2016-12-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | Fix reporting of risky testsThomas Müller2016-12-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | Use group display name in sharing API + UIVincent Petry2016-12-228-19/+147
| | | | | | |
| * | | | | | Adding group display name supportVincent Petry2016-12-226-230/+270
| | | | | | |
* | | | | | | Merge pull request #2844 from nextcloud/testing-altbackend-switchLukas Reschke2016-12-232-2/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Testing app switch to force-enable test user backend
| * | | | | | | Testing app switch to force-enable test user backendVincent Petry2016-12-232-2/+14
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | | Merge pull request #2841 from nextcloud/integration-tests-allowing-md5-homeLukas Reschke2016-12-233-6/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Integration tests allowing md5 home
| * | | | | | | Added phpdoc for getUserHomeSergio Bertolin2016-12-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | | | Using propfind instead of accessing the file systemSergio Bertolin2016-12-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | | | Changed data directory for work oneSergio Bertolin2016-12-232-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | | | Added support for homes which doesn't have user's nameSergio Bertolin2016-12-232-1/+11
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | | Merge pull request #2846 from ↵Roeland Jago Douma2016-12-234-51/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | nextcloud/downstream-obliterate-legacy-home-fallback Downstream obliterate legacy home fallback