summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-03-2028-438/+1386
|
* Merge pull request #3907 from nextcloud/port-more-db-stuffMorris Jobke2017-03-1917-77/+84
|\ | | | | Use SystemConfig instead of AllConfig for DB stuff
| * Use SystemConfig instead of AllConfig for DB stuffMorris Jobke2017-03-1917-77/+84
|/ | | | | | * preparation for followup PRs to clean up the DB bootstrapping Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #3927 from nextcloud/minor-fixesMorris Jobke2017-03-198-39/+57
|\ | | | | Namespace and array syntax fixes
| * Namespace and array syntax fixesMorris Jobke2017-03-198-39/+57
| | | | | | | | | | | | * minor fixes in preparation of a bigger DB and config PR Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #3906 from nextcloud/shares-circles-2Roeland Jago Douma2017-03-1914-17/+198
|\ \ | | | | | | Support Circles
| * | shares-circlesMaxence Lange2017-03-1714-17/+198
| |/ | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com>
* | Merge pull request #3913 from cwickert/masterRoeland Jago Douma2017-03-191-1/+1
|\ \ | | | | | | DummyGetResponsePlugin: ownCloud -> Nexcloud
| * | DummyGetResponsePlugin: ownCloud -> NexcloudChristoph Wickert2017-03-181-1/+1
| |/ | | | | | | Signed-off-by: Christoph Wickert <cwickert@suse.de>
* | [tx-robot] updated from transifexNextcloud bot2017-03-198-0/+348
| |
* | Merge pull request #3899 from nextcloud/issue-3662-not-sending-is-an-errorLukas Reschke2017-03-181-1/+4
|\ \ | | | | | | Fail when the test mail could not be sent
| * | Fail when the test mail could not be sentJoas Schilling2017-03-171-1/+4
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-03-1832-178/+490
| | |
* | | Merge pull request #3898 from nextcloud/issue-3627-always-suggest-cli-urlLukas Reschke2017-03-185-10/+36
|\ \ \ | |_|/ |/| | Always suggest the overwrite.cli.url
| * | Always suggest the overwrite.cli.urlJoas Schilling2017-03-175-10/+36
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #3904 from nextcloud/revert-3893-downstream-27069Morris Jobke2017-03-176-187/+10
|\ \ | | | | | | Revert "Add integration test for trashbin"
| * | Revert "Add integration test for trashbin"Morris Jobke2017-03-176-187/+10
|/ /
* | Merge pull request #3887 from nextcloud/downstream-26379Morris Jobke2017-03-173-0/+377
|\ \ | | | | | | Add CleanupRemoteStorages command
| * | Safer queriesJoas Schilling2017-03-171-2/+2
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Better outputJoas Schilling2017-03-171-10/+13
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Add CleanupRemoteStorages commandJörn Friedrich Dreyer2017-03-173-0/+374
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cleanup files, address review Fix CleanupRemoteStoragesTest tests Fix test expectation. Added files count to check filecache deletion. Sort by numeric id for deterministic test results Removed precise order test and added storage check Remove inaccurate removal message check which has a different order on Oracle. Added more checks to confirm that existing storages still exist. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #3892 from nextcloud/downstream-27101Joas Schilling2017-03-172-254/+293
|\ \ \ | | | | | | | | Redirect unlink to rmdir
| * | | Cleanup testJoas Schilling2017-03-171-254/+266
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix unit testJoas Schilling2017-03-171-2/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Redirect unlink to rmdir (#27101)Vincent Petry2017-03-162-1/+29
| |/ / | | | | | | | | | | | | | | | | | | Many API callers will call unlink even for directories and it can mess up with some wrappers like the encryption wrapper Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #3881 from nextcloud/downstream-26842Joas Schilling2017-03-171-5/+41
|\ \ \ | |_|/ |/| | Backbone Webdav Adapter MKCOL support
| * | Backbone Webdav Adapter MKCOL supportVincent Petry2017-03-171-5/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usually Backbone collections cannot be created and just simply exists. But in the Webdav world they need to be creatable. This enhancement makes it possible to use a Backbone Model to represent such collections and when creating it, it will use MKCOL instead of PUT. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #3883 from nextcloud/downstream-26968blizzz2017-03-171-2/+16
|\ \ \ | | | | | | | | Ignore exception when deleting keys of deleted user
| * | | Ignore exception when deleting keys of deleted userVincent Petry2017-03-171-2/+16
| |/ / | | | | | | | | | | | | | | | | | | | | | Whenever a user was deleted for encryption where the keys are stored in the home, we can ignore user existence exceptions because it means the keys are already gone. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #3878 from nextcloud/downstream-26303Joas Schilling2017-03-174-8/+7
|\ \ \ | | | | | | | | Fixed failing test which was ignoring a required (not null) column
| * | | Fixed failing test which was ignoring a required (not null) column (#26303)Philipp Schaffrath2017-03-174-8/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed failing test which was ignoring a required (not null) column * restored test to original, catching DriverException which also catches ConstraintViolationException * catch ConstraintViolationException again * removed unnecessary field from this test * clobfield should be nullable * clobfield now is nullable * removed autoincrement since whenever this strategy is enabled, oracle would not throw constraint violation exceptions (needed for setValues), which mysql still does * this field does not auto increment anymore * mark integerfield as primary, since it is not getting marked as such through auto increment anymore, integerfield default always has been 0 instead of null Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #3893 from nextcloud/downstream-27069Roeland Jago Douma2017-03-176-10/+187
|\ \ \ | | | | | | | | Add integration test for trashbin
| * | | Add drone.yml configMorris Jobke2017-03-161-0/+10
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Add integration test for trashbinVincent Petry2017-03-165-10/+177
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Add test for basic deletion. Add test when deleting from shared folder as recipient. Add test to check that metadata stays when moving out of shared folder as recipient. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #3885 from nextcloud/downstream-26529Joas Schilling2017-03-171-0/+12
|\ \ \ | | | | | | | | Skip FailedStorage in background scan
| * | | Skip FailedStorage in background scanVincent Petry2017-03-171-0/+12
| | |/ | |/| | | | | | | | | | | | | | | | | | | The background job that scans storages must skip failed storages to avoid potential exceptions, especially when the failed storage comes from a shared storage where the source is not accessible. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #3886 from nextcloud/downstream-26995Joas Schilling2017-03-172-1/+13
|\ \ \ | | | | | | | | Chunking NG: Assemble in natural sort order of files
| * | | Chunking NG: Assemble in natural sort order of filesMarkus Goetz2017-03-172-1/+13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For https://github.com/owncloud/client/pull/5476 Before this, the assembly could be bogusly in the order 0,1,10,11,2,3 etc. As per the spec "The name of every chunk should be its chunk number." https://github.com/cernbox/smashbox/blob/master/protocol/chunking.md Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #3894 from nextcloud/downstream-27008Joas Schilling2017-03-171-17/+25
|\ \ \ | | | | | | | | Integration test check download without saving file locally
| * | | Integration test check download without saving file locallyVincent Petry2017-03-161-17/+25
| | |/ | |/| | | | | | | | | | | | | | | | Use Guzzle stream mode to download the contents instead of using a temporary local file. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #3856 from nextcloud/escape-likes-in-database-user-backendRoeland Jago Douma2017-03-171-3/+3
|\ \ \ | | | | | | | | Escape like parameters in database user backend
| * | | Don't call function in constructorLukas Reschke2017-03-161-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | The constructor is iniitiated already very early in base.php, thus requiring this here will break the setup and some more. For now we probably have to live with a static function call here thus. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Escape like parameters in database user backendLukas Reschke2017-03-151-3/+7
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #3870 from nextcloud/add-base-uri-to-csp-policyRoeland Jago Douma2017-03-178-113/+114
|\ \ \ \ | | | | | | | | | | Add base-uri to CSP policy
| * | | | Adjust integration testLukas Reschke2017-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | Adjust tests to include base-uriLukas Reschke2017-03-162-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | Add base-uri to CSP policyLukas Reschke2017-03-165-110/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per https://twitter.com/we1x/status/842032709543333890 a nice security hardening Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #3874 from nextcloud/harden-js-by-disabling-eval-executionRoeland Jago Douma2017-03-171-0/+9
|\ \ \ \ \ | | | | | | | | | | | | Harden JS by disabling jQuery eval
| * | | | | Harden JS by disabling jQuery evalLukas Reschke2017-03-161-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable execution of eval in jQuery. We do require an allowed eval CSP configuration at the moment for handlebars et al. But for jQuery there is not much of a reason to execute JavaScript directly via eval. This thus mitigates some unexpected XSS vectors. As example try to insert `$('.fileinfo').html('<a href="asd"><script>alert(1)</script></a>');` with and without this patch in your browsers JS console when the file list is opened. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #3875 from nextcloud/use-new-short-urlsRoeland Jago Douma2017-03-171-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use cleaner social media URLs
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 00:57:56 +0000