Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2937 from nextcloud/remove-static-stream-wrapper | Robin Appelman | 2017-01-04 | 8 | -250/+22 |
|\ | | | | | remove static:// stream wrapper | ||||
| * | update autoloader | Morris Jobke | 2017-01-04 | 2 | -2/+0 |
| | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | remove static:// stream wrapper | Robin Appelman | 2017-01-04 | 6 | -248/+22 |
|/ | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | Merge pull request #2933 from nextcloud/dont-link-to-oc-forum | Morris Jobke | 2017-01-04 | 1 | -1/+1 |
|\ | | | | | Don't link to the oC forum | ||||
| * | Don't link to the oC forum | Joas Schilling | 2017-01-04 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-01-04 | 44 | -48/+838 |
|/ | |||||
* | Merge pull request #2923 from nextcloud/remove-fakedir-stream | Robin Appelman | 2017-01-03 | 5 | -82/+0 |
|\ | | | | | remove no longer used fakedir stream wrapper | ||||
| * | update autoloader | Morris Jobke | 2017-01-03 | 3 | -7/+31 |
| | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | remove no longer used fakedir stream wrapper | Robin Appelman | 2017-01-03 | 3 | -80/+0 |
| | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | Merge pull request #2921 from nextcloud/remove-unused-assetic-use-statements | Lukas Reschke | 2017-01-03 | 1 | -8/+0 |
|\ \ | | | | | | | remove unused Assetic use statements | ||||
| * | | remove unused Assetic use statements | Christoph Wurst | 2017-01-03 | 1 | -8/+0 |
|/ / | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
* | | Merge pull request #2913 from nextcloud/update-root-authorities | Christoph Wurst | 2017-01-03 | 1 | -8/+38 |
|\ \ | | | | | | | Update bundled CA Certificates | ||||
| * | | Update bundled CA Certificates | Lukas Reschke | 2017-01-02 | 1 | -8/+38 |
| | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-01-03 | 8 | -0/+82 |
| | | | |||||
* | | | Merge pull request #2850 from nextcloud/downstream-26603 | Roeland Jago Douma | 2017-01-02 | 12 | -62/+175 |
|\ \ \ | | | | | | | | | Fixed size issues on main detail view and disappearing of share recipients (#26603) | ||||
| * | | | mention property to follow same style | Arthur Schiwon | 2016-12-23 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | Fixed size issues on main detail view and disappearing of share recipients ↵ | Michael Jobst | 2016-12-23 | 12 | -61/+173 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#26603) * fixed size issues on main detail view and disappearing of share recipients * Changes due to code comments * Moved reloadProperties() to FileInfoModel * Solved Scrutinizer issues * Bugfix: undefined value used on error * check if options are set for FileInfoModel.initialize() Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | | | | Merge pull request #2872 from nextcloud/admin-settings-split-db | Morris Jobke | 2017-01-02 | 8 | -279/+459 |
|\ \ \ \ | | | | | | | | | | | split db logic from settings manager and test them separately | ||||
| * | | | | phpdoc | Robin Appelman | 2017-01-02 | 1 | -4/+23 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | | | update autoloader | Robin Appelman | 2016-12-28 | 3 | -5/+33 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | | | split db logic from settings manager | Robin Appelman | 2016-12-28 | 6 | -279/+438 |
| | |_|/ | |/| | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | | | Merge pull request #2712 from nextcloud/master-2648 | Morris Jobke | 2017-01-02 | 13 | -41/+1827 |
|\ \ \ \ | | | | | | | | | | | Fix legacy DAV endpoint | ||||
| * | | | | Fix legacy caldav endpoints | Roeland Jago Douma | 2017-01-02 | 4 | -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 backend | Lukas Reschke | 2017-01-02 | 11 | -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.php | Lukas Reschke | 2017-01-02 | 1 | -3/+24 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Add 100% coverage for response.php | ||||
| * | | | | Add 100% coverage for response.php | Lukas Reschke | 2017-01-02 | 1 | -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-crawler | Lukas Reschke | 2017-01-02 | 2 | -9/+73 |
|\ \ \ \ | |/ / / |/| | | | Rebrand to "Nextcloud" and add 100% coverage | ||||
| * | | | Rebrand to "Nextcloud" and add 100% coverage | Lukas Reschke | 2017-01-02 | 2 | -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-test | Roeland Jago Douma | 2017-01-02 | 3 | -20/+45 |
|\ \ \ \ | | | | | | | | | | | Test remember-me login | ||||
| * | | | | Test remember-me login | Christoph Wurst | 2017-01-02 | 3 | -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-ci | Morris Jobke | 2017-01-02 | 5 | -4/+42 |
|\ \ \ \ \ | | | | | | | | | | | | | S3 objectstore ci | ||||
| * | | | | | adjust test | Robin Appelman | 2017-01-02 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | | | | add ci support for s3 object store | Robin Appelman | 2017-01-02 | 4 | -0/+40 |
|/ / / / / | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | | | | Merge pull request #2896 from nextcloud/3rdparty_master | Roeland Jago Douma | 2017-01-02 | 1 | -0/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | Point 3rdparty to master | ||||
| * | | | | Point 3rdparty to master | Roeland Jago Douma | 2017-01-02 | 1 | -0/+0 |
|/ / / / | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-01-02 | 30 | -400/+762 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-01-01 | 4 | -2/+76 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-12-31 | 8 | -4/+8 |
| | | | | |||||
* | | | | Merge pull request #2897 from nextcloud/revert-2881-update-swift-mailer | Roeland Jago Douma | 2016-12-30 | 1 | -0/+0 |
|\ \ \ \ | | | | | | | | | | | Revert "Update third-party ref" | ||||
| * | | | | Revert "Update third-party ref" | Roeland Jago Douma | 2016-12-30 | 1 | -0/+0 |
|/ / / / | |||||
* | | | | Merge pull request #2881 from nextcloud/update-swift-mailer | Roeland Jago Douma | 2016-12-30 | 1 | -0/+0 |
|\ \ \ \ | | | | | | | | | | | Update third-party ref | ||||
| * | | | | Update third-party ref | Lukas Reschke | 2016-12-29 | 1 | -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_tests | Roeland Jago Douma | 2016-12-30 | 1 | -0/+122 |
|\ \ \ \ \ | | | | | | | | | | | | | Adds provisioning middleware tests | ||||
| * | | | | | Adds provisioning middleware tests | Roeland Jago Douma | 2016-12-30 | 1 | -0/+122 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | | | Merge pull request #2892 from nextcloud/usercontroller_tests | Roeland Jago Douma | 2016-12-30 | 1 | -0/+76 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Adds user controller tests | ||||
| * | | | | | | Adds user controller tests | Roeland Jago Douma | 2016-12-30 | 1 | -0/+76 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | | | Merge pull request #2891 from nextcloud/user_cmd_test | Roeland Jago Douma | 2016-12-30 | 2 | -0/+188 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | User command enable/disable tests | ||||
| * | | | | | User command enable/disable tests | Roeland Jago Douma | 2016-12-30 | 2 | -0/+188 |
| |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* / / / / | [tx-robot] updated from transifex | Nextcloud bot | 2016-12-30 | 24 | -86/+738 |
|/ / / / | |||||
* | | | | Merge pull request #2877 from nextcloud/webdavapache | Roeland Jago Douma | 2016-12-29 | 3 | -0/+54 |
|\ \ \ \ | | | | | | | | | | | Add files_external webdav apache tests |