summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-04-172-20/+24
|
* Merge pull request #15445 from owncloud/enc2_migrationClark Tomlinson2015-04-167-23/+108
|\ | | | | add migration script from old encryption to new one
| * detect system wide mount points correctlyBjoern Schiessle2015-04-165-10/+54
| |
| * if we start writing a file from the beginning, size should start by zero; ↵Bjoern Schiessle2015-04-161-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 oneBjoern Schiessle2015-04-164-12/+53
| |
* | Merge pull request #15674 from owncloud/fix-console-check-outputJoas Schilling2015-04-161-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üller2015-04-161-2/+2
| | | | | | | | | | | | https://mailman.owncloud.org/pipermail/devel/2015-April/001184.html
* | | Using TRANSACTION_READ_COMMITTEDThomas Müller2015-04-161-0/+2
|/ /
* | Merge pull request #15623 from t3chguy/masterJörn Friedrich Dreyer2015-04-161-0/+5
|\ \ | | | | | | Redis DB Index via Select
| * | Memcache\Redis Add DB Select FunctionalityMichael Telatynski2015-04-151-0/+5
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-168-10/+20
| |/ |/|
* | Merge pull request #12006 from owncloud/dav-put-storageMorris Jobke2015-04-151-35/+61
|\ \ | | | | | | Work directly on the storage when uploading over webdav
| * | Keep phpdoc updated.Robin Appelman2015-04-141-1/+1
| | |
| * | pass a stream to the testsRobin Appelman2015-04-141-6/+0
| | |
| * | rewind and update error messageRobin Appelman2015-04-131-1/+2
| | |
| * | use our own stream copy insteadRobin Appelman2015-04-131-1/+1
| | |
| * | update testsRobin Appelman2015-04-091-22/+33
| | |
| * | Work directly on the storage when uploading over webdavRobin Appelman2015-04-081-23/+43
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-1430-8/+88
| | |
* | | Merge pull request #15597 from oparoz/another-fallback-for-findbinarypathThomas Müller2015-04-151-1/+6
|\ \ \ | | | | | | | | Adding a final fallback for findBinaryPath
| * | | Adding a final fallback for findBinaryPathOlivier Paroz2015-04-141-1/+6
| | | |
* | | | Merge pull request #15592 from owncloud/fix-15590-masterThomas Müller2015-04-151-2/+4
|\ \ \ \ | |_|_|/ |/| | | Avoid php message "Invalid argument supplied for foreach()"
| * | | Avoid php message "Invalid argument supplied for foreach()" - refs #15590Thomas Müller2015-04-141-2/+4
| | | |
* | | | Merge pull request #15598 from owncloud/fix-enc-file-size-masterBjörn Schießle2015-04-142-16/+13
|\ \ \ \ | | | | | | | | | | Fix file size of encrypted files
| * | | | remove calculateUnencryptedSize() - not neededThomas Müller2015-04-141-8/+0
| | | | |
| * | | | return size from cache in case the cache entry is marked as encryptedThomas Müller2015-04-141-8/+10
| | | | |
| * | | | preserve filesize on rename after uploadThomas Müller2015-04-141-0/+3
| | |/ / | |/| |
* | | | Merge pull request #13360 from owncloud/cross-storage-moveMorris Jobke2015-04-146-88/+189
|\ \ \ \ | |/ / / |/| | | Proper copy/move between multiple local storages
| * | | fix rebase issueRobin Appelman2015-04-131-2/+2
| | | |
| * | | Properly handle copy/move failures in cross storage copy/moveRobin Appelman2015-04-131-3/+10
| | | |
| * | | Detect storage full when doing cross storage copy/moveRobin Appelman2015-04-131-2/+37
| | | |
| * | | properly return false if we cant delete the source fileRobin Appelman2015-04-131-2/+2
| | | |
| * | | Make getSourcePath accessible for storage wrappersRobin Appelman2015-04-131-1/+1
| | | |
| * | | Improve cross storage copy between local storagesRobin Appelman2015-04-131-0/+36
| | | |
| * | | Move cross storage copy logic to the storageRobin Appelman2015-04-134-74/+97
| | | |
| * | | Small cleanup of rename codeRobin Appelman2015-04-131-14/+14
| | | |
* | | | Merge pull request #15581 from owncloud/deduplicate-oc-repair-namespaceMorris Jobke2015-04-132-14/+16
|\ \ \ \ | | | | | | | | | | Fix namespace duplication and other issues in repairlegacystorages
| * | | | Fix namespace duplication and other issues in repairlegacystoragesJoas Schilling2015-04-132-14/+16
| | | | |
* | | | | Merge pull request #15360 from owncloud/cross-storage-move-cacheMorris Jobke2015-04-133-33/+59
|\ \ \ \ \ | |/ / / / |/| | | | Preserve cache data when doing a cross storage move
| * | | | Fix cross storage move with shared storagesRobin Appelman2015-04-131-3/+16
| | | | |
| * | | | Fix moving mount pointsRobin Appelman2015-04-131-1/+3
| | | | |
| * | | | reuse cache move logicRobin Appelman2015-04-131-26/+1
| | | | |
| * | | | preserve cache data when doing a cross storage moveRobin Appelman2015-04-132-21/+57
| |/ / /
* | | | Merge pull request #15568 from ↵Thomas Müller2015-04-131-2/+11
|\ \ \ \ | |/ / / |/| | | | | | | | | | | owncloud/cache_user_folder_for_file_search_results cach user folder for file search results
| * | | cach user folder for file search resultsJörn Friedrich Dreyer2015-04-131-2/+11
| | | |
* | | | Properly add trailing slash to mount pointVincent Petry2015-04-131-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 Jobke2015-04-131-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üller2015-04-131-0/+3
| |/ / | | | | | | | | | /xxx/lib/private/ocsclient.php#282"
* / / Properly import used classesThomas Müller2015-04-131-35/+48
|/ /
* | Merge pull request #15541 from owncloud/add-reply-to-supportLukas Reschke2015-04-122-60/+122
|\ \ | | | | | | Add "Reply-To" support for sharing mails as well as refactor code and add unit-tests