summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #15445 from owncloud/enc2_migrationClark Tomlinson2015-04-1629-118/+1204
|\ | | | | add migration script from old encryption to new one
| * decrypt private key for public shares correctlyBjoern Schiessle2015-04-163-4/+4
| |
| * detect system wide mount points correctlyBjoern Schiessle2015-04-168-24/+85
| |
| * 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
| * allow user to start migration in admin settings if no external user ↵Bjoern Schiessle2015-04-166-18/+201
| | | | | | | | back-ends are enabled
| * fix decryption of legacy private keyBjoern Schiessle2015-04-161-1/+0
| |
| * add versionBjoern Schiessle2015-04-161-0/+1
| |
| * add migration script from old encryption to new oneBjoern Schiessle2015-04-1614-73/+915
| |
* | 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
* | | Merge pull request #15673 from owncloud/issue/15577-transaction-read-committedJoas Schilling2015-04-161-0/+2
|\ \ \ | | | | | | | | [master] Using TRANSACTION_READ_COMMITTED
| * | | Using TRANSACTION_READ_COMMITTEDThomas Müller2015-04-161-0/+2
| |/ /
* | | Merge pull request #15670 from owncloud/encryption-is-an-shipped-app-masterJoas Schilling2015-04-161-1/+1
|\ \ \ | |/ / |/| | files_encryption -> encryption
| * | files_encryption -> encryptionThomas Müller2015-04-161-1/+1
|/ /
* | Merge pull request #15623 from t3chguy/masterJörn Friedrich Dreyer2015-04-162-2/+8
|\ \ | | | | | | Redis DB Index via Select
| * | Memcache\Redis Add DB Select FunctionalityMichael Telatynski2015-04-152-2/+8
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-1648-16/+308
| | |
* | | 8.1 alpha 1v8.1.0alpha1Frank Karlitschek2015-04-151-2/+2
| | |
* | | Merge pull request #15654 from owncloud/enc2_header_system_keysMorris Jobke2015-04-152-2/+4
|\ \ \ | | | | | | | | make sure that encrypted private keys always have a header
| * | | make sure that encrypted private keys always have a headerBjoern Schiessle2015-04-152-2/+4
| | |/ | |/|
* | | Merge pull request #15644 from owncloud/sftp-defaultport-storageidMorris Jobke2015-04-152-1/+66
|\ \ \ | | | | | | | | Fix SFTP storage id to be compatible with older ids
| * | | Add visibility for methodMorris Jobke2015-04-151-1/+1
| | | |
| * | | Fix SFTP storage id to be compatible with older idsVincent Petry2015-04-152-1/+66
| | | | | | | | | | | | | | | | | | | | | | | | Remove port from SFTP storage id if it is 22. This will prevent recreating a different storage entry due to id mismatch after upgrade.
* | | | Merge pull request #15638 from owncloud/primary-button-disabledMorris Jobke2015-04-151-3/+4
|\ \ \ \ | | | | | | | | | | add disabled state to primary action button
| * | | | add disabled state to primary action buttonJan-Christoph Borchardt2015-04-151-3/+4
| | | | |
* | | | | Merge pull request #15632 from owncloud/remove-tooltip-fadeJan-Christoph Borchardt2015-04-154-4/+4
|\ \ \ \ \ | |/ / / / |/| | | | remove slow fade animation for remaining tipsy tooltips
| * | | | remove slow fade animation for remaining tipsy tooltipsJan-Christoph Borchardt2015-04-154-4/+4
| | | | |
* | | | | Merge pull request #15626 from owncloud/remove-tooltip-fadeVincent Petry2015-04-152-11/+11
|\| | | | | |/ / / |/| | | remove slow fade animation for tipsy tooltip
| * | | remove slow fade animation for tipsy tooltipJan-Christoph Borchardt2015-04-152-11/+11
| | |/ | |/|
* | | Merge pull request #15613 from owncloud/allow-files-nav-iconsThomas Müller2015-04-151-1/+1
|\ \ \ | |_|/ |/| | Allow files app nav entries to have a different icon class
| * | Allow files app nav entries to have a different icon classMorris Jobke2015-04-141-1/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-1568-0/+92
| | |
* | | Merge pull request #12006 from owncloud/dav-put-storageMorris Jobke2015-04-152-44/+86
|\ \ \ | | | | | | | | 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-142-11/+13
| | | |
| * | | 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-092-26/+45
| | | |
| * | | Work directly on the storage when uploading over webdavRobin Appelman2015-04-081-23/+43
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-142-0/+2
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-14696-5646/+4852
| | | |
* | | | 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-152-2/+26
|\ \ \ \ \ | |_|_|_|/ |/| | | | Avoid php message "Invalid argument supplied for foreach()"
| * | | | Remove unneeded commentsMorris Jobke2015-04-141-13/+0
| | | | |
| * | | | Avoid php message "Invalid argument supplied for foreach()" - refs #15590Thomas Müller2015-04-142-2/+39
| | | | |
* | | | | Merge pull request #15612 from owncloud/fix-transifex-masterVincent Petry2015-04-141-2/+2
|\ \ \ \ \ | | | | | | | | | | | | files_encryption -> encryption
| * | | | | files_encryption -> encryptionThomas Müller2015-04-141-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge pull request #15598 from owncloud/fix-enc-file-size-masterBjörn Schießle2015-04-147-51/+16
|\ \ \ \ \ | |/ / / / |/| | | | Fix file size of encrypted files
| * | | | remove calculateUnencryptedSize() - not neededThomas Müller2015-04-145-42/+2
| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-09 21:34:11 +0000