summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3906 from nextcloud/shares-circles-2Roeland Jago Douma2017-03-1914-17/+198
|\
| * shares-circlesMaxence Lange2017-03-1714-17/+198
* | Merge pull request #3913 from cwickert/masterRoeland Jago Douma2017-03-191-1/+1
|\ \
| * | DummyGetResponsePlugin: ownCloud -> NexcloudChristoph Wickert2017-03-181-1/+1
| |/
* | [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 sentJoas Schilling2017-03-171-1/+4
* | | [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.urlJoas Schilling2017-03-175-10/+36
| |/
* | Merge pull request #3904 from nextcloud/revert-3893-downstream-27069Morris Jobke2017-03-176-187/+10
|\ \
| * | 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
|\ \
| * | Safer queriesJoas Schilling2017-03-171-2/+2
| * | Better outputJoas Schilling2017-03-171-10/+13
| * | Add CleanupRemoteStorages commandJörn Friedrich Dreyer2017-03-173-0/+374
* | | Merge pull request #3892 from nextcloud/downstream-27101Joas Schilling2017-03-172-254/+293
|\ \ \
| * | | Cleanup testJoas Schilling2017-03-171-254/+266
| * | | Fix unit testJoas Schilling2017-03-171-2/+1
| * | | Redirect unlink to rmdir (#27101)Vincent Petry2017-03-162-1/+29
| |/ /
* | | Merge pull request #3881 from nextcloud/downstream-26842Joas Schilling2017-03-171-5/+41
|\ \ \ | |_|/ |/| |
| * | Backbone Webdav Adapter MKCOL supportVincent Petry2017-03-171-5/+41
* | | Merge pull request #3883 from nextcloud/downstream-26968blizzz2017-03-171-2/+16
|\ \ \
| * | | Ignore exception when deleting keys of deleted userVincent Petry2017-03-171-2/+16
| |/ /
* | | Merge pull request #3878 from nextcloud/downstream-26303Joas Schilling2017-03-174-8/+7
|\ \ \
| * | | Fixed failing test which was ignoring a required (not null) column (#26303)Philipp Schaffrath2017-03-174-8/+7
| |/ /
* | | Merge pull request #3893 from nextcloud/downstream-27069Roeland Jago Douma2017-03-176-10/+187
|\ \ \
| * | | Add drone.yml configMorris Jobke2017-03-161-0/+10
| * | | Add integration test for trashbinVincent Petry2017-03-165-10/+177
| | |/ | |/|
* | | Merge pull request #3885 from nextcloud/downstream-26529Joas Schilling2017-03-171-0/+12
|\ \ \
| * | | Skip FailedStorage in background scanVincent Petry2017-03-171-0/+12
| | |/ | |/|
* | | Merge pull request #3886 from nextcloud/downstream-26995Joas Schilling2017-03-172-1/+13
|\ \ \
| * | | Chunking NG: Assemble in natural sort order of filesMarkus Goetz2017-03-172-1/+13
| |/ /
* | | Merge pull request #3894 from nextcloud/downstream-27008Joas Schilling2017-03-171-17/+25
|\ \ \
| * | | Integration test check download without saving file locallyVincent Petry2017-03-161-17/+25
| | |/ | |/|
* | | Merge pull request #3856 from nextcloud/escape-likes-in-database-user-backendRoeland Jago Douma2017-03-171-3/+3
|\ \ \
| * | | Don't call function in constructorLukas Reschke2017-03-161-7/+3
| * | | Escape like parameters in database user backendLukas Reschke2017-03-151-3/+7
* | | | Merge pull request #3870 from nextcloud/add-base-uri-to-csp-policyRoeland Jago Douma2017-03-178-113/+114
|\ \ \ \
| * | | | Adjust integration testLukas Reschke2017-03-161-1/+1
| * | | | Adjust tests to include base-uriLukas Reschke2017-03-162-2/+2
| * | | | Add base-uri to CSP policyLukas Reschke2017-03-165-110/+111
* | | | | Merge pull request #3874 from nextcloud/harden-js-by-disabling-eval-executionRoeland Jago Douma2017-03-171-0/+9
|\ \ \ \ \
| * | | | | Harden JS by disabling jQuery evalLukas Reschke2017-03-161-0/+9
* | | | | | Merge pull request #3875 from nextcloud/use-new-short-urlsRoeland Jago Douma2017-03-171-2/+2
|\ \ \ \ \ \
| * | | | | | Use cleaner social media URLsLukas Reschke2017-03-161-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #2824 from nextcloud/ext-storage-expireversionsMorris Jobke2017-03-163-10/+29
|\ \ \ \ \ \
| * | | | | | Properly expire ext storage versions (#26601)Vincent Petry2017-03-103-10/+29
* | | | | | | Merge pull request #3619 from nextcloud/fix-scss-for-appsMorris Jobke2017-03-164-7/+94
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Properly calculate webdir using the serverrootRoeland Jago Douma2017-03-102-5/+13