summaryrefslogtreecommitdiffstats
path: root/apps/encryption
Commit message (Expand)AuthorAgeFilesLines
* Add app:check-code for already compatible appsMorris Jobke2016-06-271-2/+0
* Merge remote-tracking branch 'upstream/master' into master-upstream-syncLukas Reschke2016-06-262-2/+10
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-222-2/+10
* | Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-212-0/+2
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-172-0/+2
* | fix l10nMorris Jobke2016-06-2044-44/+44
* | fix l10nMorris Jobke2016-06-2064-64/+64
* | fix l10nMorris Jobke2016-06-2044-44/+44
* | fix stringsMorris Jobke2016-06-204-4/+4
|/
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-102-0/+4
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-032-66/+66
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-022-4/+4
* Update license headersLukas Reschke2016-05-2639-49/+58
* don't fail on "bad signature" during login. Most likely this happens becauseBjörn Schießle2016-05-251-0/+7
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-212-18/+68
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-132-2/+8
* Move Encryption app to PSR-4 (#24524)Joas Schilling2016-05-1239-98/+115
* if we don't have a encrypted file key we can return a empty string right awayBjoern Schiessle2016-04-262-5/+38
* don't create a private-/public-key pair for each user if the master key is en...Bjoern Schiessle2016-04-263-24/+78
* [tx-robot] updated from transifexJenkins for ownCloud2016-04-252-2/+2
* [tx-robot] updated from transifexJenkins for ownCloud2016-04-242-2/+6
* Merge pull request #22791 from owncloud/enc_master_key_improvementsVincent Petry2016-04-216-74/+117
|\
| * replaceUserKeys() actually deletes the users keys -> update method name and d...Bjoern Schiessle2016-03-183-3/+5
| * only create and update user specific key if no master key is enabledBjoern Schiessle2016-03-186-71/+112
* | we need to initialize the mount points of the given user before we recoverBjörn Schießle2016-04-192-10/+48
* | Introduce isReadyForUser and verify in file transfer ownership - fixes #23786Thomas Müller2016-04-152-0/+14
* | [tx-robot] updated from transifexJenkins for ownCloud2016-04-132-0/+12
* | Fix encryption testsRoeland Jago Douma2016-04-082-7/+0
* | [tx-robot] updated from transifexJenkins for ownCloud2016-04-072-0/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2016-04-012-0/+8
* | [tx-robot] updated from transifexJenkins for ownCloud2016-03-294-0/+14
* | [tx-robot] updated from transifexJenkins for ownCloud2016-03-264-0/+6
* | Merge pull request #22792 from owncloud/no-recovery-key-if-the-master-key-is-...Thomas Müller2016-03-212-49/+52
|\ \ | |/ |/|
| * disable the recovery key if the master key is enabledBjoern Schiessle2016-03-032-49/+52
* | Merge pull request #23192 from owncloud/make-ancient-users-happy-with-totally...Thomas Müller2016-03-161-0/+7
|\ \
| * | Fallback for crappy ancient distributionsLukas Reschke2016-03-121-0/+7
* | | allow group shares, even if not all public keys are availableBjoern Schiessle2016-03-152-2/+42
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2016-03-122-2/+20
* | [tx-robot] updated from transifexJenkins for ownCloud2016-03-072-0/+4
* | [tx-robot] updated from transifexJenkins for ownCloud2016-03-042-0/+2
|/
* Increase all versions on master which is now 9.1Joas Schilling2016-03-021-2/+2
* Remove Scrutinizer Auto FixerLukas Reschke2016-03-017-7/+0
* Update author informationLukas Reschke2016-03-013-0/+3
* Merge pull request #22727 from owncloud/decrypt_all_master_keyThomas Müller2016-03-013-27/+46
|\
| * make decrypt all work with the master keyBjoern Schiessle2016-02-293-27/+46
* | [tx-robot] updated from transifexJenkins for ownCloud2016-03-012-0/+4
|/
* [tx-robot] updated from transifexJenkins for ownCloud2016-02-284-0/+8
* [tx-robot] updated from transifexJenkins for ownCloud2016-02-2518-26/+108
* [tx-robot] updated from transifexJenkins for ownCloud2016-02-154-0/+8
* [tx-robot] updated from transifexJenkins for ownCloud2016-02-142-0/+4