Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | work directly on storages when doing a chunked upload assembly | Robin Appelman | 2015-09-14 | 2 | -57/+87 |
| | |||||
* | handle notfound exceptions in lock plugin | Robin Appelman | 2015-09-14 | 1 | -1/+5 |
| | |||||
* | adjust tests to handle before/after locking | Robin Appelman | 2015-09-14 | 1 | -5/+43 |
| | |||||
* | wrap the entire put operation in a read lock | Robin Appelman | 2015-09-14 | 4 | -9/+98 |
| | |||||
* | expose locking api in sabre connector | Robin Appelman | 2015-09-14 | 1 | -1/+26 |
| | |||||
* | Merge pull request #18973 from owncloud/try-fixing-app-config-on-oracle | Thomas Müller | 2015-09-14 | 2 | -5/+21 |
|\ | | | | | Do not compare the value on Oracle | ||||
| * | Only check the "was updated/inserted" when not on Oracle... | Joas Schilling | 2015-09-14 | 1 | -2/+8 |
| | | |||||
| * | Do not compare the value on Oracle | Joas Schilling | 2015-09-14 | 1 | -3/+13 |
| | | | | | | | | | | As per docs: http://docs.oracle.com/cd/E11882_01/server.112/e26088/conditions002.htm#i1033286 > Large objects (LOBs) are not supported in comparison conditions. | ||||
* | | Merge pull request #18966 from owncloud/ext-remove-numeric-id | Lukas Reschke | 2015-09-14 | 1 | -67/+0 |
|\ \ | | | | | | | Remove storing storage_id in mount.json | ||||
| * | | Remove storing storage_id in mount.json | Robin McCorkell | 2015-09-10 | 1 | -67/+0 |
| | | | | | | | | | | | | | | | One mount configuration does not necessarily map to a single storage, due to `$user` substitution or special auth mechanisms. | ||||
* | | | Merge pull request #18982 from owncloud/fix_18878 | Lukas Reschke | 2015-09-14 | 2 | -3/+7 |
|\ \ \ | | | | | | | | | enforce loading icon in sidebar to be 32x32 | ||||
| * | | | enforce loading icon in sidebar to be 32x32 | Georg Ehrke | 2015-09-11 | 2 | -3/+7 |
| | | | | |||||
* | | | | Merge pull request #19012 from owncloud/occ_encrypt_all_fix_name | Björn Schießle | 2015-09-14 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | use the same pattern for the command name like every other command | ||||
| * | | | | use the same pattern for the command name like every other command | Bjoern Schiessle | 2015-09-14 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #19010 from owncloud/use-proper-web-root | Thomas Müller | 2015-09-14 | 1 | -1/+5 |
|\ \ \ \ | | | | | | | | | | | Use / instead of an empty string as cookie path | ||||
| * | | | | Use / instead of an empty string as cookie path | Lukas Reschke | 2015-09-14 | 1 | -1/+5 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an empty string is used as cookie path PHP will assign the current directory as cookie path. This means when an user had installed an ownCloud under "/", which is mapped to an empty string in \OC::$WEBROOT, and accessed it the cookie was set to values such as "/index.php/apps/files" since the web browser assumed this to be a directory. This means that multiple encryption cookies were set for the same domain resulting in potential havoc. With this patch the path will be set to "/" in case an empty web root is installed which makes the cookie accessible to the whole domain. To test this setup multiple ownCloud instances on the same domain under different ports and have both installed under "/", then try to login in both of it and previously this can in some cases lead to a lockout of the user. Note that this affects the cookies that the browsers do sent and thus to test this you need to clear all cookies from your browser previously. I consider this an acceptable behaviour for now since this code is only in master. Fixes https://github.com/owncloud/core/issues/18919 | ||||
* | | | | Merge pull request #19006 from owncloud/individual-it-patch-1 | Individual IT Services | 2015-09-14 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | allow ".." in folder names | ||||
| * | | | allow ".." in folder names | Individual IT Services | 2015-09-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | ".." are valid in folder names, only ".." by itself is invalid fix for #18987 | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-14 | 194 | -1628/+1232 |
|/ / / | |||||
* | | | Merge pull request #18996 from owncloud/ext-swift-dependencycheck | Robin McCorkell | 2015-09-13 | 2 | -2/+6 |
|\ \ \ | | | | | | | | | Fix dependency check for Swift and SMB_OC | ||||
| * | | | Fix dependency check for Swift and SMB_OC | Robin McCorkell | 2015-09-13 | 2 | -2/+6 |
|/ / / | | | | | | | | | | Mistake caused during merging, where the API had changed | ||||
* | | | Merge pull request #18441 from owncloud/ext-backends.advanced | Robin McCorkell | 2015-09-13 | 31 | -744/+720 |
|\ \ \ | | | | | | | | | Migrate advanced external storage backends to new registration API [part 3] | ||||
| * | | | Fix Swift legacy auth mechanism fallback | Robin McCorkell | 2015-09-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix typo in SMB_OC | Robin McCorkell | 2015-09-03 | 1 | -2/+2 |
| | | | | |||||
| * | | | Prevent creation of deprecated backends | Robin McCorkell | 2015-08-28 | 2 | -0/+4 |
| | | | | |||||
| * | | | Introduce MODIFY permission for external storages | Robin McCorkell | 2015-08-28 | 5 | -11/+21 |
| | | | | |||||
| * | | | Validate permissions for created admin storages, auth mechanism | Robin McCorkell | 2015-08-28 | 5 | -34/+63 |
| | | | | | | | | | | | | | | | | | | | | Backend and auth mechanism permissions are checked on storage creation, both for personal storages and for admin storages | ||||
| * | | | Implement more fine-grained external storage permissions model | Robin McCorkell | 2015-08-28 | 13 | -238/+212 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VisibilityTrait -> PermissionsTrait PermissionsTrait stores two sets of data, $permissions and $allowedPermissions (analogous to $visibility and $allowedVisibility of VisibilityTrait). Each set is a map of user type ('admin' or 'personal') to permissions (mounting permission, create permission). The result is that a backend can now be restricted for creation, while still allowing it to be mounted. This is useful for deprecating backends or auth mechanisms, preventing new storages being created, while still allowing existing storages to be mounted. | ||||
| * | | | AjaxController uses RSA auth mechanism | Robin McCorkell | 2015-08-28 | 3 | -20/+22 |
| | | | | |||||
| * | | | Migrate SFTP_Key external storage to new API | Robin McCorkell | 2015-08-28 | 10 | -287/+177 |
| | | | | | | | | | | | | | | | | | | | | The SFTP backend now supports public key authentication alongside password authentication. | ||||
| * | | | Migrate SMB_OC external storage to new API | Robin McCorkell | 2015-08-28 | 4 | -142/+68 |
| | | | | | | | | | | | | | | | | | | | | SMB_OC has been merged with SMB, via the identifier aliases mechanism. Legacy migration is done to the Session Credentials password mechanism | ||||
| * | | | Migrate Swift external storage to new API | Robin McCorkell | 2015-08-28 | 5 | -18/+159 |
| | | | | | | | | | | | | | | | | | | | | The Rackspace/OpenStack differences have been split into separate auth mechanisms, with correct legacy migration | ||||
* | | | | Merge pull request #18991 from owncloud/public-resolve | Bernhard Posselt | 2015-09-13 | 2 | -1/+11 |
|\ \ \ \ | | | | | | | | | | | Make resolve public to avoid boiler plate code | ||||
| * | | | | make resolve public to avoid boiler plate code | Bernhard Posselt | 2015-09-13 | 2 | -1/+11 |
|/ / / / | | | | | | | | | | | | | add resolve to public interface | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-13 | 6 | -0/+12 |
| | | | | |||||
* | | | | Merge pull request #18658 from owncloud/configurable-temp | Frank Karlitschek | 2015-09-12 | 6 | -22/+140 |
|\ \ \ \ | | | | | | | | | | | Configurable temporary directory | ||||
| * | | | | Add config.sample.php parameter for tempdirectory | Robin McCorkell | 2015-09-06 | 1 | -0/+10 |
| | | | | | |||||
| * | | | | Unit test getting temp dir from config | Robin McCorkell | 2015-08-30 | 1 | -1/+19 |
| | | | | | |||||
| * | | | | Clean up TempManager to follow code guidelines | Robin McCorkell | 2015-08-30 | 4 | -43/+91 |
| | | | | | | | | | | | | | | | | | | | | tmpBaseDir can be overridden for unit testing purposes | ||||
| * | | | | moved code to /lib/private/tempmanager.php | root | 2015-08-29 | 4 | -21/+63 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix for unit test some fixes | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-12 | 80 | -138/+180 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #18653 from owncloud/dav-stream-guzzle | Lukas Reschke | 2015-09-11 | 4 | -67/+46 |
|\ \ \ \ | | | | | | | | | | | stream webdav downloads using http client | ||||
| * | | | | also use httpclient for uploadFile | Robin Appelman | 2015-09-01 | 1 | -35/+18 |
| | | | | | |||||
| * | | | | stream webdav downloads using http client | Robin Appelman | 2015-08-29 | 1 | -29/+15 |
| | | | | | |||||
| * | | | | allow streamed responses in http client | Robin Appelman | 2015-08-29 | 3 | -5/+15 |
| | | | | | |||||
* | | | | | Merge pull request #18977 from owncloud/fix-mimetype-reset | Lukas Reschke | 2015-09-11 | 4 | -13/+19 |
|\ \ \ \ \ | | | | | | | | | | | | | Add reset method to mimetype loader | ||||
| * | | | | | Add reset method to mimetype loader | Robin McCorkell | 2015-09-11 | 4 | -13/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | Used to solve concurrency issues | ||||
* | | | | | | Merge pull request #18963 from owncloud/ext-fix-fallbacks | Lukas Reschke | 2015-09-11 | 1 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Update isCertificateImportAllowed() check to new API | ||||
| * | | | | | Update isCertificateImportAllowed() check to new API | Robin McCorkell | 2015-09-10 | 1 | -2/+2 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #18778 from owncloud/locking-setup-warnings | Lukas Reschke | 2015-09-11 | 2 | -18/+22 |
|\ \ \ \ \ | | | | | | | | | | | | | Replace server status message about transitional file locking with se… |