| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 | Olivier Paroz | 2015-04-14 | 1 | -1/+6 |
* | | Merge pull request #15592 from owncloud/fix-15590-master | Thomas Müller | 2015-04-15 | 2 | -2/+26 |
|\ \ |
|
| * | | Remove unneeded comments | Morris Jobke | 2015-04-14 | 1 | -13/+0 |
| * | | Avoid php message "Invalid argument supplied for foreach()" - refs #15590 | Thomas Müller | 2015-04-14 | 2 | -2/+39 |
* | | | Merge pull request #15612 from owncloud/fix-transifex-master | Vincent Petry | 2015-04-14 | 1 | -2/+2 |
|\ \ \ |
|
| * | | | files_encryption -> encryption | Thomas Müller | 2015-04-14 | 1 | -2/+2 |
* | | | | Merge pull request #15598 from owncloud/fix-enc-file-size-master | Björn Schießle | 2015-04-14 | 7 | -51/+16 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | remove calculateUnencryptedSize() - not needed | Thomas Müller | 2015-04-14 | 5 | -42/+2 |
| * | | | 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 |
| * | | | fix reading of private key | Thomas Müller | 2015-04-14 | 1 | -1/+1 |
| | |/
| |/| |
|
* | | | Merge pull request #13360 from owncloud/cross-storage-move | Morris Jobke | 2015-04-14 | 10 | -105/+373 |
|\ \ \
| |/ /
|/| | |
|
| * | | a bit more phpdoc | Robin Appelman | 2015-04-14 | 1 | -0/+6 |
| * | | fix rebase issue | Robin Appelman | 2015-04-13 | 1 | -2/+2 |
| * | | add missing return for shared | Robin Appelman | 2015-04-13 | 1 | -2/+2 |
| * | | Properly handle copy/move failures in cross storage copy/move | Robin Appelman | 2015-04-13 | 2 | -8/+24 |
| * | | 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 | 2 | -6/+7 |
| * | | Make getSourcePath accessible for storage wrappers | Robin Appelman | 2015-04-13 | 1 | -1/+1 |
| * | | Fix test | Robin Appelman | 2015-04-13 | 1 | -2/+8 |
| * | | Implement move/copyFromStorage for shared storage | Robin Appelman | 2015-04-13 | 2 | -6/+86 |
| * | | Improve cross storage copy between local storages | Robin Appelman | 2015-04-13 | 2 | -2/+103 |
| * | | Move cross storage copy logic to the storage | Robin Appelman | 2015-04-13 | 4 | -74/+97 |
| * | | Small cleanup of rename code | Robin Appelman | 2015-04-13 | 1 | -14/+14 |
* | | | Merge pull request #15566 from owncloud/fix-filepicker | Thomas Müller | 2015-04-14 | 3 | -5/+28 |
|\ \ \ |
|
| * | | | fix filepicker | Morris Jobke | 2015-04-13 | 3 | -5/+28 |
* | | | | Merge pull request #15585 from owncloud/fix-user-list | Lukas Reschke | 2015-04-13 | 2 | -3/+8 |
|\ \ \ \ |
|
| * | | | | Fix user list | Morris Jobke | 2015-04-13 | 2 | -3/+8 |
* | | | | | Merge pull request #15581 from owncloud/deduplicate-oc-repair-namespace | Morris Jobke | 2015-04-13 | 3 | -27/+77 |
|\ \ \ \ \ |
|
| * | | | | | Fix namespace duplication and other issues in repairlegacystorages | Joas Schilling | 2015-04-13 | 3 | -27/+77 |
| |/ / / / |
|
* | | | | | Merge pull request #15360 from owncloud/cross-storage-move-cache | Morris Jobke | 2015-04-13 | 7 | -52/+151 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | Fix cross storage move with shared storages | Robin Appelman | 2015-04-13 | 3 | -14/+27 |
| * | | | | upda tests | Robin Appelman | 2015-04-13 | 1 | -6/+1 |
| * | | | | Fix moving mount points | Robin Appelman | 2015-04-13 | 1 | -1/+3 |
| * | | | | check that we know the parent | Robin Appelman | 2015-04-13 | 1 | -3/+5 |
| * | | | | check for source cache | 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 | 3 | -21/+131 |
| | |/ /
| |/| | |
|
* | | | | Merge pull request #15568 from owncloud/cache_user_folder_for_file_search_res... | Thomas Müller | 2015-04-13 | 1 | -2/+11 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | cach user folder for file search results | Jörn Friedrich Dreyer | 2015-04-13 | 1 | -2/+11 |
* | | | | Merge pull request #15570 from owncloud/shares-properlyformatmountpoint | Morris Jobke | 2015-04-13 | 3 | -4/+16 |
|\ \ \ \ |
|
| * | | | | Properly add trailing slash to mount point | Vincent Petry | 2015-04-13 | 3 | -4/+16 |
| |/ / / |
|
* | | | | Merge pull request #15564 from rullzer/fix_13709 | Vincent Petry | 2015-04-13 | 2 | -0/+29 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Do not try to make user subadmin of group twice | Roeland Jago Douma | 2015-04-13 | 2 | -0/+29 |
| |/ / |
|
* | | | Merge pull request #15563 from owncloud/fix-try-getting-propert-of-non-object... | Morris Jobke | 2015-04-13 | 2 | -0/+48 |
|\ \ \
| |/ /
|/| | |
|
| * | | Prevent php message: "Trying to get property of non-object at /xxx/lib/privat... | Thomas Müller | 2015-04-13 | 2 | -0/+48 |
| |/ |
|
* | | Merge pull request #15562 from owncloud/fix-15560 | Joas Schilling | 2015-04-13 | 1 | -35/+48 |
|\ \
| |/
|/| |
|
| * | Properly import used classes | Thomas Müller | 2015-04-13 | 1 | -35/+48 |
|/ |
|
* | Merge pull request #15555 from rullzer/fix_15494 | Morris Jobke | 2015-04-12 | 1 | -1/+1 |
|\ |
|