Bump compiled files

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

apps/comments/src/activitytabviewplugin.js

@@ -18,7 +18,7 @@
 		 * @param {jQuery} $el jQuery handle for this activity
 		 * @param {string} view The view that displayes this activity
 		 */
-		prepareModelForDisplay: function(model, $el, view) {
+		prepareModelForDisplay(model, $el, view) {
 			if (model.get('app') !== 'comments' || model.get('type') !== 'comments') {
 				return
 			}
@@ -37,7 +37,7 @@
 		/*
 		 * Copy of CommentsTabView._onClickComment()
 		 */
-		_onClickCollapsedComment: function(ev) {
+		_onClickCollapsedComment(ev) {
 			let $row = $(ev.target)
 			if (!$row.is('.comment')) {
 				$row = $row.closest('.comment')
@@ -48,7 +48,7 @@
 		/*
 		 * Copy of CommentsTabView._isLong()
 		 */
-		_isLong: function(message) {
+		_isLong(message) {
 			return message.length > 250 || (message.match(/\n/g) || []).length > 1
 		},
 	}

apps/comments/src/commentmodel.js

@@ -52,7 +52,7 @@
 				'mentions': OC.Files.Client.PROPERTY_MENTIONS,
 			},
 
-			parse: function(data) {
+			parse(data) {
 				return {
 					id: data.id,
 					message: data.message,
@@ -67,7 +67,7 @@
 				}
 			},
 
-			_parseMentions: function(mentions) {
+			_parseMentions(mentions) {
 				if (_.isUndefined(mentions)) {
 					return {}
 				}

apps/comments/src/commentsmodifymenu.js

@@ -31,7 +31,7 @@
 				iconClass: 'icon-delete',
 			},
 		],
-		initialize: function() {
+		initialize() {
 
 		},
 		events: {
@@ -43,7 +43,7 @@
 		 *
 		 * @param {Object} event event object
 		 */
-		_onClickAction: function(event) {
+		_onClickAction(event) {
 			let $target = $(event.currentTarget)
 			if (!$target.hasClass('menuitem')) {
 				$target = $target.closest('.menuitem')
@@ -57,7 +57,7 @@
 		/**
 		 * Renders the menu with the currently set items
 		 */
-		render: function() {
+		render() {
 			this.$el.html(OCA.Comments.Templates['commentsmodifymenu']({
 				items: this._scopes,
 			}))
@@ -67,7 +67,7 @@
 		 * Displays the menu
 		 * @param {Event} context the click event
 		 */
-		show: function(context) {
+		show(context) {
 			this._context = context
 
 			for (const i in this._scopes) {

apps/comments/src/commentsummarymodel.js

@@ -52,14 +52,14 @@
 			 * @param {string} [options.objectType] object type
 			 * @param {string} [options.objectId] object id
 			 */
-			initialize: function(attrs, options) {
+			initialize(attrs, options) {
 				options = options || {}
 				if (options.objectType) {
 					this._objectType = options.objectType
 				}
 			},
 
-			url: function() {
+			url() {
 				return OC.linkToRemote('dav') + '/comments/'
 				+ encodeURIComponent(this._objectType) + '/'
 				+ encodeURIComponent(this.id) + '/'

apps/comments/src/filesplugin.js

@@ -31,15 +31,15 @@
 			'files.public',
 		],
 
-		_formatCommentCount: function(count) {
+		_formatCommentCount(count) {
 			return OCA.Comments.Templates['filesplugin']({
-				count: count,
+				count,
 				countMessage: n('comments', '%n unread comment', '%n unread comments', count),
 				iconUrl: OC.imagePath('core', 'actions/comment'),
 			})
 		},
 
-		attach: function(fileList) {
+		attach(fileList) {
 			const self = this
 			if (this.ignoreLists.indexOf(fileList.id) >= 0) {
 				return
@@ -77,11 +77,11 @@
 			// register "comment" action for reading comments
 			fileList.fileActions.registerAction({
 				name: 'Comment',
-				displayName: function(context) {
+				displayName(context) {
 					if (context && context.$file) {
 						const unread = parseInt(context.$file.data('comments-unread'), 10)
 						if (unread >= 0) {
-							return n('comments', '1 new comment', '{unread} new comments', unread, { unread: unread })
+							return n('comments', '1 new comment', '{unread} new comments', unread, { unread })
 						}
 					}
 					return t('comments', 'Comment')
@@ -91,7 +91,7 @@
 				iconClass: 'icon-comment',
 				permissions: OC.PERMISSION_READ,
 				type: OCA.Files.FileActions.TYPE_INLINE,
-				render: function(actionSpec, isDefault, context) {
+				render(actionSpec, isDefault, context) {
 					const $file = context.$file
 					const unreadComments = $file.data('comments-unread')
 					if (unreadComments) {
@@ -101,7 +101,7 @@
 					}
 					return ''
 				},
-				actionHandler: function(fileName, context) {
+				actionHandler(fileName, context) {
 					context.$file.find('.action-comment').tooltip('hide')
 					// open sidebar in comments section
 					context.fileList.showDetailsView(fileName, 'comments')

apps/files/src/components/LegacyTab.vue

@@ -33,7 +33,7 @@ import AppSidebarTab from '@nextcloud/vue/dist/Components/AppSidebarTab'
 export default {
 	name: 'LegacyTab',
 	components: {
-		AppSidebarTab: AppSidebarTab,
+		AppSidebarTab,
 	},
 	props: {
 		component: {

apps/files_sharing/js/app.js

@@ -24,7 +24,7 @@ OCA.Sharing.App = {
 	_overviewFileList: null,
 	_pendingFileList: null,
 
-	initSharingIn: function($el) {
+	initSharingIn($el) {
 		if (this._inFileList) {
 			return this._inFileList
 		}
@@ -51,7 +51,7 @@ OCA.Sharing.App = {
 		return this._inFileList
 	},
 
-	initSharingOut: function($el) {
+	initSharingOut($el) {
 		if (this._outFileList) {
 			return this._outFileList
 		}
@@ -77,7 +77,7 @@ OCA.Sharing.App = {
 		return this._outFileList
 	},
 
-	initSharingLinks: function($el) {
+	initSharingLinks($el) {
 		if (this._linkFileList) {
 			return this._linkFileList
 		}
@@ -103,7 +103,7 @@ OCA.Sharing.App = {
 		return this._linkFileList
 	},
 
-	initSharingDeleted: function($el) {
+	initSharingDeleted($el) {
 		if (this._deletedFileList) {
 			return this._deletedFileList
 		}
@@ -131,7 +131,7 @@ OCA.Sharing.App = {
 		return this._deletedFileList
 	},
 
-	initSharingPening: function($el) {
+	initSharingPening($el) {
 		if (this._pendingFileList) {
 			return this._pendingFileList
 		}
@@ -158,7 +158,7 @@ OCA.Sharing.App = {
 		return this._pendingFileList
 	},
 
-	initShareingOverview: function($el) {
+	initShareingOverview($el) {
 		if (this._overviewFileList) {
 			return this._overviewFileList
 		}
@@ -183,37 +183,37 @@ OCA.Sharing.App = {
 		return this._overviewFileList
 	},
 
-	removeSharingIn: function() {
+	removeSharingIn() {
 		if (this._inFileList) {
 			this._inFileList.$fileList.empty()
 		}
 	},
 
-	removeSharingOut: function() {
+	removeSharingOut() {
 		if (this._outFileList) {
 			this._outFileList.$fileList.empty()
 		}
 	},
 
-	removeSharingLinks: function() {
+	removeSharingLinks() {
 		if (this._linkFileList) {
 			this._linkFileList.$fileList.empty()
 		}
 	},
 
-	removeSharingDeleted: function() {
+	removeSharingDeleted() {
 		if (this._deletedFileList) {
 			this._deletedFileList.$fileList.empty()
 		}
 	},
 
-	removeSharingPending: function() {
+	removeSharingPending() {
 		if (this._pendingFileList) {
 			this._pendingFileList.$fileList.empty()
 		}
 	},
 
-	removeSharingOverview: function() {
+	removeSharingOverview() {
 		if (this._overviewFileList) {
 			this._overviewFileList.$fileList.empty()
 		}
@@ -222,7 +222,7 @@ OCA.Sharing.App = {
 	/**
 	 * Destroy the app
 	 */
-	destroy: function() {
+	destroy() {
 		OCA.Files.fileActions.off('setDefault.app-sharing', this._onActionsUpdated)
 		OCA.Files.fileActions.off('registerAction.app-sharing', this._onActionsUpdated)
 		this.removeSharingIn()
@@ -235,7 +235,7 @@ OCA.Sharing.App = {
 		delete this._globalActionsInitialized
 	},
 
-	_createFileActions: function() {
+	_createFileActions() {
 		// inherit file actions from the files app
 		const fileActions = new OCA.Files.FileActions()
 		// note: not merging the legacy actions because legacy apps are not
@@ -261,7 +261,7 @@ OCA.Sharing.App = {
 		return fileActions
 	},
 
-	_restoreShareAction: function() {
+	_restoreShareAction() {
 		const fileActions = new OCA.Files.FileActions()
 		fileActions.registerAction({
 			name: 'Restore',
@@ -271,7 +271,7 @@ OCA.Sharing.App = {
 			permissions: OC.PERMISSION_ALL,
 			iconClass: 'icon-history',
 			type: OCA.Files.FileActions.TYPE_INLINE,
-			actionHandler: function(fileName, context) {
+			actionHandler(fileName, context) {
 				const shareId = context.$file.data('shareId')
 				$.post(OC.linkToOCS('apps/files_sharing/api/v1/deletedshares', 2) + shareId)
 					.success(function(result) {
@@ -284,7 +284,7 @@ OCA.Sharing.App = {
 		return fileActions
 	},
 
-	_acceptShareAction: function() {
+	_acceptShareAction() {
 		const fileActions = new OCA.Files.FileActions()
 		fileActions.registerAction({
 			name: 'Accept share',
@@ -293,7 +293,7 @@ OCA.Sharing.App = {
 			permissions: OC.PERMISSION_ALL,
 			iconClass: 'icon-checkmark',
 			type: OCA.Files.FileActions.TYPE_INLINE,
-			actionHandler: function(fileName, context) {
+			actionHandler(fileName, context) {
 				const shareId = context.$file.data('shareId')
 				$.post(OC.linkToOCS('apps/files_sharing/api/v1/shares/pending', 2) + shareId)
 					.success(function(result) {
@@ -310,7 +310,7 @@ OCA.Sharing.App = {
 			permissions: OC.PERMISSION_ALL,
 			iconClass: 'icon-close',
 			type: OCA.Files.FileActions.TYPE_INLINE,
-			actionHandler: function(fileName, context) {
+			actionHandler(fileName, context) {
 				const shareId = context.$file.data('shareId')
 				$.ajax({
 					url: OC.linkToOCS('apps/files_sharing/api/v1/shares', 2) + shareId,
@@ -325,7 +325,7 @@ OCA.Sharing.App = {
 		return fileActions
 	},
 
-	_onActionsUpdated: function(ev) {
+	_onActionsUpdated(ev) {
 		_.each([this._inFileList, this._outFileList, this._linkFileList], function(list) {
 			if (!list) {
 				return
@@ -342,7 +342,7 @@ OCA.Sharing.App = {
 		})
 	},
 
-	_extendFileList: function(fileList) {
+	_extendFileList(fileList) {
 		// remove size column from summary
 		fileList.fileSummary.$el.find('.filesize').remove()
 	},

apps/files_sharing/js/dist/collaboration.js

@@ -1,2 +1,2 @@
-!function(e){var n={};function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:r})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,n){if(1&n&&(e=t(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(t.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var o in e)t.d(r,o,function(n){return e[n]}.bind(null,o));return r},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="/js/",t(t.s=152)}({152:function(e,n,r){r.p=OC.linkTo("files_sharing","js/dist/"),r.nc=btoa(OC.requestToken),window.OCP.Collaboration.registerType("file",{action:function(){return new Promise((function(e,n){OC.dialogs.filepicker(t("files_sharing","Link to a file"),(function(t){OC.Files.getClient().getFileInfo(t).then((function(n,t){e(t.id)})).fail((function(){n(new Error("Cannot get fileinfo"))}))}),!1,null,!1,OC.dialogs.FILEPICKER_TYPE_CHOOSE,"",{allowDirectoryChooser:!0})}))},typeString:t("files_sharing","Link to a file"),typeIconClass:"icon-files-dark"})}});
+!function(e){var n={};function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:r})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,n){if(1&n&&(e=t(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(t.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var o in e)t.d(r,o,function(n){return e[n]}.bind(null,o));return r},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="/js/",t(t.s=156)}({156:function(e,n,r){r.p=OC.linkTo("files_sharing","js/dist/"),r.nc=btoa(OC.requestToken),window.OCP.Collaboration.registerType("file",{action:function(){return new Promise((function(e,n){OC.dialogs.filepicker(t("files_sharing","Link to a file"),(function(t){OC.Files.getClient().getFileInfo(t).then((function(n,t){e(t.id)})).fail((function(){n(new Error("Cannot get fileinfo"))}))}),!1,null,!1,OC.dialogs.FILEPICKER_TYPE_CHOOSE,"",{allowDirectoryChooser:!0})}))},typeString:t("files_sharing","Link to a file"),typeIconClass:"icon-files-dark"})}});
 //# sourceMappingURL=collaboration.js.map

apps/files_sharing/js/dist/main.js

@@ -1,2 +1,2 @@
-!function(e){var t={};function r(n){if(t[n])return t[n].exports;var o=t[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,r),o.l=!0,o.exports}r.m=e,r.c=t,r.d=function(e,t,n){r.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)r.d(n,o,function(t){return e[t]}.bind(null,o));return n},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="/js/",r(r.s=273)}({273:function(e,t){Object.assign(OC,{Share:{SHARE_TYPE_USER:0,SHARE_TYPE_GROUP:1,SHARE_TYPE_LINK:3,SHARE_TYPE_EMAIL:4,SHARE_TYPE_REMOTE:6,SHARE_TYPE_CIRCLE:7,SHARE_TYPE_GUEST:8,SHARE_TYPE_REMOTE_GROUP:9,SHARE_TYPE_ROOM:10}})}});
+!function(e){var t={};function r(n){if(t[n])return t[n].exports;var o=t[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,r),o.l=!0,o.exports}r.m=e,r.c=t,r.d=function(e,t,n){r.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)r.d(n,o,function(t){return e[t]}.bind(null,o));return n},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="/js/",r(r.s=280)}({280:function(e,t){Object.assign(OC,{Share:{SHARE_TYPE_USER:0,SHARE_TYPE_GROUP:1,SHARE_TYPE_LINK:3,SHARE_TYPE_EMAIL:4,SHARE_TYPE_REMOTE:6,SHARE_TYPE_CIRCLE:7,SHARE_TYPE_GUEST:8,SHARE_TYPE_REMOTE_GROUP:9,SHARE_TYPE_ROOM:10}})}});
 //# sourceMappingURL=main.js.map

apps/files_sharing/src/components/SharingEntryLink.vue

@@ -485,10 +485,10 @@ export default {
 		 * @returns {boolean}
 		 */
 		isPasswordProtectedByTalk: {
-			get: function() {
+			get() {
 				return this.share.sendPasswordByTalk
 			},
-			set: async function(enabled) {
+			async set(enabled) {
 				this.share.sendPasswordByTalk = enabled
 			},
 		},
@@ -535,10 +535,10 @@ export default {
 		 * @returns {boolean}
 		 */
 		canUpdate: {
-			get: function() {
+			get() {
 				return this.share.hasUpdatePermission
 			},
-			set: function(enabled) {
+			set(enabled) {
 				this.share.permissions = enabled
 					? OC.PERMISSION_READ | OC.PERMISSION_UPDATE
 					: OC.PERMISSION_READ

apps/files_sharing/src/mixins/SharesMixin.js

@@ -87,10 +87,10 @@ export default {
 		 * @returns {boolean}
 		 */
 		hasNote: {
-			get: function() {
+			get() {
 				return this.share.note !== ''
 			},
-			set: function(enabled) {
+			set(enabled) {
 				this.share.note = enabled
 					? null // enabled but user did not changed the content yet
 					: '' // empty = no note = disabled

apps/files_sharing/src/sharebreadcrumbview.js

@@ -30,7 +30,7 @@
 		},
 		_dirInfo: undefined,
 
-		render: function(data) {
+		render(data) {
 			this._dirInfo = data.dirInfo || null
 
 			if (this._dirInfo !== null && (this._dirInfo.path !== '/' || this._dirInfo.name !== '')) {
@@ -55,7 +55,7 @@
 
 			return this
 		},
-		_onClick: function(e) {
+		_onClick(e) {
 			e.preventDefault()
 
 			const fileInfoModel = new OCA.Files.FileInfoModel(this._dirInfo)

apps/files_trashbin/src/app.js

@@ -20,7 +20,7 @@ OCA.Trashbin.App = {
 	/** @type {OC.Files.Client} */
 	client: null,
 
-	initialize: function($el) {
+	initialize($el) {
 		if (this._initialized) {
 			return
 		}
@@ -60,7 +60,7 @@ OCA.Trashbin.App = {
 		)
 	},
 
-	_createFileActions: function() {
+	_createFileActions() {
 		const client = this.client
 		const fileActions = new OCA.Files.FileActions()
 		fileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function(filename, context) {
@@ -77,7 +77,7 @@ OCA.Trashbin.App = {
 			mime: 'all',
 			permissions: OC.PERMISSION_READ,
 			iconClass: 'icon-history',
-			actionHandler: function(filename, context) {
+			actionHandler(filename, context) {
 				const fileList = context.fileList
 				const tr = fileList.findFileEl(filename)
 				fileList.showFileBusyState(tr, true)
@@ -99,14 +99,14 @@ OCA.Trashbin.App = {
 			mime: 'all',
 			permissions: OC.PERMISSION_READ,
 			iconClass: 'icon-delete',
-			render: function(actionSpec, isDefault, context) {
+			render(actionSpec, isDefault, context) {
 				const $actionLink = fileActions._makeActionLink(actionSpec, context)
 				$actionLink.attr('original-title', t('files_trashbin', 'Delete permanently'))
 				$actionLink.children('img').attr('alt', t('files_trashbin', 'Delete permanently'))
 				context.$file.find('td:last').append($actionLink)
 				return $actionLink
 			},
-			actionHandler: function(filename, context) {
+			actionHandler(filename, context) {
 				const fileList = context.fileList
 				$('.tipsy').remove()
 				const tr = fileList.findFileEl(filename)

apps/files_versions/src/filesplugin.js

@@ -20,7 +20,7 @@
 		 *
 		 * @param {OCA.Files.FileList} fileList file list to be extended
 		 */
-		attach: function(fileList) {
+		attach(fileList) {
 			if (fileList.id === 'trashbin' || fileList.id === 'files.public') {
 				return
 			}

apps/files_versions/src/versioncollection.js

@@ -25,27 +25,27 @@
 
 		_client: null,
 
-		setFileInfo: function(fileInfo) {
+		setFileInfo(fileInfo) {
 			this._fileInfo = fileInfo
 		},
 
-		getFileInfo: function() {
+		getFileInfo() {
 			return this._fileInfo
 		},
 
-		setCurrentUser: function(user) {
+		setCurrentUser(user) {
 			this._currentUser = user
 		},
 
-		getCurrentUser: function() {
+		getCurrentUser() {
 			return this._currentUser || OC.getCurrentUser().uid
 		},
 
-		setClient: function(client) {
+		setClient(client) {
 			this._client = client
 		},
 
-		getClient: function() {
+		getClient() {
 			return this._client || new OC.Files.Client({
 				host: OC.getHost(),
 				root: OC.linkToRemoteBase('dav') + '/versions/' + this.getCurrentUser(),
@@ -53,11 +53,11 @@
 			})
 		},
 
-		url: function() {
+		url() {
 			return OC.linkToRemoteBase('dav') + '/versions/' + this.getCurrentUser() + '/versions/' + this._fileInfo.get('id')
 		},
 
-		parse: function(result) {
+		parse(result) {
 			const fullPath = this._fileInfo.getFullPath()
 			const fileId = this._fileInfo.get('id')
 			const name = this._fileInfo.get('name')

apps/files_versions/src/versionmodel.js

@@ -27,7 +27,7 @@
 		 * @param {Object} [options] options
 		 * @returns {Promise}
 		 */
-		revert: function(options) {
+		revert(options) {
 			options = options ? _.clone(options) : {}
 			const model = this
 
@@ -48,11 +48,11 @@
 				})
 		},
 
-		getFullPath: function() {
+		getFullPath() {
 			return this.get('fullPath')
 		},
 
-		getPreviewUrl: function() {
+		getPreviewUrl() {
 			const url = OC.generateUrl('/apps/files_versions/preview')
 			const params = {
 				file: this.get('fullPath'),
@@ -61,7 +61,7 @@
 			return url + '?' + OC.buildQueryString(params)
 		},
 
-		getDownloadUrl: function() {
+		getDownloadUrl() {
 			return OC.linkToRemoteBase('dav') + '/versions/' + this.get('user') + '/versions/' + this.get('fileId') + '/' + this.get('id')
 		},
 	})

apps/files_versions/src/versionstabview.js

@@ -27,7 +27,7 @@ import Template from './templates/template.handlebars';
 			'click .revertVersion': '_onClickRevertVersion',
 		},
 
-		initialize: function() {
+		initialize() {
 			OCA.Files.DetailTabView.prototype.initialize.apply(this, arguments)
 			this.collection = new OCA.Versions.VersionCollection()
 			this.collection.on('request', this._onRequest, this)
@@ -37,15 +37,15 @@ import Template from './templates/template.handlebars';
 			this.collection.on('add', this._onAddModel, this)
 		},
 
-		getLabel: function() {
+		getLabel() {
 			return t('files_versions', 'Versions')
 		},
 
-		getIcon: function() {
+		getIcon() {
 			return 'icon-history'
 		},
 
-		nextPage: function() {
+		nextPage() {
 			if (this._loading) {
 				return
 			}
@@ -56,7 +56,7 @@ import Template from './templates/template.handlebars';
 			this.collection.fetch()
 		},
 
-		_onClickRevertVersion: function(ev) {
+		_onClickRevertVersion(ev) {
 			const self = this
 			let $target = $(ev.target)
 			const fileInfoModel = this.collection.getFileInfo()
@@ -69,7 +69,7 @@ import Template from './templates/template.handlebars';
 
 			const versionModel = this.collection.get(revision)
 			versionModel.revert({
-				success: function() {
+				success() {
 					// reset and re-fetch the updated collection
 					self.$versionsContainer.empty()
 					self.collection.setFileInfo(fileInfoModel)
@@ -88,7 +88,7 @@ import Template from './templates/template.handlebars';
 					})
 				},
 
-				error: function() {
+				error() {
 					fileInfoModel.trigger('busy', fileInfoModel, false)
 					self.$el.find('.versions').removeClass('hidden')
 					self._toggleLoading(false)
@@ -109,35 +109,35 @@ import Template from './templates/template.handlebars';
 			fileInfoModel.trigger('busy', fileInfoModel, true)
 		},
 
-		_toggleLoading: function(state) {
+		_toggleLoading(state) {
 			this._loading = state
 			this.$el.find('.loading').toggleClass('hidden', !state)
 		},
 
-		_onRequest: function() {
+		_onRequest() {
 			this._toggleLoading(true)
 		},
 
-		_onEndRequest: function() {
+		_onEndRequest() {
 			this._toggleLoading(false)
 			this.$el.find('.empty').toggleClass('hidden', !!this.collection.length)
 		},
 
-		_onAddModel: function(model) {
+		_onAddModel(model) {
 			const $el = $(this.itemTemplate(this._formatItem(model)))
 			this.$versionsContainer.append($el)
 			$el.find('.has-tooltip').tooltip()
 		},
 
-		template: function(data) {
+		template(data) {
 			return Template(data)
 		},
 
-		itemTemplate: function(data) {
+		itemTemplate(data) {
 			return ItemTemplate(data)
 		},
 
-		setFileInfo: function(fileInfo) {
+		setFileInfo(fileInfo) {
 			if (fileInfo) {
 				this.render()
 				this.collection.setFileInfo(fileInfo)
@@ -149,7 +149,7 @@ import Template from './templates/template.handlebars';
 			}
 		},
 
-		_formatItem: function(version) {
+		_formatItem(version) {
 			const timestamp = version.get('timestamp') * 1000
 			const size = version.has('size') ? version.get('size') : 0
 			const preview = OC.MimeType.getIconUrl(version.get('mimetype'))
@@ -180,7 +180,7 @@ import Template from './templates/template.handlebars';
 		/**
 		 * Renders this details view
 		 */
-		render: function() {
+		render() {
 			this.$el.html(this.template({
 				emptyResultLabel: t('files_versions', 'No other versions available'),
 			}))
@@ -194,7 +194,7 @@ import Template from './templates/template.handlebars';
 		 * @param {FileInfo} fileInfo fileInfo
 		 * @returns {bool} true for files, false for folders
 		 */
-		canDisplay: function(fileInfo) {
+		canDisplay(fileInfo) {
 			if (!fileInfo) {
 				return false
 			}

apps/oauth2/src/App.vue

@@ -88,7 +88,7 @@ export default {
 			required: true,
 		},
 	},
-	data: function() {
+	data() {
 		return {
 			newClient: {
 				name: '',
@@ -100,7 +100,7 @@ export default {
 	},
 	methods: {
 		deleteClient(id) {
-			axios.delete(generateUrl('apps/oauth2/clients/{id}', { id: id }))
+			axios.delete(generateUrl('apps/oauth2/clients/{id}', { id }))
 				.then((response) => {
 					this.clients = this.clients.filter(client => client.id !== id)
 				})

apps/oauth2/src/components/OAuthItem.vue

@@ -40,7 +40,7 @@ export default {
 			required: true,
 		},
 	},
-	data: function() {
+	data() {
 		return {
 			id: this.client.id,
 			name: this.client.name,
@@ -51,7 +51,7 @@ export default {
 		}
 	},
 	computed: {
-		renderedSecret: function() {
+		renderedSecret() {
 			if (this.renderSecret) {
 				return this.clientSecret
 			} else {

apps/settings/js/vue-1.js

@@ -64,7 +64,7 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_AppDetails_vue_vue_type_style_index_0_id_59a92e62_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../node_modules/vue-style-loader!../../../../node_modules/css-loader/dist/cjs.js!../../../../node_modules/vue-loader/lib/loaders/stylePostLoader.js!../../../../node_modules/vue-loader/lib??vue-loader-options!./AppDetails.vue?vue&type=style&index=0&id=59a92e62&scoped=true&lang=css& */ "./node_modules/vue-style-loader/index.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/vue-loader/lib/index.js?!./apps/settings/src/components/AppDetails.vue?vue&type=style&index=0&id=59a92e62&scoped=true&lang=css&");
 /* harmony import */ var _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_AppDetails_vue_vue_type_style_index_0_id_59a92e62_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_AppDetails_vue_vue_type_style_index_0_id_59a92e62_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__);
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_AppDetails_vue_vue_type_style_index_0_id_59a92e62_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_AppDetails_vue_vue_type_style_index_0_id_59a92e62_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_AppDetails_vue_vue_type_style_index_0_id_59a92e62_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_AppDetails_vue_vue_type_style_index_0_id_59a92e62_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_AppDetails_vue_vue_type_style_index_0_id_59a92e62_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
@@ -220,7 +220,7 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_AppItem_vue_vue_type_style_index_0_id_429da85a_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../node_modules/vue-style-loader!../../../../../node_modules/css-loader/dist/cjs.js!../../../../../node_modules/vue-loader/lib/loaders/stylePostLoader.js!../../../../../node_modules/vue-loader/lib??vue-loader-options!./AppItem.vue?vue&type=style&index=0&id=429da85a&scoped=true&lang=css& */ "./node_modules/vue-style-loader/index.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/vue-loader/lib/index.js?!./apps/settings/src/components/AppList/AppItem.vue?vue&type=style&index=0&id=429da85a&scoped=true&lang=css&");
 /* harmony import */ var _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_AppItem_vue_vue_type_style_index_0_id_429da85a_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_AppItem_vue_vue_type_style_index_0_id_429da85a_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__);
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_AppItem_vue_vue_type_style_index_0_id_429da85a_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_AppItem_vue_vue_type_style_index_0_id_429da85a_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_AppItem_vue_vue_type_style_index_0_id_429da85a_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_AppItem_vue_vue_type_style_index_0_id_429da85a_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_AppItem_vue_vue_type_style_index_0_id_429da85a_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
@@ -3116,125 +3116,134 @@ var render = function() {
       }
     },
     [
-      _c("AppNavigation", [
-        _c(
-          "ul",
-          { attrs: { id: "appscategories" } },
-          [
-            _c("AppNavigationItem", {
-              attrs: {
-                id: "app-category-your-apps",
-                to: { name: "apps" },
-                exact: true,
-                icon: "icon-category-installed",
-                title: _vm.t("settings", "Your apps")
-              }
-            }),
-            _vm._v(" "),
-            _c("AppNavigationItem", {
-              attrs: {
-                id: "app-category-enabled",
-                to: { name: "apps-category", params: { category: "enabled" } },
-                icon: "icon-category-enabled",
-                title: _vm.t("settings", "Active apps")
-              }
-            }),
-            _vm._v(" "),
-            _c("AppNavigationItem", {
-              attrs: {
-                id: "app-category-disabled",
-                to: { name: "apps-category", params: { category: "disabled" } },
-                icon: "icon-category-disabled",
-                title: _vm.t("settings", "Disabled apps")
-              }
-            }),
-            _vm._v(" "),
-            _vm.updateCount > 0
-              ? _c(
-                  "AppNavigationItem",
-                  {
-                    attrs: {
-                      id: "app-category-updates",
-                      to: {
-                        name: "apps-category",
-                        params: { category: "updates" }
+      _c("AppNavigation", {
+        scopedSlots: _vm._u([
+          {
+            key: "list",
+            fn: function() {
+              return [
+                _c("AppNavigationItem", {
+                  attrs: {
+                    id: "app-category-your-apps",
+                    to: { name: "apps" },
+                    exact: true,
+                    icon: "icon-category-installed",
+                    title: _vm.t("settings", "Your apps")
+                  }
+                }),
+                _vm._v(" "),
+                _c("AppNavigationItem", {
+                  attrs: {
+                    id: "app-category-enabled",
+                    to: {
+                      name: "apps-category",
+                      params: { category: "enabled" }
+                    },
+                    icon: "icon-category-enabled",
+                    title: _vm.t("settings", "Active apps")
+                  }
+                }),
+                _vm._v(" "),
+                _c("AppNavigationItem", {
+                  attrs: {
+                    id: "app-category-disabled",
+                    to: {
+                      name: "apps-category",
+                      params: { category: "disabled" }
+                    },
+                    icon: "icon-category-disabled",
+                    title: _vm.t("settings", "Disabled apps")
+                  }
+                }),
+                _vm._v(" "),
+                _vm.updateCount > 0
+                  ? _c(
+                      "AppNavigationItem",
+                      {
+                        attrs: {
+                          id: "app-category-updates",
+                          to: {
+                            name: "apps-category",
+                            params: { category: "updates" }
+                          },
+                          icon: "icon-download",
+                          title: _vm.t("settings", "Updates")
+                        }
                       },
-                      icon: "icon-download",
-                      title: _vm.t("settings", "Updates")
-                    }
-                  },
-                  [
-                    _c(
-                      "AppNavigationCounter",
-                      { attrs: { slot: "counter" }, slot: "counter" },
                       [
-                        _vm._v(
-                          "\n\t\t\t\t\t" +
-                            _vm._s(_vm.updateCount) +
-                            "\n\t\t\t\t"
+                        _c(
+                          "AppNavigationCounter",
+                          { attrs: { slot: "counter" }, slot: "counter" },
+                          [
+                            _vm._v(
+                              "\n\t\t\t\t\t" +
+                                _vm._s(_vm.updateCount) +
+                                "\n\t\t\t\t"
+                            )
+                          ]
                         )
-                      ]
+                      ],
+                      1
                     )
-                  ],
-                  1
-                )
-              : _vm._e(),
-            _vm._v(" "),
-            _c("AppNavigationItem", {
-              attrs: {
-                id: "app-category-your-bundles",
-                to: {
-                  name: "apps-category",
-                  params: { category: "app-bundles" }
-                },
-                icon: "icon-category-app-bundles",
-                title: _vm.t("settings", "App bundles")
-              }
-            }),
-            _vm._v(" "),
-            _c("AppNavigationSpacer"),
-            _vm._v(" "),
-            _vm.settings.appstoreEnabled
-              ? [
-                  _c("AppNavigationItem", {
-                    attrs: {
-                      id: "app-category-featured",
-                      to: {
-                        name: "apps-category",
-                        params: { category: "featured" }
-                      },
-                      icon: "icon-favorite",
-                      title: _vm.t("settings", "Featured apps")
-                    }
-                  }),
-                  _vm._v(" "),
-                  _vm._l(_vm.categories, function(cat) {
-                    return _c("AppNavigationItem", {
-                      key: "icon-category-" + cat.ident,
-                      attrs: {
-                        icon: "icon-category-" + cat.ident,
-                        to: {
-                          name: "apps-category",
-                          params: { category: cat.ident }
-                        },
-                        title: cat.displayName
-                      }
-                    })
-                  })
-                ]
-              : _vm._e(),
-            _vm._v(" "),
-            _c("AppNavigationItem", {
-              attrs: {
-                id: "app-developer-docs",
-                href: "settings.developerDocumentation",
-                title: _vm.t("settings", "Developer documentation") + " ↗"
-              }
-            })
-          ],
-          2
-        )
-      ]),
+                  : _vm._e(),
+                _vm._v(" "),
+                _c("AppNavigationItem", {
+                  attrs: {
+                    id: "app-category-your-bundles",
+                    to: {
+                      name: "apps-category",
+                      params: { category: "app-bundles" }
+                    },
+                    icon: "icon-category-app-bundles",
+                    title: _vm.t("settings", "App bundles")
+                  }
+                }),
+                _vm._v(" "),
+                _c("AppNavigationSpacer"),
+                _vm._v(" "),
+                _vm.settings.appstoreEnabled
+                  ? [
+                      _c("AppNavigationItem", {
+                        attrs: {
+                          id: "app-category-featured",
+                          to: {
+                            name: "apps-category",
+                            params: { category: "featured" }
+                          },
+                          icon: "icon-favorite",
+                          title: _vm.t("settings", "Featured apps")
+                        }
+                      }),
+                      _vm._v(" "),
+                      _vm._l(_vm.categories, function(cat) {
+                        return _c("AppNavigationItem", {
+                          key: "icon-category-" + cat.ident,
+                          attrs: {
+                            icon: "icon-category-" + cat.ident,
+                            to: {
+                              name: "apps-category",
+                              params: { category: cat.ident }
+                            },
+                            title: cat.displayName
+                          }
+                        })
+                      })
+                    ]
+                  : _vm._e(),
+                _vm._v(" "),
+                _c("AppNavigationItem", {
+                  attrs: {
+                    id: "app-developer-docs",
+                    href: "settings.developerDocumentation",
+                    title: _vm.t("settings", "Developer documentation") + " ↗"
+                  }
+                })
+              ]
+            },
+            proxy: true
+          }
+        ])
+      }),
       _vm._v(" "),
       _c(
         "AppContent",
@@ -3320,4 +3329,4 @@ if(false) {}
 /***/ })
 
 }]);
-//# sourceMappingURL=vue-1.js.map?v=555ba5a3156287837e37
+//# sourceMappingURL=vue-1.js.map?v=9e5fdb9904cc924225e3

apps/settings/js/vue-2.js

@@ -64,7 +64,7 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_UserList_vue_vue_type_style_index_0_id_6cba3aca_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../node_modules/vue-style-loader!../../../../node_modules/css-loader/dist/cjs.js!../../../../node_modules/vue-loader/lib/loaders/stylePostLoader.js!../../../../node_modules/vue-loader/lib??vue-loader-options!./UserList.vue?vue&type=style&index=0&id=6cba3aca&scoped=true&lang=css& */ "./node_modules/vue-style-loader/index.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/vue-loader/lib/index.js?!./apps/settings/src/components/UserList.vue?vue&type=style&index=0&id=6cba3aca&scoped=true&lang=css&");
 /* harmony import */ var _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_UserList_vue_vue_type_style_index_0_id_6cba3aca_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_UserList_vue_vue_type_style_index_0_id_6cba3aca_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__);
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_UserList_vue_vue_type_style_index_0_id_6cba3aca_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_UserList_vue_vue_type_style_index_0_id_6cba3aca_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_UserList_vue_vue_type_style_index_0_id_6cba3aca_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_UserList_vue_vue_type_style_index_0_id_6cba3aca_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_UserList_vue_vue_type_style_index_0_id_6cba3aca_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
@@ -151,7 +151,7 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_node_modules_vue_loader_lib_index_js_vue_loader_options_UserRow_vue_vue_type_style_index_0_id_77960baa_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../node_modules/vue-style-loader!../../../../../node_modules/css-loader/dist/cjs.js!../../../../../node_modules/vue-loader/lib/loaders/stylePostLoader.js!../../../../../node_modules/sass-loader/dist/cjs.js!../../../../../node_modules/vue-loader/lib??vue-loader-options!./UserRow.vue?vue&type=style&index=0&id=77960baa&scoped=true&lang=scss& */ "./node_modules/vue-style-loader/index.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/vue-loader/lib/index.js?!./apps/settings/src/components/UserList/UserRow.vue?vue&type=style&index=0&id=77960baa&scoped=true&lang=scss&");
 /* harmony import */ var _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_node_modules_vue_loader_lib_index_js_vue_loader_options_UserRow_vue_vue_type_style_index_0_id_77960baa_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_node_modules_vue_loader_lib_index_js_vue_loader_options_UserRow_vue_vue_type_style_index_0_id_77960baa_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__);
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_node_modules_vue_loader_lib_index_js_vue_loader_options_UserRow_vue_vue_type_style_index_0_id_77960baa_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_node_modules_vue_loader_lib_index_js_vue_loader_options_UserRow_vue_vue_type_style_index_0_id_77960baa_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_node_modules_vue_loader_lib_index_js_vue_loader_options_UserRow_vue_vue_type_style_index_0_id_77960baa_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_node_modules_vue_loader_lib_index_js_vue_loader_options_UserRow_vue_vue_type_style_index_0_id_77960baa_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_node_modules_vue_loader_lib_index_js_vue_loader_options_UserRow_vue_vue_type_style_index_0_id_77960baa_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
@@ -238,7 +238,7 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_node_modules_vue_loader_lib_index_js_vue_loader_options_UserRowSimple_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../node_modules/vue-style-loader!../../../../../node_modules/css-loader/dist/cjs.js!../../../../../node_modules/vue-loader/lib/loaders/stylePostLoader.js!../../../../../node_modules/sass-loader/dist/cjs.js!../../../../../node_modules/vue-loader/lib??vue-loader-options!./UserRowSimple.vue?vue&type=style&index=0&lang=scss& */ "./node_modules/vue-style-loader/index.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/vue-loader/lib/index.js?!./apps/settings/src/components/UserList/UserRowSimple.vue?vue&type=style&index=0&lang=scss&");
 /* harmony import */ var _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_node_modules_vue_loader_lib_index_js_vue_loader_options_UserRowSimple_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_node_modules_vue_loader_lib_index_js_vue_loader_options_UserRowSimple_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_0__);
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_node_modules_vue_loader_lib_index_js_vue_loader_options_UserRowSimple_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_node_modules_vue_loader_lib_index_js_vue_loader_options_UserRowSimple_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_node_modules_vue_loader_lib_index_js_vue_loader_options_UserRowSimple_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_node_modules_vue_loader_lib_index_js_vue_loader_options_UserRowSimple_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_node_modules_vue_loader_lib_index_js_vue_loader_options_UserRowSimple_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
@@ -548,7 +548,7 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_node_modules_vue_loader_lib_index_js_vue_loader_options_Users_vue_vue_type_style_index_0_id_889b7562_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../node_modules/vue-style-loader!../../../../node_modules/css-loader/dist/cjs.js!../../../../node_modules/vue-loader/lib/loaders/stylePostLoader.js!../../../../node_modules/sass-loader/dist/cjs.js!../../../../node_modules/vue-loader/lib??vue-loader-options!./Users.vue?vue&type=style&index=0&id=889b7562&lang=scss&scoped=true& */ "./node_modules/vue-style-loader/index.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/vue-loader/lib/index.js?!./apps/settings/src/views/Users.vue?vue&type=style&index=0&id=889b7562&lang=scss&scoped=true&");
 /* harmony import */ var _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_node_modules_vue_loader_lib_index_js_vue_loader_options_Users_vue_vue_type_style_index_0_id_889b7562_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_node_modules_vue_loader_lib_index_js_vue_loader_options_Users_vue_vue_type_style_index_0_id_889b7562_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_node_modules_vue_loader_lib_index_js_vue_loader_options_Users_vue_vue_type_style_index_0_id_889b7562_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_node_modules_vue_loader_lib_index_js_vue_loader_options_Users_vue_vue_type_style_index_0_id_889b7562_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_node_modules_vue_loader_lib_index_js_vue_loader_options_Users_vue_vue_type_style_index_0_id_889b7562_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_node_modules_vue_loader_lib_index_js_vue_loader_options_Users_vue_vue_type_style_index_0_id_889b7562_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_node_modules_vue_style_loader_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_node_modules_vue_loader_lib_index_js_vue_loader_options_Users_vue_vue_type_style_index_0_id_889b7562_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
@@ -2521,6 +2521,8 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 //
 //
 //
+//
+//
 
 
 
@@ -3011,7 +3013,7 @@ module.exports = exports;
 var ___CSS_LOADER_API_IMPORT___ = __webpack_require__(/*! ../../../../node_modules/css-loader/dist/runtime/api.js */ "./node_modules/css-loader/dist/runtime/api.js");
 exports = ___CSS_LOADER_API_IMPORT___(false);
 // Module
-exports.push([module.i, "#usergrouplist #addgroup[data-v-889b7562] .app-navigation-entry__utils {\n  display: none;\n}\n", ""]);
+exports.push([module.i, ".app-navigation__list #addgroup[data-v-889b7562] .app-navigation-entry__utils {\n  display: none;\n}\n", ""]);
 // Exports
 module.exports = exports;
 
@@ -4401,91 +4403,50 @@ var render = function() {
     [
       _c(
         "AppNavigation",
-        [
-          _c("AppNavigationNew", {
-            attrs: {
-              "button-id": "new-user-button",
-              text: _vm.t("settings", "New user"),
-              "button-class": "icon-add"
-            },
-            on: { click: _vm.toggleNewUserMenu }
-          }),
-          _vm._v(" "),
-          _c(
-            "ul",
-            { attrs: { id: "usergrouplist" } },
-            [
-              _c("AppNavigationItem", {
-                ref: "addGroup",
-                attrs: {
-                  id: "addgroup",
-                  "edit-placeholder": _vm.t("settings", "Enter group name"),
-                  editable: true,
-                  loading: _vm.loadingAddGroup,
-                  title: _vm.t("settings", "Add group"),
-                  icon: "icon-add"
-                },
-                on: {
-                  click: function($event) {
-                    return _vm.toggleAddGroupEntry(true)
-                  },
-                  "update:title": _vm.createGroup
-                }
-              }),
-              _vm._v(" "),
-              _c(
-                "AppNavigationItem",
-                {
-                  attrs: {
-                    id: "everyone",
-                    exact: true,
-                    title: _vm.t("settings", "Everyone"),
-                    to: { name: "users" },
-                    icon: "icon-contacts-dark"
-                  }
-                },
-                [
-                  _vm.userCount > 0
-                    ? _c(
-                        "AppNavigationCounter",
-                        { attrs: { slot: "counter" }, slot: "counter" },
-                        [
-                          _vm._v(
-                            "\n\t\t\t\t\t" +
-                              _vm._s(_vm.userCount) +
-                              "\n\t\t\t\t"
-                          )
-                        ]
-                      )
-                    : _vm._e()
-                ],
-                1
-              ),
-              _vm._v(" "),
-              _vm.settings.isAdmin
-                ? _c(
+        {
+          scopedSlots: _vm._u([
+            {
+              key: "list",
+              fn: function() {
+                return [
+                  _c("AppNavigationItem", {
+                    ref: "addGroup",
+                    attrs: {
+                      id: "addgroup",
+                      "edit-placeholder": _vm.t("settings", "Enter group name"),
+                      editable: true,
+                      loading: _vm.loadingAddGroup,
+                      title: _vm.t("settings", "Add group"),
+                      icon: "icon-add"
+                    },
+                    on: {
+                      click: function($event) {
+                        return _vm.toggleAddGroupEntry(true)
+                      },
+                      "update:title": _vm.createGroup
+                    }
+                  }),
+                  _vm._v(" "),
+                  _c(
                     "AppNavigationItem",
                     {
                       attrs: {
-                        id: "admin",
+                        id: "everyone",
                         exact: true,
-                        title: _vm.t("settings", "Admins"),
-                        to: {
-                          name: "group",
-                          params: { selectedGroup: "admin" }
-                        },
-                        icon: "icon-user-admin"
+                        title: _vm.t("settings", "Everyone"),
+                        to: { name: "users" },
+                        icon: "icon-contacts-dark"
                       }
                     },
                     [
-                      _vm.adminGroupMenu.count
+                      _vm.userCount > 0
                         ? _c(
                             "AppNavigationCounter",
                             { attrs: { slot: "counter" }, slot: "counter" },
                             [
                               _vm._v(
                                 "\n\t\t\t\t\t" +
-                                  _vm._s(_vm.adminGroupMenu.count) +
+                                  _vm._s(_vm.userCount) +
                                   "\n\t\t\t\t"
                               )
                             ]
@@ -4493,368 +4454,439 @@ var render = function() {
                         : _vm._e()
                     ],
                     1
-                  )
-                : _vm._e(),
-              _vm._v(" "),
-              _vm.disabledGroupMenu.usercount > 0 ||
-              _vm.disabledGroupMenu.usercount === -1
-                ? _c(
-                    "AppNavigationItem",
-                    {
-                      attrs: {
-                        id: "disabled",
-                        exact: true,
-                        title: _vm.t("settings", "Disabled users"),
-                        to: {
-                          name: "group",
-                          params: { selectedGroup: "disabled" }
+                  ),
+                  _vm._v(" "),
+                  _vm.settings.isAdmin
+                    ? _c(
+                        "AppNavigationItem",
+                        {
+                          attrs: {
+                            id: "admin",
+                            exact: true,
+                            title: _vm.t("settings", "Admins"),
+                            to: {
+                              name: "group",
+                              params: { selectedGroup: "admin" }
+                            },
+                            icon: "icon-user-admin"
+                          }
                         },
-                        icon: "icon-disabled-users"
-                      }
-                    },
-                    [
-                      _vm.disabledGroupMenu.usercount > 0
-                        ? _c(
-                            "AppNavigationCounter",
-                            { attrs: { slot: "counter" }, slot: "counter" },
-                            [
-                              _vm._v(
-                                "\n\t\t\t\t\t" +
-                                  _vm._s(_vm.disabledGroupMenu.usercount) +
-                                  "\n\t\t\t\t"
+                        [
+                          _vm.adminGroupMenu.count
+                            ? _c(
+                                "AppNavigationCounter",
+                                { attrs: { slot: "counter" }, slot: "counter" },
+                                [
+                                  _vm._v(
+                                    "\n\t\t\t\t\t" +
+                                      _vm._s(_vm.adminGroupMenu.count) +
+                                      "\n\t\t\t\t"
+                                  )
+                                ]
                               )
-                            ]
-                          )
-                        : _vm._e()
-                    ],
-                    1
-                  )
-                : _vm._e(),
-              _vm._v(" "),
-              _vm.groupList.length > 0
-                ? _c("AppNavigationCaption", {
-                    attrs: { title: _vm.t("settings", "Groups") }
-                  })
-                : _vm._e(),
-              _vm._v(" "),
-              _vm._l(_vm.groupList, function(group) {
-                return _c(
-                  "AppNavigationItem",
-                  {
-                    key: group.id,
-                    attrs: {
-                      exact: true,
-                      title: group.title,
-                      to: {
-                        name: "group",
-                        params: { selectedGroup: encodeURIComponent(group.id) }
-                      }
-                    }
-                  },
-                  [
-                    group.count
-                      ? _c(
-                          "AppNavigationCounter",
-                          { attrs: { slot: "counter" }, slot: "counter" },
-                          [
-                            _vm._v(
-                              "\n\t\t\t\t\t" +
-                                _vm._s(group.count) +
-                                "\n\t\t\t\t"
-                            )
-                          ]
-                        )
-                      : _vm._e(),
-                    _vm._v(" "),
-                    _c(
-                      "template",
-                      { slot: "actions" },
+                            : _vm._e()
+                        ],
+                        1
+                      )
+                    : _vm._e(),
+                  _vm._v(" "),
+                  _vm.disabledGroupMenu.usercount > 0 ||
+                  _vm.disabledGroupMenu.usercount === -1
+                    ? _c(
+                        "AppNavigationItem",
+                        {
+                          attrs: {
+                            id: "disabled",
+                            exact: true,
+                            title: _vm.t("settings", "Disabled users"),
+                            to: {
+                              name: "group",
+                              params: { selectedGroup: "disabled" }
+                            },
+                            icon: "icon-disabled-users"
+                          }
+                        },
+                        [
+                          _vm.disabledGroupMenu.usercount > 0
+                            ? _c(
+                                "AppNavigationCounter",
+                                { attrs: { slot: "counter" }, slot: "counter" },
+                                [
+                                  _vm._v(
+                                    "\n\t\t\t\t\t" +
+                                      _vm._s(_vm.disabledGroupMenu.usercount) +
+                                      "\n\t\t\t\t"
+                                  )
+                                ]
+                              )
+                            : _vm._e()
+                        ],
+                        1
+                      )
+                    : _vm._e(),
+                  _vm._v(" "),
+                  _vm.groupList.length > 0
+                    ? _c("AppNavigationCaption", {
+                        attrs: { title: _vm.t("settings", "Groups") }
+                      })
+                    : _vm._e(),
+                  _vm._v(" "),
+                  _vm._l(_vm.groupList, function(group) {
+                    return _c(
+                      "AppNavigationItem",
+                      {
+                        key: group.id,
+                        attrs: {
+                          exact: true,
+                          title: group.title,
+                          to: {
+                            name: "group",
+                            params: {
+                              selectedGroup: encodeURIComponent(group.id)
+                            }
+                          }
+                        }
+                      },
                       [
-                        group.id !== "admin" &&
-                        group.id !== "disabled" &&
-                        _vm.settings.isAdmin
+                        group.count
                           ? _c(
-                              "ActionButton",
-                              {
-                                attrs: { icon: "icon-delete" },
-                                on: {
-                                  click: function($event) {
-                                    return _vm.removeGroup(group.id)
-                                  }
-                                }
-                              },
+                              "AppNavigationCounter",
+                              { attrs: { slot: "counter" }, slot: "counter" },
                               [
                                 _vm._v(
-                                  "\n\t\t\t\t\t\t" +
-                                    _vm._s(_vm.t("settings", "Remove group")) +
-                                    "\n\t\t\t\t\t"
+                                  "\n\t\t\t\t\t" +
+                                    _vm._s(group.count) +
+                                    "\n\t\t\t\t"
                                 )
                               ]
                             )
-                          : _vm._e()
+                          : _vm._e(),
+                        _vm._v(" "),
+                        _c(
+                          "template",
+                          { slot: "actions" },
+                          [
+                            group.id !== "admin" &&
+                            group.id !== "disabled" &&
+                            _vm.settings.isAdmin
+                              ? _c(
+                                  "ActionButton",
+                                  {
+                                    attrs: { icon: "icon-delete" },
+                                    on: {
+                                      click: function($event) {
+                                        return _vm.removeGroup(group.id)
+                                      }
+                                    }
+                                  },
+                                  [
+                                    _vm._v(
+                                      "\n\t\t\t\t\t\t" +
+                                        _vm._s(
+                                          _vm.t("settings", "Remove group")
+                                        ) +
+                                        "\n\t\t\t\t\t"
+                                    )
+                                  ]
+                                )
+                              : _vm._e()
+                          ],
+                          1
+                        )
                       ],
-                      1
+                      2
                     )
-                  ],
-                  2
-                )
-              })
-            ],
-            2
-          ),
-          _vm._v(" "),
-          _c("AppNavigationSettings", [
-            _c(
-              "div",
-              [
-                _c("p", [_vm._v(_vm._s(_vm.t("settings", "Default quota:")))]),
-                _vm._v(" "),
-                _c("Multiselect", {
-                  attrs: {
-                    value: _vm.defaultQuota,
-                    options: _vm.quotaOptions,
-                    "tag-placeholder": "create",
-                    placeholder: _vm.t("settings", "Select default quota"),
-                    label: "label",
-                    "track-by": "id",
-                    "allow-empty": false,
-                    taggable: true
-                  },
-                  on: { tag: _vm.validateQuota, input: _vm.setDefaultQuota }
-                })
-              ],
-              1
-            ),
-            _vm._v(" "),
-            _c("div", [
-              _c("input", {
-                directives: [
-                  {
-                    name: "model",
-                    rawName: "v-model",
-                    value: _vm.showLanguages,
-                    expression: "showLanguages"
-                  }
-                ],
-                staticClass: "checkbox",
-                attrs: { id: "showLanguages", type: "checkbox" },
-                domProps: {
-                  checked: Array.isArray(_vm.showLanguages)
-                    ? _vm._i(_vm.showLanguages, null) > -1
-                    : _vm.showLanguages
-                },
-                on: {
-                  change: function($event) {
-                    var $$a = _vm.showLanguages,
-                      $$el = $event.target,
-                      $$c = $$el.checked ? true : false
-                    if (Array.isArray($$a)) {
-                      var $$v = null,
-                        $$i = _vm._i($$a, $$v)
-                      if ($$el.checked) {
-                        $$i < 0 && (_vm.showLanguages = $$a.concat([$$v]))
-                      } else {
-                        $$i > -1 &&
-                          (_vm.showLanguages = $$a
-                            .slice(0, $$i)
-                            .concat($$a.slice($$i + 1)))
-                      }
-                    } else {
-                      _vm.showLanguages = $$c
-                    }
-                  }
-                }
-              }),
-              _vm._v(" "),
-              _c("label", { attrs: { for: "showLanguages" } }, [
-                _vm._v(_vm._s(_vm.t("settings", "Show Languages")))
-              ])
-            ]),
-            _vm._v(" "),
-            _c("div", [
-              _c("input", {
-                directives: [
-                  {
-                    name: "model",
-                    rawName: "v-model",
-                    value: _vm.showLastLogin,
-                    expression: "showLastLogin"
-                  }
-                ],
-                staticClass: "checkbox",
-                attrs: { id: "showLastLogin", type: "checkbox" },
-                domProps: {
-                  checked: Array.isArray(_vm.showLastLogin)
-                    ? _vm._i(_vm.showLastLogin, null) > -1
-                    : _vm.showLastLogin
-                },
-                on: {
-                  change: function($event) {
-                    var $$a = _vm.showLastLogin,
-                      $$el = $event.target,
-                      $$c = $$el.checked ? true : false
-                    if (Array.isArray($$a)) {
-                      var $$v = null,
-                        $$i = _vm._i($$a, $$v)
-                      if ($$el.checked) {
-                        $$i < 0 && (_vm.showLastLogin = $$a.concat([$$v]))
-                      } else {
-                        $$i > -1 &&
-                          (_vm.showLastLogin = $$a
-                            .slice(0, $$i)
-                            .concat($$a.slice($$i + 1)))
-                      }
-                    } else {
-                      _vm.showLastLogin = $$c
-                    }
-                  }
-                }
-              }),
-              _vm._v(" "),
-              _c("label", { attrs: { for: "showLastLogin" } }, [
-                _vm._v(_vm._s(_vm.t("settings", "Show last login")))
-              ])
-            ]),
-            _vm._v(" "),
-            _c("div", [
-              _c("input", {
-                directives: [
-                  {
-                    name: "model",
-                    rawName: "v-model",
-                    value: _vm.showUserBackend,
-                    expression: "showUserBackend"
-                  }
-                ],
-                staticClass: "checkbox",
-                attrs: { id: "showUserBackend", type: "checkbox" },
-                domProps: {
-                  checked: Array.isArray(_vm.showUserBackend)
-                    ? _vm._i(_vm.showUserBackend, null) > -1
-                    : _vm.showUserBackend
-                },
-                on: {
-                  change: function($event) {
-                    var $$a = _vm.showUserBackend,
-                      $$el = $event.target,
-                      $$c = $$el.checked ? true : false
-                    if (Array.isArray($$a)) {
-                      var $$v = null,
-                        $$i = _vm._i($$a, $$v)
-                      if ($$el.checked) {
-                        $$i < 0 && (_vm.showUserBackend = $$a.concat([$$v]))
-                      } else {
-                        $$i > -1 &&
-                          (_vm.showUserBackend = $$a
-                            .slice(0, $$i)
-                            .concat($$a.slice($$i + 1)))
-                      }
-                    } else {
-                      _vm.showUserBackend = $$c
-                    }
-                  }
-                }
-              }),
-              _vm._v(" "),
-              _c("label", { attrs: { for: "showUserBackend" } }, [
-                _vm._v(_vm._s(_vm.t("settings", "Show user backend")))
-              ])
-            ]),
-            _vm._v(" "),
-            _c("div", [
-              _c("input", {
-                directives: [
-                  {
-                    name: "model",
-                    rawName: "v-model",
-                    value: _vm.showStoragePath,
-                    expression: "showStoragePath"
-                  }
-                ],
-                staticClass: "checkbox",
-                attrs: { id: "showStoragePath", type: "checkbox" },
-                domProps: {
-                  checked: Array.isArray(_vm.showStoragePath)
-                    ? _vm._i(_vm.showStoragePath, null) > -1
-                    : _vm.showStoragePath
-                },
-                on: {
-                  change: function($event) {
-                    var $$a = _vm.showStoragePath,
-                      $$el = $event.target,
-                      $$c = $$el.checked ? true : false
-                    if (Array.isArray($$a)) {
-                      var $$v = null,
-                        $$i = _vm._i($$a, $$v)
-                      if ($$el.checked) {
-                        $$i < 0 && (_vm.showStoragePath = $$a.concat([$$v]))
-                      } else {
-                        $$i > -1 &&
-                          (_vm.showStoragePath = $$a
-                            .slice(0, $$i)
-                            .concat($$a.slice($$i + 1)))
-                      }
-                    } else {
-                      _vm.showStoragePath = $$c
-                    }
-                  }
-                }
-              }),
-              _vm._v(" "),
-              _c("label", { attrs: { for: "showStoragePath" } }, [
-                _vm._v(_vm._s(_vm.t("settings", "Show storage path")))
-              ])
-            ]),
-            _vm._v(" "),
-            _c("div", [
-              _c("input", {
-                directives: [
-                  {
-                    name: "model",
-                    rawName: "v-model",
-                    value: _vm.sendWelcomeMail,
-                    expression: "sendWelcomeMail"
-                  }
-                ],
-                staticClass: "checkbox",
-                attrs: {
-                  id: "sendWelcomeMail",
-                  disabled: _vm.loadingSendMail,
-                  type: "checkbox"
-                },
-                domProps: {
-                  checked: Array.isArray(_vm.sendWelcomeMail)
-                    ? _vm._i(_vm.sendWelcomeMail, null) > -1
-                    : _vm.sendWelcomeMail
-                },
-                on: {
-                  change: function($event) {
-                    var $$a = _vm.sendWelcomeMail,
-                      $$el = $event.target,
-                      $$c = $$el.checked ? true : false
-                    if (Array.isArray($$a)) {
-                      var $$v = null,
-                        $$i = _vm._i($$a, $$v)
-                      if ($$el.checked) {
-                        $$i < 0 && (_vm.sendWelcomeMail = $$a.concat([$$v]))
-                      } else {
-                        $$i > -1 &&
-                          (_vm.sendWelcomeMail = $$a
-                            .slice(0, $$i)
-                            .concat($$a.slice($$i + 1)))
-                      }
-                    } else {
-                      _vm.sendWelcomeMail = $$c
-                    }
-                  }
-                }
-              }),
-              _vm._v(" "),
-              _c("label", { attrs: { for: "sendWelcomeMail" } }, [
-                _vm._v(_vm._s(_vm.t("settings", "Send email to new user")))
-              ])
-            ])
+                  })
+                ]
+              },
+              proxy: true
+            },
+            {
+              key: "footer",
+              fn: function() {
+                return [
+                  _c("AppNavigationSettings", [
+                    _c(
+                      "div",
+                      [
+                        _c("p", [
+                          _vm._v(_vm._s(_vm.t("settings", "Default quota:")))
+                        ]),
+                        _vm._v(" "),
+                        _c("Multiselect", {
+                          attrs: {
+                            value: _vm.defaultQuota,
+                            options: _vm.quotaOptions,
+                            "tag-placeholder": "create",
+                            placeholder: _vm.t(
+                              "settings",
+                              "Select default quota"
+                            ),
+                            label: "label",
+                            "track-by": "id",
+                            "allow-empty": false,
+                            taggable: true
+                          },
+                          on: {
+                            tag: _vm.validateQuota,
+                            input: _vm.setDefaultQuota
+                          }
+                        })
+                      ],
+                      1
+                    ),
+                    _vm._v(" "),
+                    _c("div", [
+                      _c("input", {
+                        directives: [
+                          {
+                            name: "model",
+                            rawName: "v-model",
+                            value: _vm.showLanguages,
+                            expression: "showLanguages"
+                          }
+                        ],
+                        staticClass: "checkbox",
+                        attrs: { id: "showLanguages", type: "checkbox" },
+                        domProps: {
+                          checked: Array.isArray(_vm.showLanguages)
+                            ? _vm._i(_vm.showLanguages, null) > -1
+                            : _vm.showLanguages
+                        },
+                        on: {
+                          change: function($event) {
+                            var $$a = _vm.showLanguages,
+                              $$el = $event.target,
+                              $$c = $$el.checked ? true : false
+                            if (Array.isArray($$a)) {
+                              var $$v = null,
+                                $$i = _vm._i($$a, $$v)
+                              if ($$el.checked) {
+                                $$i < 0 &&
+                                  (_vm.showLanguages = $$a.concat([$$v]))
+                              } else {
+                                $$i > -1 &&
+                                  (_vm.showLanguages = $$a
+                                    .slice(0, $$i)
+                                    .concat($$a.slice($$i + 1)))
+                              }
+                            } else {
+                              _vm.showLanguages = $$c
+                            }
+                          }
+                        }
+                      }),
+                      _vm._v(" "),
+                      _c("label", { attrs: { for: "showLanguages" } }, [
+                        _vm._v(_vm._s(_vm.t("settings", "Show Languages")))
+                      ])
+                    ]),
+                    _vm._v(" "),
+                    _c("div", [
+                      _c("input", {
+                        directives: [
+                          {
+                            name: "model",
+                            rawName: "v-model",
+                            value: _vm.showLastLogin,
+                            expression: "showLastLogin"
+                          }
+                        ],
+                        staticClass: "checkbox",
+                        attrs: { id: "showLastLogin", type: "checkbox" },
+                        domProps: {
+                          checked: Array.isArray(_vm.showLastLogin)
+                            ? _vm._i(_vm.showLastLogin, null) > -1
+                            : _vm.showLastLogin
+                        },
+                        on: {
+                          change: function($event) {
+                            var $$a = _vm.showLastLogin,
+                              $$el = $event.target,
+                              $$c = $$el.checked ? true : false
+                            if (Array.isArray($$a)) {
+                              var $$v = null,
+                                $$i = _vm._i($$a, $$v)
+                              if ($$el.checked) {
+                                $$i < 0 &&
+                                  (_vm.showLastLogin = $$a.concat([$$v]))
+                              } else {
+                                $$i > -1 &&
+                                  (_vm.showLastLogin = $$a
+                                    .slice(0, $$i)
+                                    .concat($$a.slice($$i + 1)))
+                              }
+                            } else {
+                              _vm.showLastLogin = $$c
+                            }
+                          }
+                        }
+                      }),
+                      _vm._v(" "),
+                      _c("label", { attrs: { for: "showLastLogin" } }, [
+                        _vm._v(_vm._s(_vm.t("settings", "Show last login")))
+                      ])
+                    ]),
+                    _vm._v(" "),
+                    _c("div", [
+                      _c("input", {
+                        directives: [
+                          {
+                            name: "model",
+                            rawName: "v-model",
+                            value: _vm.showUserBackend,
+                            expression: "showUserBackend"
+                          }
+                        ],
+                        staticClass: "checkbox",
+                        attrs: { id: "showUserBackend", type: "checkbox" },
+                        domProps: {
+                          checked: Array.isArray(_vm.showUserBackend)
+                            ? _vm._i(_vm.showUserBackend, null) > -1
+                            : _vm.showUserBackend
+                        },
+                        on: {
+                          change: function($event) {
+                            var $$a = _vm.showUserBackend,
+                              $$el = $event.target,
+                              $$c = $$el.checked ? true : false
+                            if (Array.isArray($$a)) {
+                              var $$v = null,
+                                $$i = _vm._i($$a, $$v)
+                              if ($$el.checked) {
+                                $$i < 0 &&
+                                  (_vm.showUserBackend = $$a.concat([$$v]))
+                              } else {
+                                $$i > -1 &&
+                                  (_vm.showUserBackend = $$a
+                                    .slice(0, $$i)
+                                    .concat($$a.slice($$i + 1)))
+                              }
+                            } else {
+                              _vm.showUserBackend = $$c
+                            }
+                          }
+                        }
+                      }),
+                      _vm._v(" "),
+                      _c("label", { attrs: { for: "showUserBackend" } }, [
+                        _vm._v(_vm._s(_vm.t("settings", "Show user backend")))
+                      ])
+                    ]),
+                    _vm._v(" "),
+                    _c("div", [
+                      _c("input", {
+                        directives: [
+                          {
+                            name: "model",
+                            rawName: "v-model",
+                            value: _vm.showStoragePath,
+                            expression: "showStoragePath"
+                          }
+                        ],
+                        staticClass: "checkbox",
+                        attrs: { id: "showStoragePath", type: "checkbox" },
+                        domProps: {
+                          checked: Array.isArray(_vm.showStoragePath)
+                            ? _vm._i(_vm.showStoragePath, null) > -1
+                            : _vm.showStoragePath
+                        },
+                        on: {
+                          change: function($event) {
+                            var $$a = _vm.showStoragePath,
+                              $$el = $event.target,
+                              $$c = $$el.checked ? true : false
+                            if (Array.isArray($$a)) {
+                              var $$v = null,
+                                $$i = _vm._i($$a, $$v)
+                              if ($$el.checked) {
+                                $$i < 0 &&
+                                  (_vm.showStoragePath = $$a.concat([$$v]))
+                              } else {
+                                $$i > -1 &&
+                                  (_vm.showStoragePath = $$a
+                                    .slice(0, $$i)
+                                    .concat($$a.slice($$i + 1)))
+                              }
+                            } else {
+                              _vm.showStoragePath = $$c
+                            }
+                          }
+                        }
+                      }),
+                      _vm._v(" "),
+                      _c("label", { attrs: { for: "showStoragePath" } }, [
+                        _vm._v(_vm._s(_vm.t("settings", "Show storage path")))
+                      ])
+                    ]),
+                    _vm._v(" "),
+                    _c("div", [
+                      _c("input", {
+                        directives: [
+                          {
+                            name: "model",
+                            rawName: "v-model",
+                            value: _vm.sendWelcomeMail,
+                            expression: "sendWelcomeMail"
+                          }
+                        ],
+                        staticClass: "checkbox",
+                        attrs: {
+                          id: "sendWelcomeMail",
+                          disabled: _vm.loadingSendMail,
+                          type: "checkbox"
+                        },
+                        domProps: {
+                          checked: Array.isArray(_vm.sendWelcomeMail)
+                            ? _vm._i(_vm.sendWelcomeMail, null) > -1
+                            : _vm.sendWelcomeMail
+                        },
+                        on: {
+                          change: function($event) {
+                            var $$a = _vm.sendWelcomeMail,
+                              $$el = $event.target,
+                              $$c = $$el.checked ? true : false
+                            if (Array.isArray($$a)) {
+                              var $$v = null,
+                                $$i = _vm._i($$a, $$v)
+                              if ($$el.checked) {
+                                $$i < 0 &&
+                                  (_vm.sendWelcomeMail = $$a.concat([$$v]))
+                              } else {
+                                $$i > -1 &&
+                                  (_vm.sendWelcomeMail = $$a
+                                    .slice(0, $$i)
+                                    .concat($$a.slice($$i + 1)))
+                              }
+                            } else {
+                              _vm.sendWelcomeMail = $$c
+                            }
+                          }
+                        }
+                      }),
+                      _vm._v(" "),
+                      _c("label", { attrs: { for: "sendWelcomeMail" } }, [
+                        _vm._v(
+                          _vm._s(_vm.t("settings", "Send email to new user"))
+                        )
+                      ])
+                    ])
+                  ])
+                ]
+              },
+              proxy: true
+            }
           ])
+        },
+        [
+          _c("AppNavigationNew", {
+            attrs: {
+              "button-id": "new-user-button",
+              text: _vm.t("settings", "New user"),
+              "button-class": "icon-add"
+            },
+            on: { click: _vm.toggleNewUserMenu }
+          })
         ],
         1
       ),
@@ -4978,4 +5010,4 @@ if(false) {}
 /***/ })
 
 }]);
-//# sourceMappingURL=vue-2.js.map?v=888f47793ecddf751d7a
+//# sourceMappingURL=vue-2.js.map?v=b42f167f76ca1740ec0a

apps/settings/src/App.vue

@@ -27,7 +27,7 @@
 <script>
 export default {
 	name: 'App',
-	beforeMount: function() {
+	beforeMount() {
 		// importing server data into the store
 		const serverDataElmt = document.getElementById('serverData')
 		if (serverDataElmt !== null) {

apps/settings/src/components/AppList/AppItem.vue

@@ -138,7 +138,7 @@ export default {
 		},
 	},
 	watch: {
-		'$route.params.id': function(id) {
+		'$route.params.id'(id) {
 			this.isSelected = (this.app.id === id)
 		},
 	},

apps/settings/src/components/AppManagement.vue

@@ -76,7 +76,7 @@ export default {
 			}
 			return false
 		},
-		setGroupLimit: function() {
+		setGroupLimit() {
 			if (!this.groupCheckedAppsData) {
 				this.$store.dispatch('enableApp', { appId: this.app.id, groups: [] })
 			}
@@ -93,7 +93,7 @@ export default {
 		},
 		addGroupLimitation(group) {
 			const groups = this.app.groups.concat([]).concat([group.id])
-			this.$store.dispatch('enableApp', { appId: this.app.id, groups: groups })
+			this.$store.dispatch('enableApp', { appId: this.app.id, groups })
 		},
 		removeGroupLimitation(group) {
 			const currentGroups = this.app.groups.concat([])
@@ -104,32 +104,32 @@ export default {
 			this.$store.dispatch('enableApp', { appId: this.app.id, groups: currentGroups })
 		},
 		forceEnable(appId) {
-			this.$store.dispatch('forceEnableApp', { appId: appId, groups: [] })
+			this.$store.dispatch('forceEnableApp', { appId, groups: [] })
 				.then((response) => { OC.Settings.Apps.rebuildNavigation() })
 				.catch((error) => { OC.Notification.show(error) })
 		},
 		enable(appId) {
-			this.$store.dispatch('enableApp', { appId: appId, groups: [] })
+			this.$store.dispatch('enableApp', { appId, groups: [] })
 				.then((response) => { OC.Settings.Apps.rebuildNavigation() })
 				.catch((error) => { OC.Notification.show(error) })
 		},
 		disable(appId) {
-			this.$store.dispatch('disableApp', { appId: appId })
+			this.$store.dispatch('disableApp', { appId })
 				.then((response) => { OC.Settings.Apps.rebuildNavigation() })
 				.catch((error) => { OC.Notification.show(error) })
 		},
 		remove(appId) {
-			this.$store.dispatch('uninstallApp', { appId: appId })
+			this.$store.dispatch('uninstallApp', { appId })
 				.then((response) => { OC.Settings.Apps.rebuildNavigation() })
 				.catch((error) => { OC.Notification.show(error) })
 		},
 		install(appId) {
-			this.$store.dispatch('enableApp', { appId: appId })
+			this.$store.dispatch('enableApp', { appId })
 				.then((response) => { OC.Settings.Apps.rebuildNavigation() })
 				.catch((error) => { OC.Notification.show(error) })
 		},
 		update(appId) {
-			this.$store.dispatch('updateApp', { appId: appId })
+			this.$store.dispatch('updateApp', { appId })
 				.then((response) => { OC.Settings.Apps.rebuildNavigation() })
 				.catch((error) => { OC.Notification.show(error) })
 		},

apps/settings/src/components/UserList.vue

@@ -385,7 +385,7 @@ export default {
 	},
 	watch: {
 		// watch url change and group select
-		selectedGroup: function(val, old) {
+		selectedGroup(val, old) {
 			// if selected is the disabled group but it's empty
 			this.redirectIfDisabled()
 			this.$store.commit('resetUsers')
@@ -395,7 +395,7 @@ export default {
 
 		// make sure the infiniteLoading state is changed if we manually
 		// add/remove data from the store
-		usersCount: function(val, old) {
+		usersCount(val, old) {
 			// deleting the last user, reset the list
 			if (val === 0 && old === 1) {
 				this.$refs.infiniteLoading.stateChanger.reset()

apps/settings/src/components/UserList/UserRow.vue

@@ -367,11 +367,11 @@ export default {
 		wipeUserDevices() {
 			const userid = this.user.id
 			OC.dialogs.confirmDestructive(
-				t('settings', 'In case of lost device or exiting the organization, this can remotely wipe the Nextcloud data from all devices associated with {userid}. Only works if the devices are connected to the internet.', { userid: userid }),
+				t('settings', 'In case of lost device or exiting the organization, this can remotely wipe the Nextcloud data from all devices associated with {userid}. Only works if the devices are connected to the internet.', { userid }),
 				t('settings', 'Remote wipe of devices'),
 				{
 					type: OC.dialogs.YES_NO_BUTTONS,
-					confirm: t('settings', 'Wipe {userid}\'s devices', { userid: userid }),
+					confirm: t('settings', 'Wipe {userid}\'s devices', { userid }),
 					confirmClasses: 'error',
 					cancel: t('settings', 'Cancel'),
 				},
@@ -393,11 +393,11 @@ export default {
 		deleteUser() {
 			const userid = this.user.id
 			OC.dialogs.confirmDestructive(
-				t('settings', 'Fully delete {userid}\'s account including all their personal files, app data, etc.', { userid: userid }),
+				t('settings', 'Fully delete {userid}\'s account including all their personal files, app data, etc.', { userid }),
 				t('settings', 'Account deletion'),
 				{
 					type: OC.dialogs.YES_NO_BUTTONS,
-					confirm: t('settings', 'Delete {userid}\'s account', { userid: userid }),
+					confirm: t('settings', 'Delete {userid}\'s account', { userid }),
 					confirmClasses: 'error',
 					cancel: t('settings', 'Cancel'),
 				},

apps/settings/src/mixins/UserRowMixin.js

@@ -163,8 +163,8 @@ export default {
 			return generateUrl(
 				'/avatar/{user}/{size}?v={version}',
 				{
-					user: user,
-					size: size,
+					user,
+					size,
 					version: oc_userconfig.avatar.version,
 				}
 			)

apps/settings/src/store/api.js

@@ -76,6 +76,6 @@ export default {
 		return axios.put(sanitize(url), data)
 	},
 	delete(url, data) {
-		return axios.delete(sanitize(url), { data: data })
+		return axios.delete(sanitize(url), { data })
 	},
 }

apps/settings/src/views/Apps.vue

@@ -163,7 +163,7 @@ export default {
 		},
 	},
 	watch: {
-		category: function(val, old) {
+		category(val, old) {
 			this.setSearch('')
 		},
 	},

apps/systemtags/src/app.js

@@ -18,7 +18,7 @@
 
 	OCA.SystemTags.App = {
 
-		initFileList: function($el) {
+		initFileList($el) {
 			if (this._fileList) {
 				return this._fileList
 			}
@@ -41,13 +41,13 @@
 			return this._fileList
 		},
 
-		removeFileList: function() {
+		removeFileList() {
 			if (this._fileList) {
 				this._fileList.$fileList.empty()
 			}
 		},
 
-		_createFileActions: function() {
+		_createFileActions() {
 			// inherit file actions from the files app
 			const fileActions = new OCA.Files.FileActions()
 			// note: not merging the legacy actions because legacy apps are not
@@ -73,7 +73,7 @@
 			return fileActions
 		},
 
-		_onActionsUpdated: function(ev) {
+		_onActionsUpdated(ev) {
 			if (!this._fileList) {
 				return
 			}
@@ -91,7 +91,7 @@
 		/**
 		 * Destroy the app
 		 */
-		destroy: function() {
+		destroy() {
 			OCA.Files.fileActions.off('setDefault.app-systemtags', this._onActionsUpdated)
 			OCA.Files.fileActions.off('registerAction.app-systemtags', this._onActionsUpdated)
 			this.removeFileList()

apps/systemtags/src/filesplugin.js

@@ -26,7 +26,7 @@
 			'files.public',
 		],
 
-		attach: function(fileList) {
+		attach(fileList) {
 			if (this.ignoreLists.indexOf(fileList.id) >= 0) {
 				return
 			}

apps/systemtags/src/systemtagsfilelist.js

@@ -48,7 +48,7 @@
 			 * @param {Object} $el container element
 			 * @param {Object} [options] map of options, see other parameters
 			 */
-			initialize: function($el, options) {
+			initialize($el, options) {
 				OCA.Files.FileList.prototype.initialize.apply(this, arguments)
 				if (this.initialized) {
 					return
@@ -66,24 +66,24 @@
 				this._initFilterField($controls)
 			},
 
-			destroy: function() {
+			destroy() {
 				this.$filterField.remove()
 
 				OCA.Files.FileList.prototype.destroy.apply(this, arguments)
 			},
 
-			_getLastUsedTags: function() {
+			_getLastUsedTags() {
 				const self = this
 				$.ajax({
 					type: 'GET',
 					url: OC.generateUrl('/apps/systemtags/lastused'),
-					success: function(response) {
+					success(response) {
 						self._lastUsedTags = response
 					},
 				})
 			},
 
-			_initFilterField: function($container) {
+			_initFilterField($container) {
 				const self = this
 				this.$filterField = $('<input type="hidden" name="tags"/>')
 				$container.append(this.$filterField)
@@ -95,11 +95,11 @@
 					separator: ',',
 					query: _.bind(this._queryTagsAutocomplete, this),
 
-					id: function(tag) {
+					id(tag) {
 						return tag.id
 					},
 
-					initSelection: function(element, callback) {
+					initSelection(element, callback) {
 						const val = $(element)
 							.val()
 							.trim()
@@ -108,7 +108,7 @@
 							const tags = []
 
 							OC.SystemTags.collection.fetch({
-								success: function() {
+								success() {
 									_.each(tagIds, function(tagId) {
 										const tag = OC.SystemTags.collection.get(
 											tagId
@@ -127,16 +127,16 @@
 						}
 					},
 
-					formatResult: function(tag) {
+					formatResult(tag) {
 						return OC.SystemTags.getDescriptiveTag(tag)
 					},
 
-					formatSelection: function(tag) {
+					formatSelection(tag) {
 						return OC.SystemTags.getDescriptiveTag(tag)[0]
 							.outerHTML
 					},
 
-					sortResults: function(results) {
+					sortResults(results) {
 						results.sort(function(a, b) {
 							const aLastUsed = self._lastUsedTags.indexOf(a.id)
 							const bLastUsed = self._lastUsedTags.indexOf(b.id)
@@ -157,11 +157,11 @@
 						return results
 					},
 
-					escapeMarkup: function(m) {
+					escapeMarkup(m) {
 						// prevent double markup escape
 						return m
 					},
-					formatNoMatches: function() {
+					formatNoMatches() {
 						return t('systemtags', 'No tags found')
 					},
 				})
@@ -177,9 +177,9 @@
 			 *
 			 * @param {Object} query select2 query object
 			 */
-			_queryTagsAutocomplete: function(query) {
+			_queryTagsAutocomplete(query) {
 				OC.SystemTags.collection.fetch({
-					success: function() {
+					success() {
 						const results = OC.SystemTags.collection.filterByName(
 							query.term
 						)
@@ -196,7 +196,7 @@
 			 *
 			 * @param {Event} e the urlchanged event
 			 */
-			_onUrlChanged: function(e) {
+			_onUrlChanged(e) {
 				if (e.dir) {
 					const tags = _.filter(e.dir.split('/'), function(val) {
 						return val.trim() !== ''
@@ -207,7 +207,7 @@
 				}
 			},
 
-			_onTagsChanged: function(ev) {
+			_onTagsChanged(ev) {
 				const val = $(ev.target)
 					.val()
 					.trim()
@@ -225,7 +225,7 @@
 				this.reload()
 			},
 
-			updateEmptyContent: function() {
+			updateEmptyContent() {
 				const dir = this.getCurrentDirectory()
 				if (dir === '/') {
 					// root has special permissions
@@ -270,16 +270,16 @@
 				}
 			},
 
-			getDirectoryPermissions: function() {
+			getDirectoryPermissions() {
 				return OC.PERMISSION_READ | OC.PERMISSION_DELETE
 			},
 
-			updateStorageStatistics: function() {
+			updateStorageStatistics() {
 				// no op because it doesn't have
 				// storage info like free space / used space
 			},
 
-			reload: function() {
+			reload() {
 				// there is only root
 				this._setCurrentDir('/', false)
 
@@ -314,7 +314,7 @@
 				return this._reloadCall.then(callBack, callBack)
 			},
 
-			reloadCallback: function(status, result) {
+			reloadCallback(status, result) {
 				if (result) {
 					// prepend empty dir info because original handler
 					result.unshift({})

apps/systemtags/src/systemtagsinfoview.js

@@ -41,7 +41,7 @@
 			 */
 			_inputView: null,
 
-			initialize: function(options) {
+			initialize(options) {
 				const self = this
 				options = options || {}
 
@@ -50,7 +50,7 @@
 					allowActions: true,
 					allowCreate: true,
 					isAdmin: OC.isUserAdmin(),
-					initSelection: function(element, callback) {
+					initSelection(element, callback) {
 						callback(self.selectedTagsCollection.map(modelToSelection))
 					},
 				})
@@ -68,7 +68,7 @@
 			 * Event handler whenever a tag was selected
 			 * @param {Object} tag the tag to create
 			 */
-			_onSelectTag: function(tag) {
+			_onSelectTag(tag) {
 			// create a mapping entry for this tag
 				this.selectedTagsCollection.create(tag.toJSON())
 			},
@@ -79,7 +79,7 @@
 			 *
 			 * @param {string} tagId tag id
 			 */
-			_onDeselectTag: function(tagId) {
+			_onDeselectTag(tagId) {
 				this.selectedTagsCollection.get(tagId).destroy()
 			},
 
@@ -91,7 +91,7 @@
 			 *
 			 * @param {OC.Backbone.Model} changedTag tag model that has changed
 			 */
-			_onTagRenamedGlobally: function(changedTag) {
+			_onTagRenamedGlobally(changedTag) {
 			// also rename it in the selection, if applicable
 				const selectedTagMapping = this.selectedTagsCollection.get(changedTag.id)
 				if (selectedTagMapping) {
@@ -107,12 +107,12 @@
 			 *
 			 * @param {OC.Backbone.Model} tagId tag model that has changed
 			 */
-			_onTagDeletedGlobally: function(tagId) {
+			_onTagDeletedGlobally(tagId) {
 			// also rename it in the selection, if applicable
 				this.selectedTagsCollection.remove(tagId)
 			},
 
-			setFileInfo: function(fileInfo) {
+			setFileInfo(fileInfo) {
 				const self = this
 				if (!this._rendered) {
 					this.render()
@@ -121,7 +121,7 @@
 				if (fileInfo) {
 					this.selectedTagsCollection.setObjectId(fileInfo.id)
 					this.selectedTagsCollection.fetch({
-						success: function(collection) {
+						success(collection) {
 							collection.fetched = true
 
 							const appliedTags = collection.map(modelToSelection)
@@ -139,32 +139,32 @@
 			/**
 			 * Renders this details view
 			 */
-			render: function() {
+			render() {
 				this.$el.append(this._inputView.$el)
 				this._inputView.render()
 			},
 
-			isVisible: function() {
+			isVisible() {
 				return !this.$el.hasClass('hidden')
 			},
 
-			show: function() {
+			show() {
 				this.$el.removeClass('hidden')
 			},
 
-			hide: function() {
+			hide() {
 				this.$el.addClass('hidden')
 			},
 
-			toggle: function() {
+			toggle() {
 				this.$el.toggleClass('hidden')
 			},
 
-			openDropdown: function() {
+			openDropdown() {
 				this.$el.find('.systemTagsInputField').select2('open')
 			},
 
-			remove: function() {
+			remove() {
 				this._inputView.remove()
 			},
 		})

apps/twofactor_backupcodes/src/service/PrintService.js

@@ -1,7 +1,7 @@
 export function print(data) {
 	const name = OC.theme.name || 'Nextcloud'
-	const newTab = window.open('', t('twofactor_backupcodes', '{name} backup codes', { name: name }))
-	newTab.document.write('<h1>' + t('twofactor_backupcodes', '{name} backup codes', { name: name }) + '</h1>')
+	const newTab = window.open('', t('twofactor_backupcodes', '{name} backup codes', { name }))
+	newTab.document.write('<h1>' + t('twofactor_backupcodes', '{name} backup codes', { name }) + '</h1>')
 	newTab.document.write('<pre>' + data + '</pre>')
 	newTab.print()
 	newTab.close()

apps/twofactor_backupcodes/src/views/PersonalSettings.vue

@@ -55,7 +55,7 @@ export default {
 		}
 	},
 	computed: {
-		downloadUrl: function() {
+		downloadUrl() {
 			if (!this.codes) {
 				return ''
 			}
@@ -63,23 +63,23 @@ export default {
 				return prev + code + '\r\n'
 			}, ''))
 		},
-		downloadFilename: function() {
+		downloadFilename() {
 			const name = OC.theme.name || 'Nextcloud'
 			return name + '-backup-codes.txt'
 		},
-		enabled: function() {
+		enabled() {
 			return this.$store.state.enabled
 		},
-		total: function() {
+		total() {
 			return this.$store.state.total
 		},
-		used: function() {
+		used() {
 			return this.$store.state.used
 		},
-		codes: function() {
+		codes() {
 			return this.$store.state.codes
 		},
-		name: function() {
+		name() {
 			return OC.theme.name || 'Nextcloud'
 		},
 		haveCodes() {
@@ -87,7 +87,7 @@ export default {
 		},
 	},
 	methods: {
-		generateBackupCodes: function() {
+		generateBackupCodes() {
 			confirmPassword().then(() => {
 				// Hide old codes
 				this.generatingCodes = true
@@ -102,7 +102,7 @@ export default {
 			}).catch(console.error.bind(this))
 		},
 
-		getPrintData: function(codes) {
+		getPrintData(codes) {
 			if (!codes) {
 				return ''
 			}
@@ -111,7 +111,7 @@ export default {
 			}, '')
 		},
 
-		printCodes: function() {
+		printCodes() {
 			print(this.getPrintData(this.codes))
 		},
 	},

apps/updatenotification/src/components/UpdateNotification.vue

@@ -126,7 +126,7 @@ export default {
 		ClickOutside,
 		tooltip: VTooltip,
 	},
-	data: function() {
+	data() {
 		return {
 			newVersionString: '',
 			lastCheckedDate: '',
@@ -162,19 +162,19 @@ export default {
 	_$notifyGroups: null,
 
 	computed: {
-		newVersionAvailableString: function() {
+		newVersionAvailableString() {
 			return t('updatenotification', 'A new version is available: <strong>{newVersionString}</strong>', {
 				newVersionString: this.newVersionString,
 			})
 		},
 
-		lastCheckedOnString: function() {
+		lastCheckedOnString() {
 			return t('updatenotification', 'Checked on {lastCheckedDate}', {
 				lastCheckedDate: this.lastCheckedDate,
 			})
 		},
 
-		statusText: function() {
+		statusText() {
 			if (!this.isListFetched) {
 				return t('updatenotification', 'Checking apps for compatible updates')
 			}
@@ -192,7 +192,7 @@ export default {
 				: n('updatenotification', '<strong>%n</strong> app has no update for this version available', '<strong>%n</strong> apps have no update for this version available', this.missingAppUpdates.length)
 		},
 
-		whatsNew: function() {
+		whatsNew() {
 			if (this.whatsNewData.length === 0) {
 				return null
 			}
@@ -212,7 +212,7 @@ export default {
 			return whatsNew
 		},
 
-		channelList: function() {
+		channelList() {
 			const channelList = []
 
 			channelList.push({
@@ -251,11 +251,11 @@ export default {
 			return channelList
 		},
 
-		isNonDefaultChannel: function() {
+		isNonDefaultChannel() {
 			return this.currentChannel !== 'enterprise' && this.currentChannel !== 'stable' && this.currentChannel !== 'beta'
 		},
 
-		localizedChannelName: function() {
+		localizedChannelName() {
 			switch (this.currentChannel) {
 			case 'enterprise':
 				return t('updatenotification', 'Enterprise')
@@ -270,7 +270,7 @@ export default {
 	},
 
 	watch: {
-		notifyGroups: function(selectedOptions) {
+		notifyGroups(selectedOptions) {
 			if (!this.enableChangeWatcher) {
 				return
 			}
@@ -282,7 +282,7 @@ export default {
 
 			OCP.AppConfig.setValue('updatenotification', 'notify_groups', JSON.stringify(selectedGroups))
 		},
-		isNewVersionAvailable: function() {
+		isNewVersionAvailable() {
 			if (!this.isNewVersionAvailable) {
 				return
 			}
@@ -290,7 +290,7 @@ export default {
 			$.ajax({
 				url: generateOcsUrl('apps/updatenotification/api/v1/applist', 2) + this.newVersion,
 				type: 'GET',
-				beforeSend: function(request) {
+				beforeSend(request) {
 					request.setRequestHeader('Accept', 'application/json')
 				},
 				success: function(response) {
@@ -309,7 +309,7 @@ export default {
 			})
 		},
 	},
-	beforeMount: function() {
+	beforeMount() {
 		// Parse server data
 		const data = JSON.parse($('#updatenotification').attr('data-json'))
 
@@ -337,7 +337,7 @@ export default {
 			this.whatsNewData = this.whatsNewData.concat(data.changes.whatsNew.regular)
 		}
 	},
-	mounted: function() {
+	mounted() {
 		this._$el = $(this.$el)
 		this._$notifyGroups = this._$el.find('#oca_updatenotification_groups_list')
 		this._$notifyGroups.on('change', function() {
@@ -363,7 +363,7 @@ export default {
 		/**
 			 * Creates a new authentication token and loads the updater URL
 			 */
-		clickUpdaterButton: function() {
+		clickUpdaterButton() {
 			$.ajax({
 				url: generateUrl('/apps/updatenotification/credentials'),
 			}).success(function(token) {
@@ -383,16 +383,16 @@ export default {
 				form.submit()
 			})
 		},
-		changeReleaseChannelToEnterprise: function() {
+		changeReleaseChannelToEnterprise() {
 			this.changeReleaseChannel('enterprise')
 		},
-		changeReleaseChannelToStable: function() {
+		changeReleaseChannelToStable() {
 			this.changeReleaseChannel('stable')
 		},
-		changeReleaseChannelToBeta: function() {
+		changeReleaseChannelToBeta() {
 			this.changeReleaseChannel('beta')
 		},
-		changeReleaseChannel: function(channel) {
+		changeReleaseChannel(channel) {
 			this.currentChannel = channel
 
 			$.ajax({
@@ -401,29 +401,29 @@ export default {
 				data: {
 					'channel': this.currentChannel,
 				},
-				success: function(data) {
+				success(data) {
 					OC.msg.finishedAction('#channel_save_msg', data)
 				},
 			})
 
 			this.openedUpdateChannelMenu = false
 		},
-		toggleUpdateChannelMenu: function() {
+		toggleUpdateChannelMenu() {
 			this.openedUpdateChannelMenu = !this.openedUpdateChannelMenu
 		},
-		toggleHideMissingUpdates: function() {
+		toggleHideMissingUpdates() {
 			this.hideMissingUpdates = !this.hideMissingUpdates
 		},
-		toggleHideAvailableUpdates: function() {
+		toggleHideAvailableUpdates() {
 			this.hideAvailableUpdates = !this.hideAvailableUpdates
 		},
-		toggleMenu: function() {
+		toggleMenu() {
 			this.openedWhatsNew = !this.openedWhatsNew
 		},
-		closeUpdateChannelMenu: function() {
+		closeUpdateChannelMenu() {
 			this.openedUpdateChannelMenu = false
 		},
-		hideMenu: function() {
+		hideMenu() {
 			this.openedWhatsNew = false
 		},
 	},

apps/updatenotification/src/init.js

@@ -23,10 +23,10 @@ import Root from './components/UpdateNotification'
 
 Vue.mixin({
 	methods: {
-		t: function(app, text, vars, count, options) {
+		t(app, text, vars, count, options) {
 			return OC.L10N.translate(app, text, vars, count, options)
 		},
-		n: function(app, textSingular, textPlural, count, vars, options) {
+		n(app, textSingular, textPlural, count, vars, options) {
 			return OC.L10N.translatePlural(app, textSingular, textPlural, count, vars, options)
 		},
 	},

apps/workflowengine/src/components/Check.vue

@@ -99,7 +99,7 @@ export default {
 		},
 	},
 	watch: {
-		'check.operator': function() {
+		'check.operator'() {
 			this.validate()
 		},
 	},

apps/workflowengine/src/components/Checks/MultiselectTag/MultiselectTag.vue

@@ -84,7 +84,7 @@ export default {
 			this.inputValObjects = this.getValueObject()
 		},
 	},
-	beforeCreate: function() {
+	beforeCreate() {
 		this.uuid = uuid.toString()
 		uuid += 1
 		searchTags().then((result) => {

apps/workflowengine/src/components/Checks/RequestUserGroup.vue

@@ -60,8 +60,8 @@ export default {
 	},
 	data() {
 		return {
-			groups: groups,
-			status: status,
+			groups,
+			status,
 		}
 	},
 	computed: {

apps/workflowengine/src/mixins/valueMixin.js

@@ -39,7 +39,7 @@ const valueMixin = {
 	watch: {
 		value: {
 			immediate: true,
-			handler: function(value) {
+			handler(value) {
 				this.updateInternalValue(value)
 			},
 		},

apps/workflowengine/src/workflowengine.js

@@ -68,14 +68,14 @@ window.OCA.WorkflowEngine = Object.assign({}, OCA.WorkflowEngine, {
 	 *
 	 * @param {CheckPlugin} Plugin the plugin to register
 	 */
-	registerCheck: function(Plugin) {
+	registerCheck(Plugin) {
 		store.commit('addPluginCheck', Plugin)
 	},
 	/**
 	 *
 	 * @param {OperatorPlugin} Plugin the plugin to register
 	 */
-	registerOperator: function(Plugin) {
+	registerOperator(Plugin) {
 		store.commit('addPluginOperator', Plugin)
 	},
 })