summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #15718 from owncloud/issue/15694-display-name-of-encryptio...Thomas Müller2015-04-181-4/+4
|\
| * Fix display name of encryption modulesJoas Schilling2015-04-181-4/+4
* | Merge pull request #15727 from owncloud/cleanup-db-interfaceThomas Müller2015-04-184-22/+21
|\ \
| * | fix followup issues with unneeded parametersMorris Jobke2015-04-184-19/+19
| * | DB: remove unused parameter - was forgotten during the migration to doctrineMorris Jobke2015-04-181-3/+2
| |/
* / add visibility of methods in server container and interfaceMorris Jobke2015-04-181-48/+48
|/
* Merge pull request #15691 from owncloud/vobject-sabre2.1Morris Jobke2015-04-171-258/+0
|\
| * Get rid of the obsolete OC_VObject classVincent Petry2015-04-171-258/+0
* | Delay initialization of the OC\Encryption\Update - introducing 'OC\Encryption...Thomas Müller2015-04-171-0/+66
* | always create a new instance of the encryption moduleBjoern Schiessle2015-04-171-23/+19
* | Merge pull request #15445 from owncloud/enc2_migrationClark Tomlinson2015-04-166-23/+107
|\ \
| * | detect system wide mount points correctlyBjoern Schiessle2015-04-164-10/+53
| * | if we start writing a file from the beginning, size should start by zero; res...Bjoern Schiessle2015-04-161-2/+2
| * | 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 - fixes https:/...Thomas Müller2015-04-161-2/+2
| | |/ | |/|
* / | Using TRANSACTION_READ_COMMITTEDThomas Müller2015-04-161-0/+2
|/ /
* | Merge pull request #15623 from t3chguy/masterJörn Friedrich Dreyer2015-04-161-0/+5
|\ \ | |/ |/|
| * Memcache\Redis Add DB Select FunctionalityMichael Telatynski2015-04-151-0/+5
* | Merge pull request #12006 from owncloud/dav-put-storageMorris Jobke2015-04-151-35/+61
|\ \
| * | 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
* | | Merge pull request #15597 from oparoz/another-fallback-for-findbinarypathThomas Müller2015-04-151-1/+6
|\ \ \
| * | | 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()" - refs #15590Thomas Müller2015-04-141-2/+4
* | | | Merge pull request #15598 from owncloud/fix-enc-file-size-masterBjörn Schießle2015-04-141-8/+13
|\ \ \ \
| * | | | 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-145-88/+173
|\ \ \ \ | |/ / / |/| | |
| * | | 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-133-74/+81
| * | | Small cleanup of rename codeRobin Appelman2015-04-131-14/+14
* | | | Merge pull request #15581 from owncloud/deduplicate-oc-repair-namespaceMorris Jobke2015-04-132-261/+1
|\ \ \ \
| * | | | Fix namespace duplication and other issues in repairlegacystoragesJoas Schilling2015-04-132-261/+1
* | | | | Merge pull request #15360 from owncloud/cross-storage-move-cacheMorris Jobke2015-04-133-33/+59
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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 owncloud/cache_user_folder_for_file_search_res...Thomas Müller2015-04-131-2/+11
|\ \ \ \ | |/ / / |/| | |