summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* work directly on storages when doing a chunked upload assemblyRobin Appelman2015-09-142-57/+87
* handle notfound exceptions in lock pluginRobin Appelman2015-09-141-1/+5
* adjust tests to handle before/after lockingRobin Appelman2015-09-141-5/+43
* wrap the entire put operation in a read lockRobin Appelman2015-09-144-9/+98
* expose locking api in sabre connectorRobin Appelman2015-09-141-1/+26
* Merge pull request #18973 from owncloud/try-fixing-app-config-on-oracleThomas Müller2015-09-142-5/+21
|\
| * Only check the "was updated/inserted" when not on Oracle...Joas Schilling2015-09-141-2/+8
| * Do not compare the value on OracleJoas Schilling2015-09-141-3/+13
* | Merge pull request #18966 from owncloud/ext-remove-numeric-idLukas Reschke2015-09-141-67/+0
|\ \
| * | Remove storing storage_id in mount.jsonRobin McCorkell2015-09-101-67/+0
* | | Merge pull request #18982 from owncloud/fix_18878Lukas Reschke2015-09-142-3/+7
|\ \ \
| * | | enforce loading icon in sidebar to be 32x32Georg Ehrke2015-09-112-3/+7
* | | | Merge pull request #19012 from owncloud/occ_encrypt_all_fix_nameBjörn Schießle2015-09-141-1/+1
|\ \ \ \
| * | | | use the same pattern for the command name like every other commandBjoern Schiessle2015-09-141-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #19010 from owncloud/use-proper-web-rootThomas Müller2015-09-141-1/+5
|\ \ \ \
| * | | | Use / instead of an empty string as cookie pathLukas Reschke2015-09-141-1/+5
| |/ / /
* | | | Merge pull request #19006 from owncloud/individual-it-patch-1Individual IT Services2015-09-141-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | allow ".." in folder namesIndividual IT Services2015-09-141-1/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-14194-1628/+1232
|/ / /
* | | Merge pull request #18996 from owncloud/ext-swift-dependencycheckRobin McCorkell2015-09-132-2/+6
|\ \ \
| * | | Fix dependency check for Swift and SMB_OCRobin McCorkell2015-09-132-2/+6
|/ / /
* | | Merge pull request #18441 from owncloud/ext-backends.advancedRobin McCorkell2015-09-1331-744/+720
|\ \ \
| * | | Fix Swift legacy auth mechanism fallbackRobin McCorkell2015-09-031-1/+1
| * | | Fix typo in SMB_OCRobin McCorkell2015-09-031-2/+2
| * | | Prevent creation of deprecated backendsRobin McCorkell2015-08-282-0/+4
| * | | Introduce MODIFY permission for external storagesRobin McCorkell2015-08-285-11/+21
| * | | Validate permissions for created admin storages, auth mechanismRobin McCorkell2015-08-285-34/+63
| * | | Implement more fine-grained external storage permissions modelRobin McCorkell2015-08-2813-238/+212
| * | | AjaxController uses RSA auth mechanismRobin McCorkell2015-08-283-20/+22
| * | | Migrate SFTP_Key external storage to new APIRobin McCorkell2015-08-2810-287/+177
| * | | Migrate SMB_OC external storage to new APIRobin McCorkell2015-08-284-142/+68
| * | | Migrate Swift external storage to new APIRobin McCorkell2015-08-285-18/+159
* | | | Merge pull request #18991 from owncloud/public-resolveBernhard Posselt2015-09-132-1/+11
|\ \ \ \
| * | | | make resolve public to avoid boiler plate codeBernhard Posselt2015-09-132-1/+11
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-136-0/+12
* | | | Merge pull request #18658 from owncloud/configurable-tempFrank Karlitschek2015-09-126-22/+140
|\ \ \ \
| * | | | Add config.sample.php parameter for tempdirectoryRobin McCorkell2015-09-061-0/+10
| * | | | Unit test getting temp dir from configRobin McCorkell2015-08-301-1/+19
| * | | | Clean up TempManager to follow code guidelinesRobin McCorkell2015-08-304-43/+91
| * | | | moved code to /lib/private/tempmanager.phproot2015-08-294-21/+63
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-1280-138/+180
| |_|/ / |/| | |
* | | | Merge pull request #18653 from owncloud/dav-stream-guzzleLukas Reschke2015-09-114-67/+46
|\ \ \ \
| * | | | also use httpclient for uploadFileRobin Appelman2015-09-011-35/+18
| * | | | stream webdav downloads using http clientRobin Appelman2015-08-291-29/+15
| * | | | allow streamed responses in http clientRobin Appelman2015-08-293-5/+15
* | | | | Merge pull request #18977 from owncloud/fix-mimetype-resetLukas Reschke2015-09-114-13/+19
|\ \ \ \ \
| * | | | | Add reset method to mimetype loaderRobin McCorkell2015-09-114-13/+19
* | | | | | Merge pull request #18963 from owncloud/ext-fix-fallbacksLukas Reschke2015-09-111-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update isCertificateImportAllowed() check to new APIRobin McCorkell2015-09-101-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge pull request #18778 from owncloud/locking-setup-warningsLukas Reschke2015-09-112-18/+22
|\ \ \ \ \