Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | detect system wide mount points correctly | Bjoern Schiessle | 2015-04-16 | 8 | -24/+85 | |
| * | | | | if we start writing a file from the beginning, size should start by zero; res... | Bjoern Schiessle | 2015-04-16 | 1 | -2/+2 | |
| * | | | | allow user to start migration in admin settings if no external user back-ends... | Bjoern Schiessle | 2015-04-16 | 6 | -18/+201 | |
| * | | | | fix decryption of legacy private key | Bjoern Schiessle | 2015-04-16 | 1 | -1/+0 | |
| * | | | | add version | Bjoern Schiessle | 2015-04-16 | 1 | -0/+1 | |
| * | | | | add migration script from old encryption to new one | Bjoern Schiessle | 2015-04-16 | 14 | -73/+915 | |
* | | | | | 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 - fixes https:/... | Thomas Müller | 2015-04-16 | 1 | -2/+2 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge pull request #15673 from owncloud/issue/15577-transaction-read-committed | Joas Schilling | 2015-04-16 | 1 | -0/+2 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | Using TRANSACTION_READ_COMMITTED | Thomas Müller | 2015-04-16 | 1 | -0/+2 | |
| |/ / / | ||||||
* | | | | Merge pull request #15670 from owncloud/encryption-is-an-shipped-app-master | Joas Schilling | 2015-04-16 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | files_encryption -> encryption | Thomas Müller | 2015-04-16 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #15623 from t3chguy/master | Jörn Friedrich Dreyer | 2015-04-16 | 2 | -2/+8 | |
|\ \ \ | ||||||
| * | | | Memcache\Redis Add DB Select Functionality | Michael Telatynski | 2015-04-15 | 2 | -2/+8 | |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-16 | 48 | -16/+308 | |
* | | | | 8.1 alpha 1v8.1.0alpha1 | Frank Karlitschek | 2015-04-15 | 1 | -2/+2 | |
| |_|/ |/| | | ||||||
* | | | 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 |