Bump tests and editorconfig

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2018-04-24 16:20:01 +02:00
parent 62e1014b2e
commit ae8ea57793
No known key found for this signature in database
GPG key ID: 60C25B8C072916CF
5 changed files with 40 additions and 3069 deletions

View file

@ -7,6 +7,6 @@ end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
[{package.json,.travis.yml}]
[{package.json,.travis.yml,webpack.config.js}]
indent_style = space
indent_size = 2

View file

@ -48,6 +48,7 @@ use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\BackgroundJob\IJobList;
use OCP\Encryption\IManager;
use OCP\IConfig;
use OCP\IGroupManager;
use OCP\IL10N;
@ -88,6 +89,8 @@ class UsersController extends Controller {
private $keyManager;
/** @var IJobList */
private $jobList;
/** @var IManager */
private $encryptionManager;
public function __construct(string $appName,
@ -103,7 +106,8 @@ class UsersController extends Controller {
IAppManager $appManager,
AccountManager $accountManager,
Manager $keyManager,
IJobList $jobList) {
IJobList $jobList,
IManager $encryptionManager) {
parent::__construct($appName, $request);
$this->userManager = $userManager;
$this->groupManager = $groupManager;
@ -117,6 +121,7 @@ class UsersController extends Controller {
$this->accountManager = $accountManager;
$this->keyManager = $keyManager;
$this->jobList = $jobList;
$this->encryptionManager = $encryptionManager;
}

File diff suppressed because one or more lines are too long

1
settings/js/main.js.map Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load diff