Commit Graph

765 Commits

Author SHA1 Message Date
Nextcloud bot ea17e962bf
[tx-robot] updated from transifex 2018-11-24 01:11:17 +00:00
Joas Schilling 1751c28c28
Bump versions of server and the requirements of apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-23 10:28:40 +01:00
John Molakvoæ 654880da25
Merge pull request #12468 from nextcloud/multiselect-removal-fix
Remove conflicting multiselect
2018-11-22 08:49:09 +01:00
John Molakvoæ (skjnldsv) a8dafc2ff8
Remove conflicting multiselect
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-15 14:08:13 +01:00
Joas Schilling aa88254f64
Shorten index name of calendar changes table
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-14 10:14:23 +01:00
Nextcloud bot 9d7f02ec47
[tx-robot] updated from transifex 2018-11-04 01:14:02 +00:00
Bjoern Schiessle 87657fffd8
skip already encrypted files on encrypt all command
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-10-24 16:53:39 +02:00
Nextcloud bot a9fb21f9fc
[tx-robot] updated from transifex 2018-10-23 14:54:28 +00:00
Roeland Jago Douma dd8350b3b3
Merge pull request #10778 from suntorytimed/patch-1
check for empty string
2018-10-11 19:05:38 +02:00
Nextcloud bot 4c47ec005f
[tx-robot] updated from transifex 2018-10-07 00:12:21 +00:00
Nextcloud bot d9fe68ed12
[tx-robot] updated from transifex 2018-10-05 00:12:56 +00:00
Nextcloud bot b6e86121bc
[tx-robot] updated from transifex 2018-10-01 00:12:39 +00:00
Nextcloud bot 73aabbd3c0
[tx-robot] updated from transifex 2018-09-29 00:12:16 +00:00
Nextcloud bot 2ace0df82a
[tx-robot] updated from transifex 2018-09-27 00:12:26 +00:00
Nextcloud bot 2f45045c96
[tx-robot] updated from transifex 2018-09-26 00:12:23 +00:00
Nextcloud bot bdb01064e2
[tx-robot] updated from transifex 2018-09-25 00:12:07 +00:00
Nextcloud bot 0211e17e3f
[tx-robot] updated from transifex 2018-09-21 00:12:08 +00:00
Nextcloud bot 2a51572cc4
[tx-robot] updated from transifex 2018-09-17 00:12:30 +00:00
Nextcloud bot 6112adfe06
[tx-robot] updated from transifex 2018-09-14 00:12:27 +00:00
Nextcloud bot 10351cb9da
[tx-robot] updated from transifex 2018-09-13 00:12:08 +00:00
Nextcloud bot e9c644412c
[tx-robot] updated from transifex 2018-09-10 00:13:36 +00:00
Nextcloud bot 3a08f71981
[tx-robot] updated from transifex 2018-09-06 00:12:53 +00:00
Joas Schilling 47cc5e5895
Update version requirements and versions of shipped apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-09-05 14:27:06 +02:00
Nextcloud bot 021dad53be
[tx-robot] updated from transifex 2018-09-01 00:12:17 +00:00
Nextcloud bot 2a22615879
[tx-robot] updated from transifex 2018-08-31 00:12:09 +00:00
Nextcloud bot 4da9a15b32
[tx-robot] updated from transifex 2018-08-30 00:12:07 +00:00
Nextcloud bot 8b47f45afa
[tx-robot] updated from transifex 2018-08-27 00:12:14 +00:00
Nextcloud bot 503fbc953e
[tx-robot] updated from transifex 2018-08-24 00:12:20 +00:00
Nextcloud bot c0f48a7b40
[tx-robot] updated from transifex 2018-08-23 00:12:59 +00:00
Stefan Weiberg 375f167c67 Adding a check to see if keyFileContents is empty:
* this fixes a download error and an exception if the data content
  for encryption is empty
* #3958: for recovering encrypted files with a damaged signature
  this is necessary in addition to turning the signature check off

