summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #15782 from owncloud/hide-modified-multiselectMorris Jobke2015-04-211-1/+10
|\
| * hide modified header when multiselect is active, fix #15779Jan-Christoph Borchardt2015-04-211-1/+10
* | Merge pull request #15721 from oparoz/fix-readonly-cacheThomas Müller2015-04-212-1/+96
|\ \
| * | Renamed class + split methodsOlivier Paroz2015-04-211-25/+13
| * | Tests for read-only cacheOlivier Paroz2015-04-181-0/+105
| * | Thou shalt not corrupt the answer of a cache requestOlivier Paroz2015-04-181-1/+3
* | | Merge pull request #15769 from owncloud/files-emptycontentreadonlyJan-Christoph Borchardt2015-04-214-5/+16
|\ \ \
| * | | Added empty content message for empty read-only foldersVincent Petry2015-04-214-5/+16
* | | | Merge pull request #15770 from owncloud/fix-15764Morris Jobke2015-04-211-1/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | bring back border in host input field for consistencyArthur Schiwon2015-04-211-1/+0
| |/ /
* | | Merge pull request #15713 from owncloud/fix-15707-masterMorris Jobke2015-04-213-35/+41
|\ \ \ | |/ / |/| |
| * | doc and indentThomas Müller2015-04-212-4/+8
| * | Don't pollute the global namespaceThomas Müller2015-04-212-29/+38
| * | make jshint happyThomas Müller2015-04-202-14/+17
| * | use a simple function - OC.Encryption is already defined - fixes #15707Thomas Müller2015-04-201-23/+13
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-216-8/+24
|/ /
* | Merge pull request #15677 from owncloud/enc_reset_private_key_passwordThomas Müller2015-04-205-10/+379
|\ \
| * | Dont use the old .status wayJoas Schilling2015-04-203-24/+12
| * | Fix several minor thingsJoas Schilling2015-04-202-24/+21
| * | let user update the private key password in case the login password was chang...Bjoern Schiessle2015-04-174-0/+384
* | | Avoid function name collision in dropbox external storageThomas Müller2015-04-201-7/+7
* | | Merge pull request #15637 from owncloud/migrate-certificate-stuffLukas Reschke2015-04-201-6/+0
|\ \ \
| * | | Migrate personal certificate handling into AppFramework controllersLukas Reschke2015-04-201-6/+0
* | | | move away from deprecated constsArthur Schiwon2015-04-201-1/+1
|/ / /
* | | Merge pull request #15717 from owncloud/issue/15716-fixing-ocp-api-namespace-...Morris Jobke2015-04-2012-41/+44
|\ \ \
| * | | Fix usage of deprecated private constantsJoas Schilling2015-04-1812-41/+44
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-2012-2/+48
* | | Merge pull request #15724 from owncloud/ldap-remove-deprecated-const-usageThomas Müller2015-04-191-5/+5
|\ \ \
| * | | LDAP - move from constants to class member constantsMorris Jobke2015-04-181-5/+5
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-1930-28/+188
* | | Merge pull request #15718 from owncloud/issue/15694-display-name-of-encryptio...Thomas Müller2015-04-181-1/+1
|\ \ \
| * | | Fix dummy encryption module registrationJoas Schilling2015-04-181-1/+1
| |/ /
* | | Merge pull request #15727 from owncloud/cleanup-db-interfaceThomas Müller2015-04-181-1/+1
|\ \ \
| * | | fix followup issues with unneeded parametersMorris Jobke2015-04-181-1/+1
| |/ /
* / / LDAP tests: swithc var_dump to exceptionMorris Jobke2015-04-181-3/+3
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-18122-0/+490
* | always open filter tab in raw mode, when 'Manually enter LDAP filters' is che...Arthur Schiwon2015-04-173-2/+8
* | 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
* | Do not concat translation stringThomas Müller2015-04-171-5/+4
* | fixing undefined variableThomas Müller2015-04-171-8/+8
* | 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
* | | always create a new instance of the encryption moduleBjoern Schiessle2015-04-172-8/+13
|/ /
* / [tx-robot] updated from transifexJenkins for ownCloud2015-04-1732-28/+274
|/
* 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-1612-15/+813
|\ \ | |/ |/|