Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add @since tags to all methods in public namespace | Morris Jobke | 2015-04-16 | 141 | -152/+1373 |
* | Merge pull request #15654 from owncloud/enc2_header_system_keys | Morris Jobke | 2015-04-15 | 2 | -2/+4 |
|\ | |||||
| * | make sure that encrypted private keys always have a header | Bjoern Schiessle | 2015-04-15 | 2 | -2/+4 |
* | | Merge pull request #15644 from owncloud/sftp-defaultport-storageid | Morris Jobke | 2015-04-15 | 2 | -1/+66 |
|\ \ | |||||
| * | | Add visibility for method | Morris Jobke | 2015-04-15 | 1 | -1/+1 |
| * | | Fix SFTP storage id to be compatible with older ids | Vincent Petry | 2015-04-15 | 2 | -1/+66 |
* | | | Merge pull request #15638 from owncloud/primary-button-disabled | Morris Jobke | 2015-04-15 | 1 | -3/+4 |
|\ \ \ | |||||
| * | | | add disabled state to primary action button | Jan-Christoph Borchardt | 2015-04-15 | 1 | -3/+4 |
* | | | | Merge pull request #15632 from owncloud/remove-tooltip-fade | Jan-Christoph Borchardt | 2015-04-15 | 4 | -4/+4 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | remove slow fade animation for remaining tipsy tooltips | Jan-Christoph Borchardt | 2015-04-15 | 4 | -4/+4 |
* | | | | Merge pull request #15626 from owncloud/remove-tooltip-fade | Vincent Petry | 2015-04-15 | 2 | -11/+11 |
|\| | | | |/ / |/| | | |||||
| * | | remove slow fade animation for tipsy tooltip | Jan-Christoph Borchardt | 2015-04-15 | 2 | -11/+11 |
* | | | Merge pull request #15613 from owncloud/allow-files-nav-icons | Thomas Müller | 2015-04-15 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Allow files app nav entries to have a different icon class | Morris Jobke | 2015-04-14 | 1 | -1/+1 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-15 | 68 | -0/+92 |
* | | | Merge pull request #12006 from owncloud/dav-put-storage | Morris Jobke | 2015-04-15 | 2 | -44/+86 |
|\ \ \ | |||||
| * | | | Keep phpdoc updated. | Robin Appelman | 2015-04-14 | 1 | -1/+1 |
| * | | | pass a stream to the tests | Robin Appelman | 2015-04-14 | 2 | -11/+13 |
| * | | | 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 | 2 | -26/+45 |
| * | | | Work directly on the storage when uploading over webdav | Robin Appelman | 2015-04-08 | 1 | -23/+43 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-14 | 2 | -0/+2 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-14 | 696 | -5646/+4852 |
* | | | | 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 |
|\ \ \ \ |