Commit Graph

562 Commits

Author SHA1 Message Date
Morris Jobke 43e498844e
Use ::class in test mocks
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 17:45:32 +02:00
Morris Jobke b1f77aca4e Merge pull request #6919 from nextcloud/di-appmanager-encryption-migration
Use DI for IAppManager to encryption migration
2017-10-24 16:33:03 +02:00
Björn Schießle 306d4e1d40 Merge pull request #6922 from nextcloud/unneeded-isEnabled-check
Remove unneeded check if app is enabled
2017-10-24 15:59:13 +02:00
Morris Jobke 99934134dc
Use DI for IAppManager to encryption migration
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 15:52:00 +02:00
Nextcloud bot 1860190305
[tx-robot] updated from transifex 2017-10-24 00:08:45 +00:00
Morris Jobke 5987099d2a
Remove unneeded check if app is enabled
App code will not be executable if the app is not enabled, because the autoloader refuses to load that class.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-23 23:47:06 +02:00
Nextcloud bot 4c54ca571d
[tx-robot] updated from transifex 2017-10-06 00:08:30 +00:00
Nextcloud bot 95ec247d10
[tx-robot] updated from transifex 2017-09-29 00:08:21 +00:00
Nextcloud bot 4d556a3ade
[tx-robot] updated from transifex 2017-09-21 00:08:26 +00:00
Nextcloud bot d603d78630
[tx-robot] updated from transifex 2017-09-19 00:08:27 +00:00
Kenneth Newwood 7092c50e7c print generated encryption key passwords directly after generating the keys so that errors during the encryption do not lead to a potentially massive data loss
Signed-off-by: Kenneth Newwood <kenneth@newwood.name>
2017-09-11 12:52:25 +02:00
Nextcloud bot 1e24fe858a
[tx-robot] updated from transifex 2017-08-30 00:08:26 +00:00
Nextcloud bot 231cffffb9
[tx-robot] updated from transifex 2017-08-18 00:08:15 +00:00
Nextcloud bot 0ceb06fde5
[tx-robot] updated from transifex 2017-08-17 00:08:14 +00:00
Nextcloud bot a2e3c8ede5
[tx-robot] updated from transifex 2017-08-12 00:08:18 +00:00
Nextcloud bot 8549fcf6e4
[tx-robot] updated from transifex 2017-08-09 00:08:20 +00:00
Nextcloud bot 481002a00b
[tx-robot] updated from transifex 2017-08-08 00:08:10 +00:00
Joas Schilling 0ebdf871e0 Fix comparisons in encryption app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:54:07 +02:00
Nextcloud bot 456392e627
[tx-robot] updated from transifex 2017-08-01 00:08:26 +00:00
Nextcloud bot 98b664a000
[tx-robot] updated from transifex 2017-07-30 00:08:03 +00:00
Nextcloud bot 11e182fff2
[tx-robot] updated from transifex 2017-07-25 00:08:02 +00:00
Nextcloud bot d95b46ffb7
[tx-robot] updated from transifex 2017-07-24 00:08:01 +00:00
Nextcloud bot 46332b0d8e
[tx-robot] updated from transifex 2017-07-23 00:07:58 +00:00
Bjoern Schiessle 473824fa06
make sure that we always have a owner
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-20 11:40:17 +02:00
Bjoern Schiessle 20a6b22db6
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:40:14 +02:00
Nextcloud bot 125767265d
[tx-robot] updated from transifex 2017-07-17 00:08:02 +00:00
Nextcloud bot a23cdd04bb
[tx-robot] updated from transifex 2017-07-15 00:08:54 +00:00
Nextcloud bot 261513b04a
[tx-robot] updated from transifex 2017-07-13 00:08:31 +00:00
Nextcloud bot 13295c2d1d
[tx-robot] updated from transifex 2017-07-12 00:08:43 +00:00
Morris Jobke c7b28064e3 Merge pull request #5649 from nextcloud/fix-5611
fix alignment of radio button and its label in encryption settings
2017-07-10 09:26:05 +02:00
Nextcloud bot 4f7fafb5c5
[tx-robot] updated from transifex 2017-07-10 00:08:41 +00:00
Nextcloud bot cf8db31bce
[tx-robot] updated from transifex 2017-07-09 00:08:31 +00:00
Nextcloud bot f59062ce83
[tx-robot] updated from transifex 2017-07-08 00:08:27 +00:00
Arthur Schiwon c46006934c
fix alignment of radio button and its label in encryption settings
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-07-07 16:59:28 +02:00
Bjoern Schiessle 001a9c02dd
adjust encryption tests to the new master key default
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:12 +02:00
Bjoern Schiessle d668e17769
since the default for the master key changed we need to write the setting explicitely to the database if we migrate from a older version
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:11 +02:00
Bjoern Schiessle 66debbe18e
add occ command to disable the master key again
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:11 +02:00
Bjoern Schiessle 5f75468aa4
improve status messages
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:11 +02:00
Bjoern Schiessle 28a7e72868
after the master key was loaded we are ready to go, no re-login needed
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:10 +02:00
Bjoern Schiessle da51ec38f4
only collect detailed access list if it is really needed
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:33:08 +02:00
Bjoern Schiessle 9c5ba2f12c
make master key the new default
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:33:03 +02:00
Nextcloud bot 1cbb7a18d8
[tx-robot] updated from transifex 2017-07-05 00:08:26 +00:00
Arthur Schiwon 793de6a8d0
move encryption to security (and behind two factor things)
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-27 12:21:18 +02:00
Arthur Schiwon da53162656
We're on 13 now…
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-26 11:03:41 +02:00
Arthur Schiwon 39ca06e6b9
fix setting up encryption section
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 13:38:33 +02:00
Arthur Schiwon b7ce492c59
adapt encryption
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:38:05 +02:00
Nextcloud bot 26d6c4a64a
[tx-robot] updated from transifex 2017-06-17 00:08:26 +00:00
Nextcloud bot 628284a34c
[tx-robot] updated from transifex 2017-06-09 00:08:24 +00:00
Nextcloud bot a74901fce1
[tx-robot] updated from transifex 2017-06-08 00:08:26 +00:00
Nextcloud bot a3c5d43cd5
[tx-robot] updated from transifex 2017-06-07 00:09:00 +00:00