Commit Graph

600 Commits

Author SHA1 Message Date
Nextcloud bot 233fd16049
[tx-robot] updated from transifex 2018-01-04 09:48:45 +00:00
Nextcloud bot faabc3594d
[tx-robot] updated from transifex 2017-11-12 01:10:15 +00:00
Nextcloud bot 097e8a4994
[tx-robot] updated from transifex 2017-11-11 01:10:24 +00:00
Nextcloud bot 5e14b64c55
[tx-robot] updated from transifex 2017-11-10 01:10:05 +00:00
Nextcloud bot 98b012d545
[tx-robot] updated from transifex 2017-11-08 01:09:33 +00:00
Nextcloud bot 0756fc0893
[tx-robot] updated from transifex 2017-11-07 01:09:08 +00:00
Nextcloud bot e873b1a3d1
[tx-robot] updated from transifex 2017-11-06 01:09:19 +00:00
Nextcloud bot 43341833fd
[tx-robot] updated from transifex 2017-11-03 01:09:18 +00:00
Nextcloud bot 52b31a09ef
[tx-robot] updated from transifex 2017-11-01 01:08:55 +00:00
Nextcloud bot 09a0048f77
[tx-robot] updated from transifex 2017-10-28 00:08:41 +00:00
Nextcloud bot 895336a3f3
[tx-robot] updated from transifex 2017-10-24 00:08:57 +00:00
Nextcloud bot 037376b4ce
[tx-robot] updated from transifex 2017-10-06 00:08:40 +00:00
Nextcloud bot cae4a1956b
[tx-robot] updated from transifex 2017-09-29 00:08:31 +00:00
Nextcloud bot cb212712f6
[tx-robot] updated from transifex 2017-09-21 00:08:36 +00:00
Nextcloud bot db56ea3e70
[tx-robot] updated from transifex 2017-09-19 00:08:39 +00:00
Nextcloud bot c13a06b7a5
[tx-robot] updated from transifex 2017-08-30 00:08:36 +00:00
Nextcloud bot 7e0c00b576
[tx-robot] updated from transifex 2017-08-18 00:08:25 +00:00
Nextcloud bot 948d6742ce
[tx-robot] updated from transifex 2017-08-17 00:08:23 +00:00
Nextcloud bot ee73ddd8a9
[tx-robot] updated from transifex 2017-08-12 00:08:28 +00:00
Nextcloud bot 72029627fc
[tx-robot] updated from transifex 2017-08-09 00:08:30 +00:00
Nextcloud bot 75d5989a8b
[tx-robot] updated from transifex 2017-08-08 00:08:19 +00:00
Nextcloud bot 9f346fecf1
[tx-robot] updated from transifex 2017-08-01 00:08:35 +00:00
Nextcloud bot a6499afb5b
[tx-robot] updated from transifex 2017-07-30 00:08:13 +00:00
Nextcloud bot 79522f4078
[tx-robot] updated from transifex 2017-07-25 00:08:13 +00:00
Nextcloud bot 65dba8a558
[tx-robot] updated from transifex 2017-07-24 00:08:13 +00:00
Nextcloud bot 12590bf3d8
[tx-robot] updated from transifex 2017-07-23 00:08:07 +00:00
Bjoern Schiessle fff804c39e
make sure that we always have a owner
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-20 11:43:39 +02:00
Bjoern Schiessle f7a2b96507
Add recovery key on public upload
In order to decide if a recovery key needs to be added we always
need to check the files owner settings and not the settings of
the currently logged in user.

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-20 11:43:39 +02:00
Nextcloud bot 3fefa01709
[tx-robot] updated from transifex 2017-07-17 00:08:12 +00:00
Nextcloud bot 0463ef7e3b
[tx-robot] updated from transifex 2017-07-15 00:09:06 +00:00
Nextcloud bot a9b38c025f
[tx-robot] updated from transifex 2017-07-13 00:08:42 +00:00
Nextcloud bot 05b03c173e
[tx-robot] updated from transifex 2017-07-12 00:08:54 +00:00
Arthur Schiwon 0a71c1ccd3
fix alignment of radio button and its label in encryption settings
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-07-10 11:02:16 +02:00
Nextcloud bot 28a37f04dc
[tx-robot] updated from transifex 2017-07-10 00:08:51 +00:00
Nextcloud bot 0324993342
[tx-robot] updated from transifex 2017-07-09 00:08:41 +00:00
Nextcloud bot f80159f52a
[tx-robot] updated from transifex 2017-07-08 00:08:37 +00:00
Nextcloud bot 3db7bd196d
[tx-robot] updated from transifex 2017-07-05 00:08:36 +00:00
Nextcloud bot 0e608188d2
[tx-robot] updated from transifex 2017-06-17 00:08:36 +00:00
Nextcloud bot 6434305333
[tx-robot] updated from transifex 2017-06-09 00:08:34 +00:00
Nextcloud bot d00c5886aa
[tx-robot] updated from transifex 2017-06-08 00:08:37 +00:00
Nextcloud bot 85418640b3
[tx-robot] updated from transifex 2017-06-07 00:09:14 +00:00
Nextcloud bot cf3988e248
[tx-robot] updated from transifex 2017-06-04 00:08:39 +00:00
Nextcloud bot 577ea59968
[tx-robot] updated from transifex 2017-06-02 00:08:40 +00:00
Nextcloud bot 2d8ec64ee5
[tx-robot] updated from transifex 2017-05-29 00:08:44 +00:00
Nextcloud bot df3efa4984
[tx-robot] updated from transifex 2017-05-28 00:08:24 +00:00
Nextcloud bot 13d1c95db1
[tx-robot] updated from transifex 2017-05-25 00:08:13 +00:00
Nextcloud bot 9055109243
[tx-robot] updated from transifex 2017-05-24 00:08:31 +00:00
Nextcloud bot 241226c23c
[tx-robot] updated from transifex 2017-05-11 00:08:08 +00:00
Nextcloud bot 43275b1000
[tx-robot] updated from transifex 2017-05-09 04:32:51 +00:00
Nextcloud bot 6109afc14d
[tx-robot] updated from transifex 2017-05-08 00:07:37 +00:00
Nextcloud bot 2152d5f1f6
[tx-robot] updated from transifex 2017-05-01 00:07:32 +00:00
Nextcloud bot c4673224d1
[tx-robot] updated from transifex 2017-04-29 00:07:17 +00:00
Morris Jobke d6e7cee607
Fix icons in sidebar on personal page
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-27 17:58:41 -03:00
Vincent Petry b92085f2c7
Fix recovery checkbox label to properly point 2017-04-26 13:29:42 +02:00
Nextcloud bot e5fe41e16b
[tx-robot] updated from transifex 2017-04-26 00:07:43 +00:00
Nextcloud bot adf316c3af
[tx-robot] updated from transifex 2017-04-20 00:07:36 +00:00
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