Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #10623 from owncloud/not-a-valid-resource-log-entries | Clark Tomlinson | 2014-08-25 | 1 | -1/+6 |
|\ | |||||
| * | Do not try to close the same resource multiple times | Joas Schilling | 2014-08-25 | 1 | -1/+6 |
* | | Merge pull request #10421 from owncloud/share-external-delete | Clark Tomlinson | 2014-08-25 | 1 | -1/+11 |
|\ \ | |||||
| * | | Remove no longer existing files from the cache when scanning external storage | Robin Appelman | 2014-08-14 | 1 | -1/+11 |
* | | | Merge pull request #10023 from owncloud/tmp-file-created-status | Vincent Petry | 2014-08-25 | 1 | -2/+14 |
|\ \ \ | |||||
| * | | | Log unsuccessful temp file creation and return false | Victor Dubiniuk | 2014-07-30 | 1 | -2/+14 |
* | | | | Merge pull request #10108 from owncloud/files_external-allowed-backend | Vincent Petry | 2014-08-25 | 1 | -6/+10 |
|\ \ \ \ | |||||
| * | | | | Only load personal external storages for allowed backends | Robin Appelman | 2014-08-01 | 1 | -6/+10 |
* | | | | | Merge pull request #10598 from owncloud/warn_on_encryption_occ_pwreset | Lukas Reschke | 2014-08-25 | 1 | -0/+10 |
|\ \ \ \ \ | |||||
| * | | | | | Warn user on resetting passwords via occ when encryption is enabled | kondou | 2014-08-22 | 1 | -0/+10 |
* | | | | | | Merge pull request #10591 from owncloud/routes_for_files_external | Vincent Petry | 2014-08-25 | 1 | -0/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | explicit routes for files_external | Jörn Friedrich Dreyer | 2014-08-22 | 1 | -0/+17 |
* | | | | | | | Merge pull request #10595 from owncloud/swift-stream | Jörn Friedrich Dreyer | 2014-08-25 | 1 | -5/+4 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Stream downloads from Swift object stores without downloading it first | Robin Appelman | 2014-08-22 | 1 | -5/+4 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-25 | 477 | -3418/+3447 |
* | | | | | | | Merge pull request #10528 from owncloud/fix-htaccess-check-error | Lukas Reschke | 2014-08-24 | 1 | -184/+225 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Throw exception if file cannot be accessed via http | Clark Tomlinson | 2014-08-22 | 1 | -184/+225 |
* | | | | | | | | Merge pull request #9818 from owncloud/fix-mount-file-config | Robin McCorkell | 2014-08-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Comment out mount_file config option | Robin McCorkell | 2014-08-20 | 1 | -1/+1 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-24 | 525 | -1121/+1258 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-23 | 617 | -3328/+5497 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #10584 from owncloud/simple-wizard-trusted-domains | Thomas Müller | 2014-08-22 | 7 | -12/+58 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Redirect user after clicking on link | Lukas Reschke | 2014-08-22 | 2 | -4/+6 |
| * | | | | | | | | Expose setSystemValue | Lukas Reschke | 2014-08-22 | 2 | -6/+4 |
| * | | | | | | | | Add a trusted domain wizard | Lukas Reschke | 2014-08-21 | 5 | -6/+52 |
* | | | | | | | | | Merge pull request #10590 from owncloud/fix-10585 | Clark Tomlinson | 2014-08-22 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add require_once to update.php due to routing | Lukas Reschke | 2014-08-22 | 1 | -0/+1 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #7539 from owncloud/repair-legacystorageid | Thomas Müller | 2014-08-22 | 7 | -10/+547 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | no statement caching for Oracle | Thomas Müller | 2014-08-22 | 1 | -0/+5 |
| * | | | | | | | | Explicily close the statement cursors | Vincent Petry | 2014-08-20 | 1 | -0/+2 |
| * | | | | | | | | Fix unit test messing up the transaction on Oracle | Vincent Petry | 2014-08-20 | 1 | -0/+5 |
| * | | | | | | | | Added repair step for legacy storages | Vincent Petry | 2014-08-20 | 5 | -10/+535 |
* | | | | | | | | | no external files on windows for now | Thomas Müller | 2014-08-22 | 1 | -0/+2 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-22 | 477 | -1522/+1549 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #10522 from owncloud/removeLoadAppScript | blizzz | 2014-08-21 | 9 | -42/+86 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Add update route to core | Lukas Reschke | 2014-08-19 | 2 | -2/+2 |
| * | | | | | | | Remove loadAppScriptFile from the default routes | Lukas Reschke | 2014-08-19 | 1 | -10/+0 |
| * | | | | | | | Add routing to user_ldap | Lukas Reschke | 2014-08-19 | 1 | -0/+22 |
| * | | | | | | | Add routing to files_versions | Lukas Reschke | 2014-08-19 | 1 | -0/+5 |
| * | | | | | | | Add routing to files_trashbin | Lukas Reschke | 2014-08-19 | 1 | -0/+9 |
| * | | | | | | | Add routing to files_encryption | Lukas Reschke | 2014-08-19 | 1 | -0/+13 |
| * | | | | | | | Add routing to files_sharing | Lukas Reschke | 2014-08-19 | 1 | -4/+8 |
| * | | | | | | | Use proper routes for files | Lukas Reschke | 2014-08-19 | 1 | -0/+27 |
| * | | | | | | | Remove loadAppScriptFile | Lukas Reschke | 2014-08-19 | 1 | -26/+0 |
* | | | | | | | | Merge pull request #10573 from owncloud/share-dropdownfixwhenlinkdisallowed | Vincent Petry | 2014-08-21 | 2 | -11/+17 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix share dropdown when links are not allowed | Vincent Petry | 2014-08-21 | 2 | -11/+17 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #10548 from owncloud/encryption-app-description | Morris Jobke | 2014-08-21 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Better description to prevent people from misunderstanding the use case | Bernhard Posselt | 2014-08-21 | 1 | -2/+2 |
* | | | | | | | | | no external files on windows for now | Thomas Müller | 2014-08-21 | 1 | -2/+2 |
* | | | | | | | | | no external files on windows for now | Thomas Müller | 2014-08-21 | 1 | -0/+2 |