diff options
Diffstat (limited to 'apps/settings')
-rw-r--r-- | apps/settings/src/logger.js | 7 | ||||
-rw-r--r-- | apps/settings/src/main-admin-security.js | 24 | ||||
-rw-r--r-- | apps/settings/src/main-apps-users-management.js | 2 | ||||
-rw-r--r-- | apps/settings/src/main-nextcloud-pdf.js | 3 | ||||
-rw-r--r-- | apps/settings/src/main-personal-security.js | 8 | ||||
-rw-r--r-- | apps/settings/src/main-personal-webauth.js | 3 | ||||
-rw-r--r-- | apps/settings/src/mixins/AppManagement.js | 1 | ||||
-rw-r--r-- | apps/settings/src/mixins/UserRowMixin.js | 2 | ||||
-rw-r--r-- | apps/settings/src/router.js | 1 | ||||
-rw-r--r-- | apps/settings/src/service/WebAuthnRegistrationSerice.js | 3 | ||||
-rw-r--r-- | apps/settings/src/store/admin-security.js | 6 | ||||
-rw-r--r-- | apps/settings/src/store/api.js | 4 | ||||
-rw-r--r-- | apps/settings/src/store/apps.js | 4 | ||||
-rw-r--r-- | apps/settings/src/store/oc.js | 1 | ||||
-rw-r--r-- | apps/settings/src/store/users.js | 6 | ||||
-rw-r--r-- | apps/settings/webpack.js | 25 |
16 files changed, 87 insertions, 13 deletions
diff --git a/apps/settings/src/logger.js b/apps/settings/src/logger.js index 275771ce4c5..533c579585a 100644 --- a/apps/settings/src/logger.js +++ b/apps/settings/src/logger.js @@ -1,7 +1,7 @@ -/* +/** * @copyright 2020 Christoph Wurst <christoph@winzerhof-wurst.at> * - * @author 2020 Christoph Wurst <christoph@winzerhof-wurst.at> + * @author Roeland Jago Douma <roeland@famdouma.nl> * * @license GNU AGPL version 3 or any later version * @@ -16,7 +16,8 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * */ import { getLoggerBuilder } from '@nextcloud/logger' diff --git a/apps/settings/src/main-admin-security.js b/apps/settings/src/main-admin-security.js index 5be21450fd2..a831cf6f52c 100644 --- a/apps/settings/src/main-admin-security.js +++ b/apps/settings/src/main-admin-security.js @@ -1,3 +1,27 @@ +/** + * @copyright Copyright (c) 2016 Christoph Wurst <christoph@winzerhof-wurst.at> + * + * @author Christoph Wurst <christoph@winzerhof-wurst.at> + * @author John Molakvoæ <skjnldsv@protonmail.com> + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + import { loadState } from '@nextcloud/initial-state' import Vue from 'vue' diff --git a/apps/settings/src/main-apps-users-management.js b/apps/settings/src/main-apps-users-management.js index 52f48691427..f50e98785d7 100644 --- a/apps/settings/src/main-apps-users-management.js +++ b/apps/settings/src/main-apps-users-management.js @@ -2,6 +2,8 @@ * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com> * * @author John Molakvoæ <skjnldsv@protonmail.com> + * @author rakekniven <mark.ziegler@rakekniven.de> + * @author Roeland Jago Douma <roeland@famdouma.nl> * * @license GNU AGPL version 3 or any later version * diff --git a/apps/settings/src/main-nextcloud-pdf.js b/apps/settings/src/main-nextcloud-pdf.js index d9e32a32b6e..f9f5a62d363 100644 --- a/apps/settings/src/main-nextcloud-pdf.js +++ b/apps/settings/src/main-nextcloud-pdf.js @@ -1,7 +1,7 @@ /** * @copyright Copyright (c) 2020 John Molakvoæ <skjnldsv@protonmail.com> * - * @author John Molakvoæ <skjnldsv@protonmail.com> + * @author Jan C. Borchardt <hey@jancborchardt.net> * * @license GNU AGPL version 3 or any later version * @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + import { loadState } from '@nextcloud/initial-state' const hasPdf = loadState('settings', 'has-reasons-use-nextcloud-pdf') === true diff --git a/apps/settings/src/main-personal-security.js b/apps/settings/src/main-personal-security.js index 958c9da5e39..cd7475858cb 100644 --- a/apps/settings/src/main-personal-security.js +++ b/apps/settings/src/main-personal-security.js @@ -1,7 +1,8 @@ -/* +/** * @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at> * - * @author 2019 Christoph Wurst <christoph@winzerhof-wurst.at> + * @author Christoph Wurst <christoph@winzerhof-wurst.at> + * @author John Molakvoæ <skjnldsv@protonmail.com> * * @license GNU AGPL version 3 or any later version * @@ -16,7 +17,8 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * */ import { loadState } from '@nextcloud/initial-state' diff --git a/apps/settings/src/main-personal-webauth.js b/apps/settings/src/main-personal-webauth.js index e6e302df5f8..81d153092c5 100644 --- a/apps/settings/src/main-personal-webauth.js +++ b/apps/settings/src/main-personal-webauth.js @@ -16,7 +16,8 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * */ import Vue from 'vue' diff --git a/apps/settings/src/mixins/AppManagement.js b/apps/settings/src/mixins/AppManagement.js index 0bdb238601d..04ff38efad2 100644 --- a/apps/settings/src/mixins/AppManagement.js +++ b/apps/settings/src/mixins/AppManagement.js @@ -1,7 +1,6 @@ /** * @copyright Copyright (c) 2019 Julius Härtl <jus@bitgrid.net> * - * @author Julius Härtl <jus@bitgrid.net> * @author John Molakvoæ <skjnldsv@protonmail.com> * * @license GNU AGPL version 3 or any later version diff --git a/apps/settings/src/mixins/UserRowMixin.js b/apps/settings/src/mixins/UserRowMixin.js index 4107b247b14..1c33f3d33cb 100644 --- a/apps/settings/src/mixins/UserRowMixin.js +++ b/apps/settings/src/mixins/UserRowMixin.js @@ -1,7 +1,9 @@ /** * @copyright Copyright (c) 2019 John Molakvoæ <skjnldsv@protonmail.com> * + * @author Greta Doci <gretadoci@gmail.com> * @author John Molakvoæ <skjnldsv@protonmail.com> + * @author Roeland Jago Douma <roeland@famdouma.nl> * * @license GNU AGPL version 3 or any later version * diff --git a/apps/settings/src/router.js b/apps/settings/src/router.js index 3e689711b71..4b477d37b5d 100644 --- a/apps/settings/src/router.js +++ b/apps/settings/src/router.js @@ -3,6 +3,7 @@ * * @author John Molakvoæ <skjnldsv@protonmail.com> * @author Julius Härtl <jus@bitgrid.net> + * @author Roeland Jago Douma <roeland@famdouma.nl> * * @license GNU AGPL version 3 or any later version * diff --git a/apps/settings/src/service/WebAuthnRegistrationSerice.js b/apps/settings/src/service/WebAuthnRegistrationSerice.js index 4c82c5b9fa7..98af818217b 100644 --- a/apps/settings/src/service/WebAuthnRegistrationSerice.js +++ b/apps/settings/src/service/WebAuthnRegistrationSerice.js @@ -16,7 +16,8 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * */ import axios from '@nextcloud/axios' diff --git a/apps/settings/src/store/admin-security.js b/apps/settings/src/store/admin-security.js index c71f40a1e85..b2806096989 100644 --- a/apps/settings/src/store/admin-security.js +++ b/apps/settings/src/store/admin-security.js @@ -1,7 +1,8 @@ /** * @copyright 2019 Roeland Jago Douma <roeland@famdouma.nl> * - * @author 2019 Roeland Jago Douma <roeland@famdouma.nl> + * @author John Molakvoæ <skjnldsv@protonmail.com> + * @author Roeland Jago Douma <roeland@famdouma.nl> * * @license GNU AGPL version 3 or any later version * @@ -16,7 +17,8 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * */ import Vue from 'vue' diff --git a/apps/settings/src/store/api.js b/apps/settings/src/store/api.js index 9a03fe68ef9..4eae9f5c95d 100644 --- a/apps/settings/src/store/api.js +++ b/apps/settings/src/store/api.js @@ -1,7 +1,11 @@ /** * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com> * + * @author Christoph Wurst <christoph@winzerhof-wurst.at> * @author John Molakvoæ <skjnldsv@protonmail.com> + * @author Julius Härtl <jus@bitgrid.net> + * @author Roeland Jago Douma <roeland@famdouma.nl> + * @author Sujith Haridasan <sujith.h@gmail.com> * * @license GNU AGPL version 3 or any later version * diff --git a/apps/settings/src/store/apps.js b/apps/settings/src/store/apps.js index db174df2526..20af95a0235 100644 --- a/apps/settings/src/store/apps.js +++ b/apps/settings/src/store/apps.js @@ -1,7 +1,9 @@ -/* +/** * @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net> * + * @author John Molakvoæ <skjnldsv@protonmail.com> * @author Julius Härtl <jus@bitgrid.net> + * @author Roeland Jago Douma <roeland@famdouma.nl> * * @license GNU AGPL version 3 or any later version * diff --git a/apps/settings/src/store/oc.js b/apps/settings/src/store/oc.js index 9e7a4e6655b..153c16570cd 100644 --- a/apps/settings/src/store/oc.js +++ b/apps/settings/src/store/oc.js @@ -2,6 +2,7 @@ * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com> * * @author John Molakvoæ <skjnldsv@protonmail.com> + * @author Roeland Jago Douma <roeland@famdouma.nl> * * @license GNU AGPL version 3 or any later version * diff --git a/apps/settings/src/store/users.js b/apps/settings/src/store/users.js index 7877c3f3a52..e07fccd9d5b 100644 --- a/apps/settings/src/store/users.js +++ b/apps/settings/src/store/users.js @@ -1,7 +1,13 @@ /** * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com> * + * @author Arthur Schiwon <blizzz@arthur-schiwon.de> + * @author Christoph Wurst <christoph@winzerhof-wurst.at> + * @author Daniel Calviño Sánchez <danxuliu@gmail.com> * @author John Molakvoæ <skjnldsv@protonmail.com> + * @author Julius Härtl <jus@bitgrid.net> + * @author Roeland Jago Douma <roeland@famdouma.nl> + * @author Vincent Petry <vincent@nextcloud.com> * * @license GNU AGPL version 3 or any later version * diff --git a/apps/settings/webpack.js b/apps/settings/webpack.js index 6ae417df149..756a748ae1b 100644 --- a/apps/settings/webpack.js +++ b/apps/settings/webpack.js @@ -1,3 +1,28 @@ +/** + * @copyright Copyright (c) 2016 John Molakvoæ <skjnldsv@protonmail.com> + * + * @author Christoph Wurst <christoph@winzerhof-wurst.at> + * @author Jan C. Borchardt <hey@jancborchardt.net> + * @author John Molakvoæ <skjnldsv@protonmail.com> + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + const path = require('path') module.exports = { |