Commit graph

494 commits

Author SHA1 Message Date
Nextcloud bot
c40b7acb09
[tx-robot] updated from transifex 2017-04-18 20:47:45 +00:00
Nextcloud bot
df2235c71f
[tx-robot] updated from transifex 2017-04-17 00:07:33 +00:00
Nextcloud bot
dafa9c740a
[tx-robot] updated from transifex 2017-04-15 00:07:36 +00:00
Nextcloud bot
0f96d5a641
[tx-robot] updated from transifex 2017-04-14 00:07:36 +00:00
Björn Schießle
49d8716eaa Merge pull request #4312 from nextcloud/cleanup-name
Update comments to Nextcloud
2017-04-12 10:54:20 +02:00
Morris Jobke
1729e4471f
Update comments to Nextcloud
* based on PR by @Ardinis
* see #4311

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 23:16:27 -05:00
Nextcloud bot
633b952358
[tx-robot] updated from transifex 2017-04-12 00:07:44 +00:00
Nextcloud bot
4d90b0520e
[tx-robot] updated from transifex 2017-04-11 00:07:29 +00:00
Nextcloud bot
4b0f50c456
[tx-robot] updated from transifex 2017-04-08 00:07:45 +00:00
Nextcloud bot
7d9688c89e
[tx-robot] updated from transifex 2017-04-06 00:07:50 +00:00
Nextcloud bot
84035862f7
[tx-robot] updated from transifex 2017-04-05 00:08:20 +00:00
Roeland Jago Douma
da178db98e Merge pull request #4030 from nextcloud/masterkey-publiclink-nc12
Make public links work with master key
2017-04-04 11:46:13 +02:00
Nextcloud bot
ec5377306d
[tx-robot] updated from transifex 2017-04-04 00:07:46 +00:00
Nextcloud bot
d56f6399eb
[tx-robot] updated from transifex 2017-04-03 00:08:20 +00:00
Nextcloud bot
0056211672
[tx-robot] updated from transifex 2017-04-02 00:07:48 +00:00
Nextcloud bot
9098042c95
[tx-robot] updated from transifex 2017-04-01 00:08:09 +00:00
Nextcloud bot
6a6300b1f2
[tx-robot] updated from transifex 2017-03-31 00:08:35 +00:00
Jan-Christoph Borchardt
9a75714c22
rename confusing getMailHeaderColor to getColorPrimary, ref #3491
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-29 18:23:23 +02:00
Nextcloud bot
6309b9ec1d
[tx-robot] updated from transifex 2017-03-28 00:07:53 +00:00
Nextcloud bot
0981f9a18a
[tx-robot] updated from transifex 2017-03-26 01:07:03 +00:00
Nextcloud bot
4ea79a5bbe
[tx-robot] updated from transifex 2017-03-25 01:07:45 +00:00
Vincent Petry
6b9ef15803
Use master key for public links as well 2017-03-24 14:55:42 +01:00
Vincent Petry
305718370a
Add tests for null user 2017-03-24 14:55:33 +01:00
Vincent Petry
43c081bdc9
Fix public link for master key
In public link mode there is no session, so the code should use the
public key instead.
2017-03-24 14:55:12 +01:00
Nextcloud bot
e18d928d9b
[tx-robot] updated from transifex 2017-03-24 01:08:00 +00:00
Matthew Setter
d7c9e2b841
Updated UI messages relating to the encryption functionality
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>
2017-03-22 18:06:55 -06:00
Nextcloud bot
cae8702ab2
[tx-robot] updated from transifex 2017-03-22 01:07:53 +00:00
Nextcloud bot
5683365a2c
[tx-robot] updated from transifex 2017-03-17 01:07:41 +00:00
Björn Schießle
5a998da206 Merge pull request #3841 from nextcloud/encyryption-trash-bin
Delete files on encryption error
2017-03-15 09:07:07 +01:00
Nextcloud bot
4da6b7e796
[tx-robot] updated from transifex 2017-03-15 01:07:49 +00:00
Bjoern Schiessle
9ce32d9941
always throw a encryption exception
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-14 12:11:28 +01:00
Nextcloud bot
8d91c84ec4
[tx-robot] updated from transifex 2017-03-14 01:07:46 +00:00
Nextcloud bot
53195b156c
[tx-robot] updated from transifex 2017-03-02 16:48:52 +00:00
Nextcloud bot
f3a7b7eaa3
[tx-robot] updated from transifex 2017-02-27 01:19:49 +00:00
Nextcloud bot
7113af3f91
[tx-robot] updated from transifex 2017-02-14 01:07:20 +00:00
Nextcloud bot
01b3da612b
[tx-robot] updated from transifex 2017-02-11 01:07:23 +00:00
Nextcloud bot
1aba2d9ed8
[tx-robot] updated from transifex 2017-02-08 01:07:09 +00:00
Nextcloud bot
e4a74568e6
[tx-robot] updated from transifex 2017-02-05 01:07:05 +00:00
Nextcloud bot
b946ec9d6c
[tx-robot] updated from transifex 2017-02-02 01:07:05 +00:00
Morris Jobke
5bad417e57 Merge pull request #2044 from nextcloud/login-credential-store
Login credential store
2017-01-30 19:30:04 -06:00
Nextcloud bot
bbcb1dd2e0
[tx-robot] updated from transifex 2017-01-30 01:07:14 +00:00
Morris Jobke
6fe3cfa1e3 Merge pull request #3244 from nextcloud/settings-icon
Settings icon for LDAP and encryption
2017-01-25 18:43:21 -06:00
Nextcloud bot
c3e57d228f
[tx-robot] updated from transifex 2017-01-25 01:10:00 +00:00
Morris Jobke
f9c3639607
add icon for encryption settings on personal page
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-24 12:59:36 -06:00
Nextcloud bot
012e521239
[tx-robot] updated from transifex 2017-01-22 01:07:52 +00:00
Christoph Wurst
3ee5c7ea4e
minor version bump
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-17 09:17:56 +01:00
Nextcloud bot
203436b16b
[tx-robot] updated from transifex 2017-01-16 01:15:50 +00:00
Morris Jobke
622101f2dd Merge pull request #2918 from nextcloud/encryption-recovery-improvements
create new encryption keys on password reset and backup the old one
2017-01-13 11:28:43 +01:00
Christoph Wurst
140555b786
always allow remembered login
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Nextcloud bot
c35ea15916
[tx-robot] updated from transifex 2017-01-11 15:20:22 +00:00