summaryrefslogtreecommitdiffstats
path: root/apps/encryption
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-04-262-0/+2
|
* [tx-robot] updated from transifexNextcloud bot2017-04-202-2/+2
|
* [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 Nextcloud
| * Update comments to NextcloudMorris Jobke2017-04-115-7/+7
| | | | | | | | | | | | | | * based on PR by @Ardinis * see #4311 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [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
|\ | | | | Make public links work with master key
| * 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
| | | | | | | | | | In public link mode there is no session, so the code should use the public key instead.
* | [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
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | [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
| | | | | | | | | | | | The reason for updating these messages, is that grammatically they're not quite correct. They showed a combination of: - Related phrases, which could be either separated or joined better - Related sentences, but which should be expressed as separate ones They were also missing full-stops to end the them. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* [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
|\ | | | | Delete files on encryption error
| * always throw a encryption exceptionBjoern Schiessle2017-03-142-6/+5
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | [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
|\ | | | | Login credential store
| * minor version bumpChristoph Wurst2017-01-171-1/+1
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * always allow remembered loginChristoph Wurst2017-01-111-1/+0
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | [tx-robot] updated from transifexNextcloud bot2017-01-304-6/+54
| |
* | Merge pull request #3244 from nextcloud/settings-iconMorris Jobke2017-01-251-0/+5
|\ \ | | | | | | Settings icon for LDAP and encryption
| * | add icon for encryption settings on personal pageMorris Jobke2017-01-241-0/+5
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [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
| |