summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* always create a new instance of the encryption moduleBjoern Schiessle2015-04-176-60/+66
* Merge pull request #15679 from owncloud/fix-private-member-accessThomas Müller2015-04-171-2/+2
|\
| * Fix private member access of parent class in ocsresponseMorris Jobke2015-04-161-2/+2
* | Merge pull request #15680 from owncloud/add-since-tags-to-public-namespaceThomas Müller2015-04-17141-152/+1373
|\ \
| * | Add @since tags to all methods in public namespaceMorris Jobke2015-04-16141-152/+1373
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-1742-68/+364
| |/ |/|
* | Merge pull request #15675 from owncloud/enc_error_messagesClark Tomlinson2015-04-166-10/+155
|\ \
| * | display warning if password changed or if the keys are not initializedBjoern Schiessle2015-04-166-10/+155
* | | Merge pull request #15445 from owncloud/enc2_migrationClark Tomlinson2015-04-1629-118/+1204
|\ \ \
| * | | 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; res...Bjoern Schiessle2015-04-161-2/+2
| * | | allow user to start migration in admin settings if no external user back-ends...Bjoern Schiessle2015-04-166-18/+201
| * | | 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 - fixes https:/...Thomas Müller2015-04-161-2/+2
* | | | | Merge pull request #15673 from owncloud/issue/15577-transaction-read-committedJoas Schilling2015-04-161-0/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | 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 -> encryptionThomas Müller2015-04-161-1/+1
|/ / /
* | | Merge pull request #15623 from t3chguy/masterJörn Friedrich Dreyer2015-04-162-2/+8
|\ \ \
| * | | 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 headerBjoern Schiessle2015-04-152-2/+4
| | |/ | |/|
* | | Merge pull request #15644 from owncloud/sftp-defaultport-storageidMorris Jobke2015-04-152-1/+66
|\ \ \
| * | | Add visibility for methodMorris Jobke2015-04-151-1/+1
| * | | Fix SFTP storage id to be compatible with older idsVincent Petry2015-04-152-1/+66
* | | | Merge pull request #15638 from owncloud/primary-button-disabledMorris Jobke2015-04-151-3/+4
|\ \ \ \
| * | | | 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 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 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 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
|\ \ \
| * | | 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
|\ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-27 14:48:21 +0000