Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix followup issues with unneeded parameters | Morris Jobke | 2015-04-18 | 4 | -19/+19 |
| | |||||
* | DB: remove unused parameter - was forgotten during the migration to doctrine | Morris Jobke | 2015-04-18 | 1 | -3/+2 |
| | | | | * 377e9a8677afc92bca61fb1bb055901db8457896 <- doctrine merge | ||||
* | Merge pull request #15691 from owncloud/vobject-sabre2.1 | Morris Jobke | 2015-04-17 | 1 | -258/+0 |
|\ | | | | | Get rid of the obsolete OC_VObject class | ||||
| * | Get rid of the obsolete OC_VObject class | Vincent Petry | 2015-04-17 | 1 | -258/+0 |
| | | | | | | | | The class isn't needed any more since the update to Sabre 2.1 | ||||
* | | Delay initialization of the OC\Encryption\Update - introducing ↵ | Thomas Müller | 2015-04-17 | 1 | -0/+66 |
| | | | | | | | | 'OC\Encryption\HookManager' | ||||
* | | always create a new instance of the encryption module | Bjoern Schiessle | 2015-04-17 | 1 | -23/+19 |
| | | |||||
* | | Merge pull request #15445 from owncloud/enc2_migration | Clark Tomlinson | 2015-04-16 | 6 | -23/+107 |
|\ \ | | | | | | | add migration script from old encryption to new one | ||||
| * | | detect system wide mount points correctly | Bjoern Schiessle | 2015-04-16 | 4 | -10/+53 |
| | | | |||||
| * | | if we start writing a file from the beginning, size should start by zero; ↵ | Bjoern Schiessle | 2015-04-16 | 1 | -2/+2 |
| | | | | | | | | | | | | result of floor needs to be casted to int in order to compare it with ->size | ||||
| * | | add migration script from old encryption to new one | Bjoern Schiessle | 2015-04-16 | 4 | -12/+53 |
| | | | |||||
* | | | Merge pull request #15674 from owncloud/fix-console-check-output | Joas Schilling | 2015-04-16 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Convert error and hint to string before writing to the output | ||||
| * | | | Convert error and hint to string before writing to the output - fixes ↵ | Thomas Müller | 2015-04-16 | 1 | -2/+2 |
| | |/ | |/| | | | | | | | https://mailman.owncloud.org/pipermail/devel/2015-April/001184.html | ||||
* / | | Using TRANSACTION_READ_COMMITTED | Thomas Müller | 2015-04-16 | 1 | -0/+2 |
|/ / | |||||
* | | Merge pull request #15623 from t3chguy/master | Jörn Friedrich Dreyer | 2015-04-16 | 1 | -0/+5 |
|\ \ | |/ |/| | Redis DB Index via Select | ||||
| * | Memcache\Redis Add DB Select Functionality | Michael Telatynski | 2015-04-15 | 1 | -0/+5 |
| | | |||||
* | | Merge pull request #12006 from owncloud/dav-put-storage | Morris Jobke | 2015-04-15 | 1 | -35/+61 |
|\ \ | | | | | | | Work directly on the storage when uploading over webdav | ||||
| * | | Keep phpdoc updated. | Robin Appelman | 2015-04-14 | 1 | -1/+1 |
| | | | |||||
| * | | pass a stream to the tests | Robin Appelman | 2015-04-14 | 1 | -6/+0 |
| | | | |||||
| * | | rewind and update error message | Robin Appelman | 2015-04-13 | 1 | -1/+2 |
| | | | |||||
| * | | use our own stream copy instead | Robin Appelman | 2015-04-13 | 1 | -1/+1 |
| | | | |||||
| * | | update tests | Robin Appelman | 2015-04-09 | 1 | -22/+33 |
| | | | |||||
| * | | Work directly on the storage when uploading over webdav | Robin Appelman | 2015-04-08 | 1 | -23/+43 |
| | | | |||||
* | | | Merge pull request #15597 from oparoz/another-fallback-for-findbinarypath | Thomas Müller | 2015-04-15 | 1 | -1/+6 |
|\ \ \ | | | | | | | | | Adding a final fallback for findBinaryPath | ||||
| * | | | Adding a final fallback for findBinaryPath | Olivier Paroz | 2015-04-14 | 1 | -1/+6 |
| | | | | |||||
* | | | | Merge pull request #15592 from owncloud/fix-15590-master | Thomas Müller | 2015-04-15 | 1 | -2/+4 |
|\ \ \ \ | |_|_|/ |/| | | | Avoid php message "Invalid argument supplied for foreach()" | ||||
| * | | | Avoid php message "Invalid argument supplied for foreach()" - refs #15590 | Thomas Müller | 2015-04-14 | 1 | -2/+4 |
| | | | | |||||
* | | | | Merge pull request #15598 from owncloud/fix-enc-file-size-master | Björn Schießle | 2015-04-14 | 1 | -8/+13 |
|\ \ \ \ | | | | | | | | | | | Fix file size of encrypted files | ||||
| * | | | | return size from cache in case the cache entry is marked as encrypted | Thomas Müller | 2015-04-14 | 1 | -8/+10 |
| | | | | | |||||
| * | | | | preserve filesize on rename after upload | Thomas Müller | 2015-04-14 | 1 | -0/+3 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #13360 from owncloud/cross-storage-move | Morris Jobke | 2015-04-14 | 5 | -88/+173 |
|\ \ \ \ | |/ / / |/| | | | Proper copy/move between multiple local storages | ||||
| * | | | fix rebase issue | Robin Appelman | 2015-04-13 | 1 | -2/+2 |
| | | | | |||||
| * | | | Properly handle copy/move failures in cross storage copy/move | Robin Appelman | 2015-04-13 | 1 | -3/+10 |
| | | | | |||||
| * | | | Detect storage full when doing cross storage copy/move | Robin Appelman | 2015-04-13 | 1 | -2/+37 |
| | | | | |||||
| * | | | properly return false if we cant delete the source file | Robin Appelman | 2015-04-13 | 1 | -2/+2 |
| | | | | |||||
| * | | | Make getSourcePath accessible for storage wrappers | Robin Appelman | 2015-04-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Improve cross storage copy between local storages | Robin Appelman | 2015-04-13 | 1 | -0/+36 |
| | | | | |||||
| * | | | Move cross storage copy logic to the storage | Robin Appelman | 2015-04-13 | 3 | -74/+81 |
| | | | | |||||
| * | | | Small cleanup of rename code | Robin Appelman | 2015-04-13 | 1 | -14/+14 |
| | | | | |||||
* | | | | Merge pull request #15581 from owncloud/deduplicate-oc-repair-namespace | Morris Jobke | 2015-04-13 | 2 | -261/+1 |
|\ \ \ \ | | | | | | | | | | | Fix namespace duplication and other issues in repairlegacystorages | ||||
| * | | | | Fix namespace duplication and other issues in repairlegacystorages | Joas Schilling | 2015-04-13 | 2 | -261/+1 |
| | | | | | |||||
* | | | | | Merge pull request #15360 from owncloud/cross-storage-move-cache | Morris Jobke | 2015-04-13 | 3 | -33/+59 |
|\ \ \ \ \ | |/ / / / |/| | | | | Preserve cache data when doing a cross storage move | ||||
| * | | | | Fix cross storage move with shared storages | Robin Appelman | 2015-04-13 | 1 | -3/+16 |
| | | | | | |||||
| * | | | | Fix moving mount points | Robin Appelman | 2015-04-13 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | reuse cache move logic | Robin Appelman | 2015-04-13 | 1 | -26/+1 |
| | | | | | |||||
| * | | | | preserve cache data when doing a cross storage move | Robin Appelman | 2015-04-13 | 2 | -21/+57 |
| |/ / / | |||||
* | | | | Merge pull request #15568 from ↵ | Thomas Müller | 2015-04-13 | 1 | -2/+11 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | owncloud/cache_user_folder_for_file_search_results cach user folder for file search results | ||||
| * | | | cach user folder for file search results | Jörn Friedrich Dreyer | 2015-04-13 | 1 | -2/+11 |
| | | | | |||||
* | | | | Properly add trailing slash to mount point | Vincent Petry | 2015-04-13 | 1 | -1/+3 |
|/ / / | | | | | | | | | | | | | Fixes resolving mount points when shared mount point's target name has the same prefix as the source name | ||||
* | | | Merge pull request #15563 from ↵ | Morris Jobke | 2015-04-13 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/fix-try-getting-propert-of-non-object-ocsclient Prevent php message: "Trying to get property of non-object at /xxx/lib/p... | ||||
| * | | | Prevent php message: "Trying to get property of non-object at ↵ | Thomas Müller | 2015-04-13 | 1 | -0/+3 |
| |/ / | | | | | | | | | | /xxx/lib/private/ocsclient.php#282" |