Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3906 from nextcloud/shares-circles-2 | Roeland Jago Douma | 2017-03-19 | 14 | -17/+198 |
|\ | |||||
| * | shares-circles | Maxence Lange | 2017-03-17 | 14 | -17/+198 |
* | | Merge pull request #3913 from cwickert/master | Roeland Jago Douma | 2017-03-19 | 1 | -1/+1 |
|\ \ | |||||
| * | | DummyGetResponsePlugin: ownCloud -> Nexcloud | Christoph Wickert | 2017-03-18 | 1 | -1/+1 |
| |/ | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-19 | 8 | -0/+348 |
* | | Merge pull request #3899 from nextcloud/issue-3662-not-sending-is-an-error | Lukas Reschke | 2017-03-18 | 1 | -1/+4 |
|\ \ | |||||
| * | | Fail when the test mail could not be sent | Joas Schilling | 2017-03-17 | 1 | -1/+4 |
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-18 | 32 | -178/+490 |
* | | | Merge pull request #3898 from nextcloud/issue-3627-always-suggest-cli-url | Lukas Reschke | 2017-03-18 | 5 | -10/+36 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Always suggest the overwrite.cli.url | Joas Schilling | 2017-03-17 | 5 | -10/+36 |
| |/ | |||||
* | | Merge pull request #3904 from nextcloud/revert-3893-downstream-27069 | Morris Jobke | 2017-03-17 | 6 | -187/+10 |
|\ \ | |||||
| * | | Revert "Add integration test for trashbin" | Morris Jobke | 2017-03-17 | 6 | -187/+10 |
|/ / | |||||
* | | Merge pull request #3887 from nextcloud/downstream-26379 | Morris Jobke | 2017-03-17 | 3 | -0/+377 |
|\ \ | |||||
| * | | Safer queries | Joas Schilling | 2017-03-17 | 1 | -2/+2 |
| * | | Better output | Joas Schilling | 2017-03-17 | 1 | -10/+13 |
| * | | Add CleanupRemoteStorages command | Jörn Friedrich Dreyer | 2017-03-17 | 3 | -0/+374 |
* | | | Merge pull request #3892 from nextcloud/downstream-27101 | Joas Schilling | 2017-03-17 | 2 | -254/+293 |
|\ \ \ | |||||
| * | | | Cleanup test | Joas Schilling | 2017-03-17 | 1 | -254/+266 |
| * | | | Fix unit test | Joas Schilling | 2017-03-17 | 1 | -2/+1 |
| * | | | Redirect unlink to rmdir (#27101) | Vincent Petry | 2017-03-16 | 2 | -1/+29 |
| |/ / | |||||
* | | | Merge pull request #3881 from nextcloud/downstream-26842 | Joas Schilling | 2017-03-17 | 1 | -5/+41 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Backbone Webdav Adapter MKCOL support | Vincent Petry | 2017-03-17 | 1 | -5/+41 |
* | | | Merge pull request #3883 from nextcloud/downstream-26968 | blizzz | 2017-03-17 | 1 | -2/+16 |
|\ \ \ | |||||
| * | | | Ignore exception when deleting keys of deleted user | Vincent Petry | 2017-03-17 | 1 | -2/+16 |
| |/ / | |||||
* | | | Merge pull request #3878 from nextcloud/downstream-26303 | Joas Schilling | 2017-03-17 | 4 | -8/+7 |
|\ \ \ | |||||
| * | | | Fixed failing test which was ignoring a required (not null) column (#26303) | Philipp Schaffrath | 2017-03-17 | 4 | -8/+7 |
| |/ / | |||||
* | | | Merge pull request #3893 from nextcloud/downstream-27069 | Roeland Jago Douma | 2017-03-17 | 6 | -10/+187 |
|\ \ \ | |||||
| * | | | Add drone.yml config | Morris Jobke | 2017-03-16 | 1 | -0/+10 |
| * | | | Add integration test for trashbin | Vincent Petry | 2017-03-16 | 5 | -10/+177 |
| | |/ | |/| | |||||
* | | | Merge pull request #3885 from nextcloud/downstream-26529 | Joas Schilling | 2017-03-17 | 1 | -0/+12 |
|\ \ \ | |||||
| * | | | Skip FailedStorage in background scan | Vincent Petry | 2017-03-17 | 1 | -0/+12 |
| | |/ | |/| | |||||
* | | | Merge pull request #3886 from nextcloud/downstream-26995 | Joas Schilling | 2017-03-17 | 2 | -1/+13 |
|\ \ \ | |||||
| * | | | Chunking NG: Assemble in natural sort order of files | Markus Goetz | 2017-03-17 | 2 | -1/+13 |
| |/ / | |||||
* | | | Merge pull request #3894 from nextcloud/downstream-27008 | Joas Schilling | 2017-03-17 | 1 | -17/+25 |
|\ \ \ | |||||
| * | | | Integration test check download without saving file locally | Vincent Petry | 2017-03-16 | 1 | -17/+25 |
| | |/ | |/| | |||||
* | | | Merge pull request #3856 from nextcloud/escape-likes-in-database-user-backend | Roeland Jago Douma | 2017-03-17 | 1 | -3/+3 |
|\ \ \ | |||||
| * | | | Don't call function in constructor | Lukas Reschke | 2017-03-16 | 1 | -7/+3 |
| * | | | Escape like parameters in database user backend | Lukas Reschke | 2017-03-15 | 1 | -3/+7 |
* | | | | Merge pull request #3870 from nextcloud/add-base-uri-to-csp-policy | Roeland Jago Douma | 2017-03-17 | 8 | -113/+114 |
|\ \ \ \ | |||||
| * | | | | Adjust integration test | Lukas Reschke | 2017-03-16 | 1 | -1/+1 |
| * | | | | Adjust tests to include base-uri | Lukas Reschke | 2017-03-16 | 2 | -2/+2 |
| * | | | | Add base-uri to CSP policy | Lukas Reschke | 2017-03-16 | 5 | -110/+111 |
* | | | | | Merge pull request #3874 from nextcloud/harden-js-by-disabling-eval-execution | Roeland Jago Douma | 2017-03-17 | 1 | -0/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Harden JS by disabling jQuery eval | Lukas Reschke | 2017-03-16 | 1 | -0/+9 |
* | | | | | | Merge pull request #3875 from nextcloud/use-new-short-urls | Roeland Jago Douma | 2017-03-17 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use cleaner social media URLs | Lukas Reschke | 2017-03-16 | 1 | -2/+2 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #2824 from nextcloud/ext-storage-expireversions | Morris Jobke | 2017-03-16 | 3 | -10/+29 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Properly expire ext storage versions (#26601) | Vincent Petry | 2017-03-10 | 3 | -10/+29 |
* | | | | | | | Merge pull request #3619 from nextcloud/fix-scss-for-apps | Morris Jobke | 2017-03-16 | 4 | -7/+94 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Properly calculate webdir using the serverroot | Roeland Jago Douma | 2017-03-10 | 2 | -5/+13 |