summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2872 from nextcloud/admin-settings-split-dbMorris Jobke2017-01-028-279/+459
|\ | | | | split db logic from settings manager and test them separately
| * phpdocRobin Appelman2017-01-021-4/+23
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * update autoloaderRobin Appelman2016-12-283-5/+33
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * split db logic from settings managerRobin Appelman2016-12-286-279/+438
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #2712 from nextcloud/master-2648Morris Jobke2017-01-0213-41/+1827
|\ \ | | | | | | Fix legacy DAV endpoint
| * | Fix legacy caldav endpointsRoeland Jago Douma2017-01-024-32/+23
| | | | | | | | | | | | | | | | | | | | | * CaldavBackend is now endpoint aware (use old style principals on old endpoint and new onces on new). Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Add test execution against legacy DAV backendLukas Reschke2017-01-0211-9/+1804
| | | | | | | | | | | | | | | | | | Since the tests to quite hugely rely on sync tokens being present I also included those in the legacy backend. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #2912 from nextcloud/increase-coverage-response.phpLukas Reschke2017-01-021-3/+24
|\ \ \ | | | | | | | | Add 100% coverage for response.php
| * | | Add 100% coverage for response.phpLukas Reschke2017-01-021-3/+24
| |/ / | | | | | | | | | | | | | | | While already at https://github.com/nextcloud/server/pull/2911 I thought I can as well finish that one as well... Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #2911 from nextcloud/rebrand-to-nextcloud-server-crawlerLukas Reschke2017-01-022-9/+73
|\ \ \ | |/ / |/| | Rebrand to "Nextcloud" and add 100% coverage
| * | Rebrand to "Nextcloud" and add 100% coverageLukas Reschke2017-01-022-9/+73
| | | | | | | | | | | | | | | | | | Noticed while debugging https://github.com/nextcloud/server/issues/2910 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #2909 from nextcloud/tests/remember-me-integration-testRoeland Jago Douma2017-01-023-20/+45
|\ \ \ | | | | | | | | Test remember-me login
| * | | Test remember-me loginChristoph Wurst2017-01-023-20/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a simple integration test that ensures that remembered login works when the session cookies vanish. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #2159 from nextcloud/s3-objectstore-ciMorris Jobke2017-01-025-4/+42
|\ \ \ \ | | | | | | | | | | S3 objectstore ci
| * | | | adjust testRobin Appelman2017-01-021-4/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | add ci support for s3 object storeRobin Appelman2017-01-024-0/+40
|/ / / / | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #2896 from nextcloud/3rdparty_masterRoeland Jago Douma2017-01-021-0/+0
|\ \ \ \ | |/ / / |/| | | Point 3rdparty to master
| * | | Point 3rdparty to masterRoeland Jago Douma2017-01-021-0/+0
|/ / / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2017-01-0230-400/+762
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-01-014-2/+76
| | |
* | | [tx-robot] updated from transifexNextcloud bot2016-12-318-4/+8
| | |
* | | 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>