summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #15714 from owncloud/fix-ldap-xpmodeMorris Jobke2015-04-183-2/+8
|\
| * always open filter tab in raw mode, when 'Manually enter LDAP filters' is che...Arthur Schiwon2015-04-173-2/+8
|/
* Merge pull request #15691 from owncloud/vobject-sabre2.1Morris Jobke2015-04-171-258/+0
|\
| * Get rid of the obsolete OC_VObject classVincent Petry2015-04-171-258/+0
* | Merge pull request #15708 from owncloud/fix-capitalizationMorris Jobke2015-04-172-5/+5
|\ \
| * | fix capitalization for server-side encryption and email server, fix #15642Jan-Christoph Borchardt2015-04-172-5/+5
* | | Revert "make jshint happy"Thomas Müller2015-04-172-20/+17
* | | Revert "use a simple function - OC.Encryption is already defined - fixes #15707"Thomas Müller2015-04-171-13/+23
* | | make jshint happyThomas Müller2015-04-172-17/+20
* | | use a simple function - OC.Encryption is already defined - fixes #15707Thomas Müller2015-04-171-23/+13
* | | Merge pull request #15699 from owncloud/fix-15696-masterThomas Müller2015-04-171-11/+10
|\ \ \
| * | | Do not concat translation stringThomas Müller2015-04-171-5/+4
| * | | fixing undefined variableThomas Müller2015-04-171-8/+8
| |/ /
* | | Merge pull request #15695 from owncloud/handle-app-upgrade-of-filesystem-appsThomas Müller2015-04-172-19/+68
|\ \ \ | |/ / |/| |
| * | Delay initialization of the OC\Encryption\Update - introducing 'OC\Encryption...Thomas Müller2015-04-172-19/+68
* | | Merge pull request #15686 from owncloud/enc_fix_change_passwordThomas Müller2015-04-172-5/+38
|\ \ \ | |/ / |/| |
| * | fix change password if no user is logged in, occ callBjoern Schiessle2015-04-172-5/+38
* | | Merge pull request #15616 from owncloud/enc_stream_copyVincent Petry2015-04-176-60/+66
|\ \ \ | |/ / |/| |
| * | 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
|\ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-09 21:32:59 +0000