summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10623 from owncloud/not-a-valid-resource-log-entriesClark Tomlinson2014-08-251-1/+6
|\
| * Do not try to close the same resource multiple timesJoas Schilling2014-08-251-1/+6
* | Merge pull request #10421 from owncloud/share-external-deleteClark Tomlinson2014-08-251-1/+11
|\ \
| * | Remove no longer existing files from the cache when scanning external storageRobin Appelman2014-08-141-1/+11
* | | Merge pull request #10023 from owncloud/tmp-file-created-statusVincent Petry2014-08-251-2/+14
|\ \ \
| * | | Log unsuccessful temp file creation and return falseVictor Dubiniuk2014-07-301-2/+14
* | | | Merge pull request #10108 from owncloud/files_external-allowed-backendVincent Petry2014-08-251-6/+10
|\ \ \ \
| * | | | Only load personal external storages for allowed backendsRobin Appelman2014-08-011-6/+10
* | | | | Merge pull request #10598 from owncloud/warn_on_encryption_occ_pwresetLukas Reschke2014-08-251-0/+10
|\ \ \ \ \
| * | | | | Warn user on resetting passwords via occ when encryption is enabledkondou2014-08-221-0/+10
* | | | | | Merge pull request #10591 from owncloud/routes_for_files_externalVincent Petry2014-08-251-0/+17
|\ \ \ \ \ \
| * | | | | | explicit routes for files_externalJörn Friedrich Dreyer2014-08-221-0/+17
* | | | | | | Merge pull request #10595 from owncloud/swift-streamJörn Friedrich Dreyer2014-08-251-5/+4
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Stream downloads from Swift object stores without downloading it firstRobin Appelman2014-08-221-5/+4
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-25477-3418/+3447
* | | | | | | Merge pull request #10528 from owncloud/fix-htaccess-check-errorLukas Reschke2014-08-241-184/+225
|\ \ \ \ \ \ \
| * | | | | | | Throw exception if file cannot be accessed via httpClark Tomlinson2014-08-221-184/+225
* | | | | | | | Merge pull request #9818 from owncloud/fix-mount-file-configRobin McCorkell2014-08-241-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Comment out mount_file config optionRobin McCorkell2014-08-201-1/+1
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-24525-1121/+1258
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-23617-3328/+5497
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #10584 from owncloud/simple-wizard-trusted-domainsThomas Müller2014-08-227-12/+58
|\ \ \ \ \ \ \ \
| * | | | | | | | Redirect user after clicking on linkLukas Reschke2014-08-222-4/+6
| * | | | | | | | Expose setSystemValueLukas Reschke2014-08-222-6/+4
| * | | | | | | | Add a trusted domain wizardLukas Reschke2014-08-215-6/+52
* | | | | | | | | Merge pull request #10590 from owncloud/fix-10585Clark Tomlinson2014-08-221-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add require_once to update.php due to routingLukas Reschke2014-08-221-0/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #7539 from owncloud/repair-legacystorageidThomas Müller2014-08-227-10/+547
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | no statement caching for OracleThomas Müller2014-08-221-0/+5
| * | | | | | | | Explicily close the statement cursorsVincent Petry2014-08-201-0/+2
| * | | | | | | | Fix unit test messing up the transaction on OracleVincent Petry2014-08-201-0/+5
| * | | | | | | | Added repair step for legacy storagesVincent Petry2014-08-205-10/+535
* | | | | | | | | no external files on windows for nowThomas Müller2014-08-221-0/+2
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-22477-1522/+1549
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #10522 from owncloud/removeLoadAppScriptblizzz2014-08-219-42/+86
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Add update route to coreLukas Reschke2014-08-192-2/+2
| * | | | | | | Remove loadAppScriptFile from the default routesLukas Reschke2014-08-191-10/+0
| * | | | | | | Add routing to user_ldapLukas Reschke2014-08-191-0/+22
| * | | | | | | Add routing to files_versionsLukas Reschke2014-08-191-0/+5
| * | | | | | | Add routing to files_trashbinLukas Reschke2014-08-191-0/+9
| * | | | | | | Add routing to files_encryptionLukas Reschke2014-08-191-0/+13
| * | | | | | | Add routing to files_sharingLukas Reschke2014-08-191-4/+8
| * | | | | | | Use proper routes for filesLukas Reschke2014-08-191-0/+27
| * | | | | | | Remove loadAppScriptFileLukas Reschke2014-08-191-26/+0
* | | | | | | | Merge pull request #10573 from owncloud/share-dropdownfixwhenlinkdisallowedVincent Petry2014-08-212-11/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix share dropdown when links are not allowedVincent Petry2014-08-212-11/+17
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #10548 from owncloud/encryption-app-descriptionMorris Jobke2014-08-211-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Better description to prevent people from misunderstanding the use caseBernhard Posselt2014-08-211-2/+2
* | | | | | | | | no external files on windows for nowThomas Müller2014-08-211-2/+2
* | | | | | | | | no external files on windows for nowThomas Müller2014-08-211-0/+2