Signed-off-by: Stefan Weiberg <sweiberg@suse.com>
2018-08-21 15:21:26 +02:00
Bjoern Schiessle 3adc2aca53
add occ command to recover encrypted files in case of password lost
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-08-16 15:51:01 +02:00
Roeland Jago Douma 90a656305b
Bump autoloaders
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-10 15:03:22 +02:00
Björn Schießle 11e99859ef
Merge pull request #10397 from nextcloud/encryption-s3-fix
make file cache updates more robust
2018-08-08 18:27:18 +02:00
Roeland Jago Douma 01298cfa72
Merge pull request #10480 from nextcloud/bugfix/10420/settings
Settings design polishing
2018-08-02 20:23:21 +02:00
Julius Härtl 0dd519cff1
Fix encryption admin section tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-08-02 10:26:09 +02:00
Nextcloud bot 62af5bf033
[tx-robot] updated from transifex 2018-08-02 00:12:37 +00:00
Julius Härtl 03971d3695
Move encryption settings to security
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-08-01 09:41:09 +02:00
Bjoern Schiessle a9e22c5f1c
make file cache updates more robust
only update the encrypted version after the write operation is finished and the stream is closed

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-31 12:24:38 +02:00
Nextcloud bot 566800b29c
[tx-robot] updated from transifex 2018-07-30 00:12:08 +00:00
John Molakvoæ (skjnldsv) 8977c71f88
Mixin scss icon api
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-19 08:16:58 +02:00
John Molakvoæ (skjnldsv) 29ff7efe9a
Svg icon api sass function and upgrade of all styles
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-19 08:16:57 +02:00
Nextcloud bot b7e32df660
[tx-robot] updated from transifex 2018-07-19 00:12:05 +00:00
Nextcloud bot a22bc0e787
[tx-robot] updated from transifex 2018-07-10 08:21:14 +00:00
Nextcloud bot 1bf486d93f
[tx-robot] updated from transifex 2018-06-28 00:12:20 +00:00
Nextcloud bot f9c98d8621
[tx-robot] updated from transifex 2018-06-21 00:12:47 +00:00
Nextcloud bot cad8824a8e
[tx-robot] updated from transifex 2018-06-20 00:12:26 +00:00
Nextcloud bot 84a1c915e6
[tx-robot] updated from transifex 2018-06-15 00:12:49 +00:00
Nextcloud bot d91bed9490
[tx-robot] updated from transifex 2018-06-12 00:12:46 +00:00
Nextcloud bot bba1663350
[tx-robot] updated from transifex 2018-06-06 00:12:36 +00:00
Nextcloud bot d3fceb9b83
[tx-robot] updated from transifex 2018-06-01 00:12:28 +00:00
Nextcloud bot 9ac36dc30b
[tx-robot] updated from transifex 2018-05-31 00:12:36 +00:00
Nextcloud bot 7df563ee39
[tx-robot] updated from transifex 2018-05-30 00:12:08 +00:00
Nextcloud bot f0fdac8078
[tx-robot] updated from transifex 2018-05-26 00:13:01 +00:00
Nextcloud bot 60734cd79d
[tx-robot] updated from transifex 2018-05-25 00:14:54 +00:00
Nextcloud bot 514b374923
[tx-robot] updated from transifex 2018-05-18 00:13:45 +00:00
Nextcloud bot ef665fde42
[tx-robot] updated from transifex 2018-05-17 00:13:46 +00:00
Nextcloud bot 5fcb3dd1dc
[tx-robot] updated from transifex 2018-05-12 00:13:00 +00:00
Nextcloud bot 9fe95e8a7c
[tx-robot] updated from transifex 2018-05-08 00:11:34 +00:00
Arthur Schiwon 38a90130ce
move log constants to ILogger
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-04-26 10:45:52 +02:00
Nextcloud bot 7f00de841b
[tx-robot] updated from transifex 2018-03-14 01:11:29 +00:00
Nextcloud bot 3867a74f0d
[tx-robot] updated from transifex 2018-03-06 01:12:16 +00:00
Morris Jobke a8f56ac8c7
Merge pull request #8603 from nextcloud/enc-cleanup
kill old encryption migration steps
2018-03-05 11:16:27 +01:00
Nextcloud bot 6975cef00b
[tx-robot] updated from transifex 2018-03-04 01:12:42 +00:00
Bjoern Schiessle 8042e6b8fb
this was a migration step to ownCloud 8.0 to restructure the encryption folder which is no longer needed
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-03-02 10:09:52 +01:00
Nextcloud bot a210247559
[tx-robot] updated from transifex 2018-02-24 01:12:16 +00:00
Nextcloud bot 68187e6036
[tx-robot] updated from transifex 2018-02-23 01:12:16 +00:00
Nextcloud bot 6591a3bc36
[tx-robot] updated from transifex 2018-02-21 01:12:10 +00:00
Joas Schilling f095001e4b
Fix info.xml files of shipped apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-16 10:24:03 +01:00
Morris Jobke 236086c457
Merge pull request #8335 from nextcloud/remove-unused-import
Remove unused import statements
2018-02-14 22:23:07 +01:00
Morris Jobke d3d045dd5c
Remove unused import statements
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-14 16:55:43 +01:00
Morris Jobke e2974f1133
Simplify return statement
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-13 21:55:24 +01:00
Nextcloud bot 3fc6d6234e
[tx-robot] updated from transifex 2018-02-13 10:48:27 +00:00
Nextcloud bot ee77f37df2
[tx-robot] updated from transifex 2018-02-09 15:28:58 +00:00
Nextcloud bot 58b568fd5d
[tx-robot] updated from transifex 2018-02-04 01:10:28 +00:00
Nextcloud bot b006f25457
[tx-robot] updated from transifex 2018-02-01 17:19:47 +00:00
Nextcloud bot 1d8b90b8d3
[tx-robot] updated from transifex 2018-01-29 01:10:53 +00:00
Morris Jobke a661f043e1
Remove unneeded semicolon and parentheses
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 23:46:40 +01:00
Joas Schilling c2b1bd92d6
Merge pull request #8063 from nextcloud/inline-value
Return value immediately instead of assigning to a one-time variable
2018-01-26 10:15:39 +01:00
Roeland Jago Douma 68f44a9a93
Merge pull request #8059 from nextcloud/use-stripos
Use stripos instead of strpos(strtolower(), 'something')
2018-01-26 09:50:31 +01:00
Nextcloud bot 469b3724b5
[tx-robot] updated from transifex 2018-01-26 01:10:52 +00:00
Morris Jobke 0a56d2185e
Return value immediately instead of assigning to a one-time variable
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 00:02:03 +01:00
Morris Jobke 464f024fa9
Use stripos instead of strpos(strtolower(), 'something')
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 22:59:50 +01:00
Joas Schilling 3917a54113
Class "ProgressBar" is declared "final" and cannot be mocked.
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-25 11:33:26 +01:00
Joas Schilling bf2be08c9f
Fix risky tests without assertions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-25 11:33:25 +01:00
Morris Jobke 2a38605545
Properly log the full exception instead of only the message
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-23 10:57:21 +01:00
Roeland Jago Douma db411f8771
Bump apps
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-14 11:40:53 +01:00
Morris Jobke f578b69729
Update composer
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-12 23:16:10 +01:00
Roeland Jago Douma 0280cff66f
Composer updated
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-04 16:31:16 +01:00
Nextcloud bot 298b79410d
[tx-robot] updated from transifex 2018-01-04 09:48:31 +00:00
Roeland Jago Douma 49b095b78e
Use proper authorative-autoloader for app autoloaders
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-14 08:31:31 +01:00
Nextcloud bot 8e3861563b
[tx-robot] updated from transifex 2017-11-12 01:10:00 +00:00
Nextcloud bot 6ca4abfc0b
[tx-robot] updated from transifex 2017-11-11 01:10:09 +00:00
Nextcloud bot ede6499de4
[tx-robot] updated from transifex 2017-11-10 01:09:43 +00:00
Nextcloud bot 79c9439c50
[tx-robot] updated from transifex 2017-11-08 01:09:21 +00:00
Nextcloud bot f9b7109de3
[tx-robot] updated from transifex 2017-11-07 01:08:57 +00:00
Morris Jobke 0eebff152a
Update license headers
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 16:56:19 +01:00
Nextcloud bot 81ac1ec977
[tx-robot] updated from transifex 2017-11-06 01:09:07 +00:00
Nextcloud bot 7e1e9430b6
[tx-robot] updated from transifex 2017-11-03 01:09:06 +00:00
Joas Schilling ce12cd91db
Merge pull request #6875 from nextcloud/app_autoloaders
Move server apps to dedicated autoloader
2017-11-01 11:15:27 +01:00
Nextcloud bot cc83052ca7
[tx-robot] updated from transifex 2017-11-01 01:08:44 +00:00
Nextcloud bot 84f3d247f2
[tx-robot] updated from transifex 2017-10-28 00:08:32 +00:00
Morris Jobke c733cdaa65
Use ::class in test mocks of encryption app
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-26 13:56:56 +02:00
Roeland Jago Douma fc1032f4bc
Encryption Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:12 +02:00
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