summaryrefslogtreecommitdiffstats
path: root/apps/encryption
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-04-182-10/+10
* [tx-robot] updated from transifexNextcloud bot2017-04-172-0/+12
* [tx-robot] updated from transifexNextcloud bot2017-04-154-58/+58
* [tx-robot] updated from transifexNextcloud bot2017-04-142-8/+8
* Merge pull request #4312 from nextcloud/cleanup-nameBjörn Schießle2017-04-125-7/+7
|\
| * Update comments to NextcloudMorris Jobke2017-04-115-7/+7
* | [tx-robot] updated from transifexNextcloud bot2017-04-122-0/+6
|/
* [tx-robot] updated from transifexNextcloud bot2017-04-112-0/+2
* [tx-robot] updated from transifexNextcloud bot2017-04-082-18/+18
* [tx-robot] updated from transifexNextcloud bot2017-04-062-4/+4
* [tx-robot] updated from transifexNextcloud bot2017-04-052-0/+6
* Merge pull request #4030 from nextcloud/masterkey-publiclink-nc12Roeland Jago Douma2017-04-042-18/+34
|\
| * Use master key for public links as wellVincent Petry2017-03-242-23/+35
| * Add tests for null userVincent Petry2017-03-241-1/+5
| * Fix public link for master keyVincent Petry2017-03-241-1/+1
* | [tx-robot] updated from transifexNextcloud bot2017-04-042-2/+10
* | [tx-robot] updated from transifexNextcloud bot2017-04-034-0/+14
* | [tx-robot] updated from transifexNextcloud bot2017-04-022-0/+2
* | [tx-robot] updated from transifexNextcloud bot2017-04-012-40/+96
* | [tx-robot] updated from transifexNextcloud bot2017-03-312-30/+32
* | rename confusing getMailHeaderColor to getColorPrimary, ref #3491Jan-Christoph Borchardt2017-03-291-1/+1
* | [tx-robot] updated from transifexNextcloud bot2017-03-282-0/+2
* | [tx-robot] updated from transifexNextcloud bot2017-03-266-0/+6
* | [tx-robot] updated from transifexNextcloud bot2017-03-2516-0/+16
|/
* [tx-robot] updated from transifexNextcloud bot2017-03-2464-170/+170
* Updated UI messages relating to the encryption functionalityMatthew Setter2017-03-222-2/+2
* [tx-robot] updated from transifexNextcloud bot2017-03-222-0/+8
* [tx-robot] updated from transifexNextcloud bot2017-03-172-30/+30
* Merge pull request #3841 from nextcloud/encyryption-trash-binBjörn Schießle2017-03-152-6/+5
|\
| * always throw a encryption exceptionBjoern Schiessle2017-03-142-6/+5
* | [tx-robot] updated from transifexNextcloud bot2017-03-152-0/+4
|/
* [tx-robot] updated from transifexNextcloud bot2017-03-142-4/+6
* [tx-robot] updated from transifexNextcloud bot2017-03-0212-0/+718
* [tx-robot] updated from transifexNextcloud bot2017-02-272-4/+4
* [tx-robot] updated from transifexNextcloud bot2017-02-142-2/+2
* [tx-robot] updated from transifexNextcloud bot2017-02-112-6/+8
* [tx-robot] updated from transifexNextcloud bot2017-02-082-2/+2
* [tx-robot] updated from transifexNextcloud bot2017-02-052-0/+10
* [tx-robot] updated from transifexNextcloud bot2017-02-022-0/+4
* Merge pull request #2044 from nextcloud/login-credential-storeMorris Jobke2017-01-301-2/+1
|\
| * minor version bumpChristoph Wurst2017-01-171-1/+1
| * always allow remembered loginChristoph Wurst2017-01-111-1/+0
* | [tx-robot] updated from transifexNextcloud bot2017-01-304-6/+54
* | Merge pull request #3244 from nextcloud/settings-iconMorris Jobke2017-01-251-0/+5
|\ \
| * | add icon for encryption settings on personal pageMorris Jobke2017-01-241-0/+5
* | | [tx-robot] updated from transifexNextcloud bot2017-01-254-4/+6
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-01-222-2/+2
* | [tx-robot] updated from transifexNextcloud bot2017-01-162-2/+2
* | Merge pull request #2918 from nextcloud/encryption-recovery-improvementsMorris Jobke2017-01-134-37/+85
|\ \ | |/ |/|
| * create new encryption keys on password reset and backup the old oneBjoern Schiessle2017-01-104-37/+85