From 53db05a1f67fc974dba904ec158b2d67fa72df95 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Sun, 9 Feb 2020 20:06:08 +0100
Subject: Start with webauthn

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
---
 core/src/components/login/LoginButton.vue          |  56 ++++++
 core/src/components/login/LoginForm.vue            |  19 +-
 .../src/components/login/PasswordLessLoginForm.vue | 208 +++++++++++++++++++++
 3 files changed, 269 insertions(+), 14 deletions(-)
 create mode 100644 core/src/components/login/LoginButton.vue
 create mode 100644 core/src/components/login/PasswordLessLoginForm.vue

(limited to 'core/src/components')

diff --git a/core/src/components/login/LoginButton.vue b/core/src/components/login/LoginButton.vue
new file mode 100644
index 00000000000..f7d426e6c63
--- /dev/null
+++ b/core/src/components/login/LoginButton.vue
@@ -0,0 +1,56 @@
+<!--
+  - @copyright 2020 Christoph Wurst <christoph@winzerhof-wurst.at>
+  -
+  - @author 2020 Christoph Wurst <christoph@winzerhof-wurst.at>
+  -
+  - @license GNU AGPL version 3 or any later version
+  -
+  - This program is free software: you can redistribute it and/or modify
+  - it under the terms of the GNU Affero General Public License as
+  - published by the Free Software Foundation, either version 3 of the
+  - License, or (at your option) any later version.
+  -
+  - This program is distributed in the hope that it will be useful,
+  - but WITHOUT ANY WARRANTY; without even the implied warranty of
+  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  - GNU Affero General Public License for more details.
+  -
+  - You should have received a copy of the GNU Affero General Public License
+  - along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<template>
+	<div id="submit-wrapper" @click="$emit('click')">
+		<input id="submit-form"
+			type="submit"
+			class="login primary"
+			title=""
+			:value="!loading ? t('core', 'Log in') : t('core', 'Logging in …')">
+		<div class="submit-icon"
+			:class="{
+				'icon-confirm-white': !loading,
+				'icon-loading-small': loading && invertedColors,
+				'icon-loading-small-dark': loading && !invertedColors,
+			}" />
+	</div>
+</template>
+
+<script>
+export default {
+	name: 'LoginButton',
+	props: {
+		loading: {
+			type: Boolean,
+			required: true,
+		},
+		invertedColors: {
+			type: Boolean,
+			default: false,
+		},
+	},
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/core/src/components/login/LoginForm.vue b/core/src/components/login/LoginForm.vue
index 687896ceb54..a20ce6dc4c2 100644
--- a/core/src/components/login/LoginForm.vue
+++ b/core/src/components/login/LoginForm.vue
@@ -20,7 +20,8 @@
   -->
 
 <template>
-	<form method="post"
+	<form ref="loginForm"
+		method="post"
 		name="login"
 		:action="OC.generateUrl('login')"
 		@submit="submit">
@@ -84,19 +85,7 @@
 				</a>
 			</p>
 
-			<div id="submit-wrapper">
-				<input id="submit-form"
-					type="submit"
-					class="login primary"
-					title=""
-					:value="!loading ? t('core', 'Log in') : t('core', 'Logging in …')">
-				<div class="submit-icon"
-					:class="{
-						'icon-confirm-white': !loading,
-						'icon-loading-small': loading && invertedColors,
-						'icon-loading-small-dark': loading && !invertedColors,
-					}" />
-			</div>
+			<LoginButton :loading="loading" :inverted-colors="invertedColors" />
 
 			<p v-if="invalidPassword"
 				class="warning wrongPasswordMsg">
@@ -135,9 +124,11 @@
 
 <script>
 import jstz from 'jstimezonedetect'
+import LoginButton from './LoginButton'
 
 export default {
 	name: 'LoginForm',
+	components: { LoginButton },
 	props: {
 		username: {
 			type: String,
diff --git a/core/src/components/login/PasswordLessLoginForm.vue b/core/src/components/login/PasswordLessLoginForm.vue
new file mode 100644
index 00000000000..028f7d547da
--- /dev/null
+++ b/core/src/components/login/PasswordLessLoginForm.vue
@@ -0,0 +1,208 @@
+<template>
+	<form v-if="isHttps && hasPublicKeyCredential"
+		ref="loginForm"
+		method="post"
+		name="login"
+		@submit.prevent="submit">
+		<fieldset>
+			<p class="grouptop groupbottom">
+				<input id="user"
+					ref="user"
+					v-model="user"
+					type="text"
+					name="user"
+					:autocomplete="autoCompleteAllowed ? 'on' : 'off'"
+					:placeholder="t('core', 'Username or email')"
+					:aria-label="t('core', 'Username or email')"
+					required
+					@change="$emit('update:username', user)">
+				<label for="user" class="infield">{{ t('core', 'Username or	email') }}</label>
+			</p>
+
+			<div v-if="!validCredentials">
+				{{ t('core', 'Your account is not setup for passwordless login.') }}
+			</div>
+
+			<LoginButton v-if="validCredentials"
+				:loading="loading"
+				:inverted-colors="invertedColors"
+				@click="authenticate" />
+		</fieldset>
+	</form>
+	<div v-else-if="!hasPublicKeyCredential">
+		{{ t('core', 'Passwordless authentication is not supported in your browser.')}}
+	</div>
+	<div v-else-if="!isHttps">
+		{{ t('core', 'Passwordless authentication is only available over a secure connection.')}}
+	</div>
+</template>
+
+<script>
+import {
+	startAuthentication,
+	finishAuthentication,
+} from '../../service/WebAuthnAuthenticationService'
+import LoginButton from './LoginButton'
+
+class NoValidCredentials extends Error {
+
+}
+
+export default {
+	name: 'PasswordLessLoginForm',
+	components: {
+		LoginButton,
+	},
+	props: {
+		username: {
+			type: String,
+			default: '',
+		},
+		redirectUrl: {
+			type: String,
+		},
+		invertedColors: {
+			type: Boolean,
+			default: false,
+		},
+		autoCompleteAllowed: {
+			type: Boolean,
+			default: true,
+		},
+		isHttps: {
+			type: Boolean,
+			default: false,
+		},
+		hasPublicKeyCredential: {
+			type: Boolean,
+			default: false,
+		}
+	},
+	data() {
+		return {
+			user: this.username,
+			loading: false,
+			validCredentials: true,
+		}
+	},
+	methods: {
+		authenticate() {
+			console.debug('passwordless login initiated')
+
+			this.getAuthenticationData(this.user)
+				.then(publicKey => {
+					console.debug(publicKey)
+					return publicKey
+				})
+				.then(this.sign)
+				.then(this.completeAuthentication)
+				.catch(error => {
+					if (error instanceof NoValidCredentials) {
+						this.validCredentials = false
+						return
+					}
+					console.debug(error)
+				})
+		},
+		getAuthenticationData(uid) {
+			const base64urlDecode = function(input) {
+				// Replace non-url compatible chars with base64 standard chars
+				input = input
+					.replace(/-/g, '+')
+					.replace(/_/g, '/')
+
+				// Pad out with standard base64 required padding characters
+				const pad = input.length % 4
+				if (pad) {
+					if (pad === 1) {
+						throw new Error('InvalidLengthError: Input base64url string is the wrong length to determine padding')
+					}
+					input += new Array(5 - pad).join('=')
+				}
+
+				return window.atob(input)
+			}
+
+			return startAuthentication(uid)
+				.then(publicKey => {
+					console.debug('Obtained PublicKeyCredentialRequestOptions')
+					console.debug(publicKey)
+
+					if (!Object.prototype.hasOwnProperty.call(publicKey, 'allowCredentials')) {
+						console.debug('No credentials found.')
+						throw new NoValidCredentials()
+					}
+
+					publicKey.challenge = Uint8Array.from(base64urlDecode(publicKey.challenge), c => c.charCodeAt(0))
+					publicKey.allowCredentials = publicKey.allowCredentials.map(function(data) {
+						return {
+							...data,
+							'id': Uint8Array.from(base64urlDecode(data.id), c => c.charCodeAt(0)),
+						}
+					})
+
+					console.debug('Converted PublicKeyCredentialRequestOptions')
+					console.debug(publicKey)
+					return publicKey
+				})
+				.catch(error => {
+					console.debug('Error while obtaining data')
+					throw error
+				})
+		},
+		sign(publicKey) {
+			const arrayToBase64String = function(a) {
+				return window.btoa(String.fromCharCode(...a))
+			}
+
+			return navigator.credentials.get({ publicKey })
+				.then(data => {
+					console.debug(data)
+					console.debug(new Uint8Array(data.rawId))
+					console.debug(arrayToBase64String(new Uint8Array(data.rawId)))
+					return {
+						id: data.id,
+						type: data.type,
+						rawId: arrayToBase64String(new Uint8Array(data.rawId)),
+						response: {
+							authenticatorData: arrayToBase64String(new Uint8Array(data.response.authenticatorData)),
+							clientDataJSON: arrayToBase64String(new Uint8Array(data.response.clientDataJSON)),
+							signature: arrayToBase64String(new Uint8Array(data.response.signature)),
+							userHandle: data.response.userHandle ? arrayToBase64String(new Uint8Array(data.response.userHandle)) : null,
+						},
+					}
+				})
+				.then(challenge => {
+					console.debug(challenge)
+					return challenge
+				})
+				.catch(error => {
+					console.debug('GOT AN ERROR!')
+					console.debug(error) // Example: timeout, interaction refused...
+				})
+		},
+		completeAuthentication(challenge) {
+			console.debug('TIME TO COMPLETE')
+
+			const location = this.redirectUrl
+
+			return finishAuthentication(JSON.stringify(challenge))
+				.then(data => {
+					console.debug('Logged in redirecting')
+					window.location.href = location
+				})
+				.catch(error => {
+					console.debug('GOT AN ERROR WHILE SUBMITTING CHALLENGE!')
+					console.debug(error) // Example: timeout, interaction refused...
+				})
+		},
+		submit() {
+			// noop
+		},
+	},
+}
+</script>
+
+<style scoped>
+
+</style>
-- 
cgit v1.2.3


From 531b1288e44380a4987f4e656f17d22822767b47 Mon Sep 17 00:00:00 2001
From: Daniel Kesselberg <mail@danielkesselberg.de>
Date: Sat, 28 Mar 2020 21:36:16 +0100
Subject: Add fieldset to align arrow

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
---
 core/src/components/login/ResetPassword.vue | 96 +++++++++++++++--------------
 1 file changed, 49 insertions(+), 47 deletions(-)

(limited to 'core/src/components')

diff --git a/core/src/components/login/ResetPassword.vue b/core/src/components/login/ResetPassword.vue
index 2d045692285..bf23bbe5aa4 100644
--- a/core/src/components/login/ResetPassword.vue
+++ b/core/src/components/login/ResetPassword.vue
@@ -21,54 +21,56 @@
 
 <template>
 	<form @submit.prevent="submit">
-		<p>
-			<input id="user"
-				v-model="user"
-				type="text"
-				name="user"
-				:placeholder="t('core', 'Username or email')"
-				:aria-label="t('core', 'Username or email')"
-				required
-				@change="updateUsername">
-			<!--<?php p($_['user_autofocus'] ? 'autofocus' : ''); ?>
-			autocomplete="<?php p($_['login_form_autocomplete']); ?>" autocapitalize="none" autocorrect="off"-->
-			<label for="user" class="infield">{{ t('core', 'Username or email') }}</label>
-		</p>
-		<div id="reset-password-wrapper">
-			<input id="reset-password-submit"
-				type="submit"
-				class="login primary"
-				title=""
-				:value="t('core', 'Reset password')">
-			<div class="submit-icon"
-				:class="{
-					'icon-confirm-white': !loading,
-					'icon-loading-small': loading && invertedColors,
-					'icon-loading-small-dark': loading && !invertedColors,
-				}" />
-		</div>
-		<p v-if="message === 'send-success'"
-			class="update">
-			{{ t('core', 'A password reset message has been sent to the e-mail address of this account. If you do not receive it, check your spam/junk folders or ask your local administrator for help.') }}
-			<br>
-			{{ t('core', 'If it is not there ask your local administrator.') }}
-		</p>
-		<p v-else-if="message === 'send-error'"
-			class="update warning">
-			{{ t('core', 'Couldn\'t send reset email. Please contact your administrator.') }}
-		</p>
-		<p v-else-if="message === 'reset-error'"
-			class="update warning">
-			{{ t('core', 'Password can not be changed. Please contact your administrator.') }}
-		</p>
-		<p v-else-if="message"
-			class="update"
-			:class="{warning: error}" />
+		<fieldset>
+			<p>
+				<input id="user"
+					v-model="user"
+					type="text"
+					name="user"
+					:placeholder="t('core', 'Username or email')"
+					:aria-label="t('core', 'Username or email')"
+					required
+					@change="updateUsername">
+				<!--<?php p($_['user_autofocus'] ? 'autofocus' : ''); ?>
+				autocomplete="<?php p($_['login_form_autocomplete']); ?>" autocapitalize="none" autocorrect="off"-->
+				<label for="user" class="infield">{{ t('core', 'Username or email') }}</label>
+			</p>
+			<div id="reset-password-wrapper">
+				<input id="reset-password-submit"
+					type="submit"
+					class="login primary"
+					title=""
+					:value="t('core', 'Reset password')">
+				<div class="submit-icon"
+					:class="{
+						'icon-confirm-white': !loading,
+						'icon-loading-small': loading && invertedColors,
+						'icon-loading-small-dark': loading && !invertedColors,
+					}" />
+			</div>
+			<p v-if="message === 'send-success'"
+				class="update">
+				{{ t('core', 'A password reset message has been sent to the e-mail address of this account. If you do not receive it, check your spam/junk folders or ask your local administrator for help.') }}
+				<br>
+				{{ t('core', 'If it is not there ask your local administrator.') }}
+			</p>
+			<p v-else-if="message === 'send-error'"
+				class="update warning">
+				{{ t('core', 'Couldn\'t send reset email. Please contact your administrator.') }}
+			</p>
+			<p v-else-if="message === 'reset-error'"
+				class="update warning">
+				{{ t('core', 'Password can not be changed. Please contact your administrator.') }}
+			</p>
+			<p v-else-if="message"
+				class="update"
+				:class="{warning: error}" />
 
-		<a href="#"
-			@click.prevent="$emit('abort')">
-			{{ t('core', 'Back to login') }}
-		</a>
+			<a href="#"
+				@click.prevent="$emit('abort')">
+				{{ t('core', 'Back to login') }}
+			</a>
+		</fieldset>
 	</form>
 </template>
 
-- 
cgit v1.2.3


From d71b93235d92ffa1c9b0031c4175811071140dd2 Mon Sep 17 00:00:00 2001
From: Liam JACK <1422590-liamjack@users.noreply.gitlab.com>
Date: Sat, 18 Apr 2020 18:21:08 +0200
Subject: Fix #20551 - Disable autocapitalize for username field on login /
 reset password pages

Signed-off-by: Liam JACK <1422590-liamjack@users.noreply.gitlab.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
---
 core/src/components/login/LoginForm.vue     | 1 +
 core/src/components/login/ResetPassword.vue | 1 +
 2 files changed, 2 insertions(+)

(limited to 'core/src/components')

diff --git a/core/src/components/login/LoginForm.vue b/core/src/components/login/LoginForm.vue
index a20ce6dc4c2..e37d577b5d5 100644
--- a/core/src/components/login/LoginForm.vue
+++ b/core/src/components/login/LoginForm.vue
@@ -59,6 +59,7 @@
 					v-model="user"
 					type="text"
 					name="user"
+					autocapitalize="off"
 					:autocomplete="autoCompleteAllowed ? 'on' : 'off'"
 					:placeholder="t('core', 'Username or email')"
 					:aria-label="t('core', 'Username or email')"
diff --git a/core/src/components/login/ResetPassword.vue b/core/src/components/login/ResetPassword.vue
index bf23bbe5aa4..21f545435a7 100644
--- a/core/src/components/login/ResetPassword.vue
+++ b/core/src/components/login/ResetPassword.vue
@@ -27,6 +27,7 @@
 					v-model="user"
 					type="text"
 					name="user"
+					autocapitalize="off"
 					:placeholder="t('core', 'Username or email')"
 					:aria-label="t('core', 'Username or email')"
 					required
-- 
cgit v1.2.3


From bde5b9577b97234cf80adb3e7bc987913b3189ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Mon, 25 May 2020 16:04:54 +0200
Subject: Update hub bundle and add proxy rule to htaccess
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 core/src/components/setup/RecommendedApps.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'core/src/components')

diff --git a/core/src/components/setup/RecommendedApps.vue b/core/src/components/setup/RecommendedApps.vue
index 550c3aaff70..46fac684370 100644
--- a/core/src/components/setup/RecommendedApps.vue
+++ b/core/src/components/setup/RecommendedApps.vue
@@ -82,11 +82,11 @@ const recommended = {
 	spreed: {
 		description: t('core', 'Chatting, video calls, screensharing, online meetings and web conferencing – in your browser and with mobile apps.'),
 	},
-	onlyoffice: {
+	richdocuments: {
 		description: t('core', 'Collaboratively edit office documents.'),
 	},
-	documentserver_community: {
-		description: t('core', 'Local document editing back-end used by the OnlyOffice app.'),
+	richdocumentscode: {
+		description: t('core', 'Local document editing back-end used by the Collabora Online app.'),
 	},
 }
 const recommendedIds = Object.keys(recommended)
-- 
cgit v1.2.3


From 94ae04d3032a83a9455c4e2df20942aceea67574 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Tue, 2 Jun 2020 14:09:27 +0200
Subject: OC.routing is just a @nextcloud/routing proxy

So lets kill the duplicate code!

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
 core/src/components/login/ResetPassword.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/src/components')

diff --git a/core/src/components/login/ResetPassword.vue b/core/src/components/login/ResetPassword.vue
index 21f545435a7..cba7a89fd88 100644
--- a/core/src/components/login/ResetPassword.vue
+++ b/core/src/components/login/ResetPassword.vue
@@ -78,7 +78,7 @@
 <script>
 import axios from '@nextcloud/axios'
 
-import { generateUrl } from '../../OC/routing'
+import { generateUrl } from '@nextcloud/router'
 
 export default {
 	name: 'ResetPassword',
-- 
cgit v1.2.3


From ed3e03821bab0de471f659c399777217531a4323 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 14 Jul 2020 10:59:11 +0200
Subject: Use space instead of tab inside translation

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 core/src/components/login/LoginForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/src/components')

diff --git a/core/src/components/login/LoginForm.vue b/core/src/components/login/LoginForm.vue
index e37d577b5d5..113fe821913 100644
--- a/core/src/components/login/LoginForm.vue
+++ b/core/src/components/login/LoginForm.vue
@@ -65,7 +65,7 @@
 					:aria-label="t('core', 'Username or email')"
 					required
 					@change="updateUsername">
-				<label for="user" class="infield">{{ t('core', 'Username or	email') }}</label>
+				<label for="user" class="infield">{{ t('core', 'Username or email') }}</label>
 			</p>
 
 			<p class="groupbottom"
-- 
cgit v1.2.3


From 2607d2df1aba841e6513a99cfea2ce4eee7b2699 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 14 Jul 2020 11:05:17 +0200
Subject: Use generateUrl and imagePath instead of OC.*

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 core/src/components/login/LoginForm.vue | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'core/src/components')

diff --git a/core/src/components/login/LoginForm.vue b/core/src/components/login/LoginForm.vue
index 113fe821913..5adf5be0eae 100644
--- a/core/src/components/login/LoginForm.vue
+++ b/core/src/components/login/LoginForm.vue
@@ -23,7 +23,7 @@
 	<form ref="loginForm"
 		method="post"
 		name="login"
-		:action="OC.generateUrl('login')"
+		:action="loginActionUrl"
 		@submit="submit">
 		<fieldset>
 			<div v-if="apacheAuthFailed"
@@ -47,7 +47,7 @@
 				class="hidden">
 				<img class="float-spinner"
 					alt=""
-					:src="OC.imagePath('core', 'loading-dark.gif')">
+					:src="loadingIcon">
 				<span id="messageText" />
 				<!-- the following div ensures that the spinner is always inside the #message div -->
 				<div style="clear: both;" />
@@ -82,7 +82,7 @@
 				<label for="password"
 					class="infield">{{ t('Password') }}</label>
 				<a href="#" class="toggle-password" @click.stop.prevent="togglePassword">
-					<img :src="OC.imagePath('core', 'actions/toggle.svg')">
+					<img :src="toggleIcon">
 				</a>
 			</p>
 
@@ -126,6 +126,10 @@
 <script>
 import jstz from 'jstimezonedetect'
 import LoginButton from './LoginButton'
+import {
+	generateUrl,
+	imagePath,
+} from '@nextcloud/router'
 
 export default {
 	name: 'LoginForm',
@@ -185,6 +189,15 @@ export default {
 		userDisabled() {
 			return this.errors.indexOf('userdisabled') !== -1
 		},
+		toggleIcon() {
+			return imagePath('core', 'actions/toggle.svg')
+		},
+		loadingIcon() {
+			return imagePath('core', 'loading-dark.gif')
+		},
+		loginActionUrl() {
+			return generateUrl('login')
+		},
 	},
 	mounted() {
 		if (this.username === '') {
-- 
cgit v1.2.3


From 6fcd075730dbd63d5dbb69da0ca5983b51a7240e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Mon, 20 Jul 2020 12:30:35 +0200
Subject: Use DOMContentLoaded and fix sharebymail loading issue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 core/src/components/login/PasswordLessLoginForm.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'core/src/components')

diff --git a/core/src/components/login/PasswordLessLoginForm.vue b/core/src/components/login/PasswordLessLoginForm.vue
index 028f7d547da..5326ab7a5f3 100644
--- a/core/src/components/login/PasswordLessLoginForm.vue
+++ b/core/src/components/login/PasswordLessLoginForm.vue
@@ -30,10 +30,10 @@
 		</fieldset>
 	</form>
 	<div v-else-if="!hasPublicKeyCredential">
-		{{ t('core', 'Passwordless authentication is not supported in your browser.')}}
+		{{ t('core', 'Passwordless authentication is not supported in your browser.') }}
 	</div>
 	<div v-else-if="!isHttps">
-		{{ t('core', 'Passwordless authentication is only available over a secure connection.')}}
+		{{ t('core', 'Passwordless authentication is only available over a secure connection.') }}
 	</div>
 </template>
 
@@ -76,7 +76,7 @@ export default {
 		hasPublicKeyCredential: {
 			type: Boolean,
 			default: false,
-		}
+		},
 	},
 	data() {
 		return {
-- 
cgit v1.2.3


From 4c08b1754da4407f2eb905be7580e7cd886cefdd Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Wed, 22 Jul 2020 09:23:11 +0200
Subject: Do not double encode the userid in webauthn login

* Else login fails with webauthn devices that send the userid
  - Like windows hello

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
---
 core/src/components/login/PasswordLessLoginForm.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'core/src/components')

diff --git a/core/src/components/login/PasswordLessLoginForm.vue b/core/src/components/login/PasswordLessLoginForm.vue
index 5326ab7a5f3..87544e0ffff 100644
--- a/core/src/components/login/PasswordLessLoginForm.vue
+++ b/core/src/components/login/PasswordLessLoginForm.vue
@@ -155,6 +155,10 @@ export default {
 				return window.btoa(String.fromCharCode(...a))
 			}
 
+			const arrayToString = function(a) {
+				return String.fromCharCode(...a)
+			}
+
 			return navigator.credentials.get({ publicKey })
 				.then(data => {
 					console.debug(data)
@@ -168,7 +172,7 @@ export default {
 							authenticatorData: arrayToBase64String(new Uint8Array(data.response.authenticatorData)),
 							clientDataJSON: arrayToBase64String(new Uint8Array(data.response.clientDataJSON)),
 							signature: arrayToBase64String(new Uint8Array(data.response.signature)),
-							userHandle: data.response.userHandle ? arrayToBase64String(new Uint8Array(data.response.userHandle)) : null,
+							userHandle: data.response.userHandle ? arrayToString(new Uint8Array(data.response.userHandle)) : null,
 						},
 					}
 				})
-- 
cgit v1.2.3


From a384b4a97a2a4444d8e2c831765dbf35c8da0db2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Fri, 31 Jul 2020 09:31:39 +0200
Subject: Bump @nextcloud/eslint-config and peers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 core/src/components/login/PasswordLessLoginForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/src/components')

diff --git a/core/src/components/login/PasswordLessLoginForm.vue b/core/src/components/login/PasswordLessLoginForm.vue
index 87544e0ffff..0cd7cb81cfe 100644
--- a/core/src/components/login/PasswordLessLoginForm.vue
+++ b/core/src/components/login/PasswordLessLoginForm.vue
@@ -137,7 +137,7 @@ export default {
 					publicKey.allowCredentials = publicKey.allowCredentials.map(function(data) {
 						return {
 							...data,
-							'id': Uint8Array.from(base64urlDecode(data.id), c => c.charCodeAt(0)),
+							id: Uint8Array.from(base64urlDecode(data.id), c => c.charCodeAt(0)),
 						}
 					})
 
-- 
cgit v1.2.3


From 3a31397ac29f71db5313ea0e819a1362a019b5cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Fri, 31 Jul 2020 09:40:53 +0200
Subject: Use `babel-loader-exclude-node-modules-except`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 core/src/components/setup/RecommendedApps.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/src/components')

diff --git a/core/src/components/setup/RecommendedApps.vue b/core/src/components/setup/RecommendedApps.vue
index 46fac684370..bd0989f3950 100644
--- a/core/src/components/setup/RecommendedApps.vue
+++ b/core/src/components/setup/RecommendedApps.vue
@@ -135,7 +135,7 @@ export default {
 				.map(app => limit(() => {
 					logger.info(`installing ${app.id}`)
 					app.loading = true
-					return axios.post(generateUrl(`settings/apps/enable`), { appIds: [app.id], groups: [] })
+					return axios.post(generateUrl('settings/apps/enable'), { appIds: [app.id], groups: [] })
 						.catch(error => {
 							logger.error(`could not install ${app.id}`, { error })
 							app.installationError = true
-- 
cgit v1.2.3


From 1a1b3e20e470a945dd9f5fab1d99174b10cbb141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Mon, 3 Aug 2020 12:54:37 +0200
Subject: Fix unified search
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
---
 core/src/components/HeaderMenu.vue                 | 206 ++++++++++++++++++++
 core/src/components/UnifiedSearch/SearchResult.vue | 211 +++++++++++++++++++++
 .../src/components/login/PasswordLessLoginForm.vue |   2 +-
 3 files changed, 418 insertions(+), 1 deletion(-)
 create mode 100644 core/src/components/HeaderMenu.vue
 create mode 100644 core/src/components/UnifiedSearch/SearchResult.vue

(limited to 'core/src/components')

diff --git a/core/src/components/HeaderMenu.vue b/core/src/components/HeaderMenu.vue
new file mode 100644
index 00000000000..2cc5b79d6dd
--- /dev/null
+++ b/core/src/components/HeaderMenu.vue
@@ -0,0 +1,206 @@
+ <!--
+  - @copyright Copyright (c) 2020 John Molakvoæ <skjnldsv@protonmail.com>
+  -
+  - @author John Molakvoæ <skjnldsv@protonmail.com>
+  -
+  - @license GNU AGPL version 3 or any later version
+  -
+  - This program is free software: you can redistribute it and/or modify
+  - it under the terms of the GNU Affero General Public License as
+  - published by the Free Software Foundation, either version 3 of the
+  - License, or (at your option) any later version.
+  -
+  - This program is distributed in the hope that it will be useful,
+  - but WITHOUT ANY WARRANTY; without even the implied warranty of
+  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  - GNU Affero General Public License for more details.
+  -
+  - You should have received a copy of the GNU Affero General Public License
+  - along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -
+  -->
+<template>
+	<div v-click-outside="closeMenu" :class="{ 'header-menu--opened': opened }" class="header-menu">
+		<a class="header-menu__trigger"
+			href="#"
+			:aria-controls="`header-menu-${id}`"
+			:aria-expanded="opened"
+			aria-haspopup="true"
+			@click.prevent="toggleMenu">
+			<slot name="trigger" />
+		</a>
+		<div v-if="opened"
+			:id="`header-menu-${id}`"
+			class="header-menu__wrapper"
+			role="menu">
+			<div class="header-menu__carret" />
+			<div class="header-menu__content">
+				<slot />
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+import { directive as ClickOutside } from 'v-click-outside'
+import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
+
+export default {
+	name: 'HeaderMenu',
+
+	directives: {
+		ClickOutside,
+	},
+
+	props: {
+		id: {
+			type: String,
+			required: true,
+		},
+		open: {
+			type: Boolean,
+			default: false,
+		},
+	},
+
+	data() {
+		return {
+			opened: this.open,
+		}
+	},
+
+	watch: {
+		open(newVal) {
+			this.opened = newVal
+			this.$nextTick(() => {
+				if (this.opened) {
+					this.openMenu()
+				} else {
+					this.closeMenu()
+				}
+			})
+		},
+	},
+
+	mounted() {
+		document.addEventListener('keydown', this.onKeyDown)
+	},
+
+	beforeMount() {
+		subscribe(`header-menu-${this.id}-close`, this.closeMenu)
+		subscribe(`header-menu-${this.id}-open`, this.openMenu)
+	},
+
+	beforeDestroy() {
+		unsubscribe(`header-menu-${this.id}-close`, this.closeMenu)
+		unsubscribe(`header-menu-${this.id}-open`, this.openMenu)
+	},
+
+	methods: {
+		/**
+		 * Toggle the current menu open state
+		 */
+		toggleMenu() {
+			// Toggling current state
+			if (!this.opened) {
+				this.openMenu()
+			} else {
+				this.closeMenu()
+			}
+		},
+
+		/**
+		 * Close the current menu
+		 */
+		closeMenu() {
+			if (!this.opened) {
+				return
+			}
+
+			this.opened = false
+			this.$emit('close')
+			this.$emit('update:open', false)
+			emit(`header-menu-${this.id}-close`)
+		},
+
+		/**
+		 * Open the current menu
+		 */
+		openMenu() {
+			if (this.opened) {
+				return
+			}
+
+			this.opened = true
+			this.$emit('open')
+			this.$emit('update:open', true)
+			emit(`header-menu-${this.id}-open`)
+		},
+
+		onKeyDown(event) {
+			// If opened and escape pressed, close
+			if (event.key === 'Escape' && this.opened) {
+				event.preventDefault()
+				this.closeMenu()
+			}
+		},
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+.header-menu {
+	&__trigger {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 50px;
+		height: 100%;
+		margin: 0;
+		padding: 0;
+		cursor: pointer;
+		opacity: .6;
+	}
+
+	&--opened &__trigger,
+	&__trigger:hover,
+	&__trigger:focus,
+	&__trigger:active {
+		opacity: 1;
+	}
+
+	&__wrapper {
+		position: absolute;
+		z-index: 2000;
+		top: 50px;
+		right: 5px;
+		box-sizing: border-box;
+		margin: 0;
+		border-radius: 0 0 var(--border-radius) var(--border-radius);
+		background-color: var(--color-main-background);
+
+		filter: drop-shadow(0 1px 5px var(--color-box-shadow));
+	}
+
+	&__carret {
+		position: absolute;
+		right: 10px;
+		bottom: 100%;
+		width: 0;
+		height: 0;
+		content: ' ';
+		pointer-events: none;
+		border: 10px solid transparent;
+		border-bottom-color: var(--color-main-background);
+	}
+
+	&__content {
+		overflow: auto;
+		width: 350px;
+		max-width: 350px;
+		min-height: calc(44px * 1.5);
+		max-height: calc(100vh - 50px * 2);
+	}
+}
+
+</style>
diff --git a/core/src/components/UnifiedSearch/SearchResult.vue b/core/src/components/UnifiedSearch/SearchResult.vue
new file mode 100644
index 00000000000..832770c9abe
--- /dev/null
+++ b/core/src/components/UnifiedSearch/SearchResult.vue
@@ -0,0 +1,211 @@
+<template>
+	<a :href="resourceUrl || '#'"
+		class="unified-search__result"
+		:class="{
+			'unified-search__result--focused': focused
+		}"
+		@click="reEmitEvent"
+		@focus="reEmitEvent">
+		<!-- Icon describing the result -->
+		<div class="unified-search__result-icon"
+			:class="{
+				'unified-search__result-icon--rounded': rounded,
+				'unified-search__result-icon--no-preview': !hasValidThumbnail && !loaded,
+				'unified-search__result-icon--with-thumbnail': hasValidThumbnail && loaded,
+				[iconClass]: true
+			}"
+			role="img">
+			<img v-if="hasValidThumbnail"
+				:src="thumbnailUrl"
+				:alt="t('core', 'Thumbnail for {result}', {result: title})"
+				@error="onError"
+				@load="onLoad">
+		</div>
+
+		<!-- Title and sub-title -->
+		<span class="unified-search__result-content">
+			<h3 class="unified-search__result-line-one">
+				<Highlight :text="title" :search="query" />
+			</h3>
+			<h4 v-if="subline" class="unified-search__result-line-two">{{ subline }}</h4>
+		</span>
+	</a>
+</template>
+
+<script>
+import Highlight from '@nextcloud/vue/dist/Components/Highlight'
+
+export default {
+	name: 'SearchResult',
+
+	components: {
+		Highlight,
+	},
+
+	props: {
+		thumbnailUrl: {
+			type: String,
+			default: null,
+		},
+		title: {
+			type: String,
+			required: true,
+		},
+		subline: {
+			type: String,
+			default: null,
+		},
+		resourceUrl: {
+			type: String,
+			default: null,
+		},
+		iconClass: {
+			type: String,
+			default: '',
+		},
+		rounded: {
+			type: Boolean,
+			default: false,
+		},
+		query: {
+			type: String,
+			default: '',
+		},
+
+		/**
+		 * Only used for the first result as a visual feedback
+		 * so we can keep the search input focused but pressing
+		 * enter still opens the first result
+		 */
+		focused: {
+			type: Boolean,
+			default: false,
+		},
+	},
+
+	data() {
+		return {
+			hasValidThumbnail: this.thumbnailUrl && this.thumbnailUrl.trim() !== '',
+			loaded: false,
+		}
+	},
+
+	watch: {
+		// Make sure to reset state on change even when vue recycle the component
+		thumbnailUrl() {
+			this.hasValidThumbnail = this.thumbnailUrl && this.thumbnailUrl.trim() !== ''
+			this.loaded = false
+		},
+	},
+
+	methods: {
+		reEmitEvent(e) {
+			this.$emit(e.type, e)
+		},
+
+		/**
+		 * If the image fails to load, fallback to iconClass
+		 */
+		onError() {
+			this.hasValidThumbnail = false
+		},
+
+		onLoad() {
+			this.loaded = true
+		},
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+$clickable-area: 44px;
+$margin: 10px;
+
+.unified-search__result {
+	display: flex;
+	height: $clickable-area;
+	padding: $margin;
+	border-bottom: 1px solid var(--color-border);
+
+	// Load more entry,
+	&:last-child {
+		border-bottom: none;
+	}
+
+	&--focused,
+	&:active,
+	&:hover,
+	&:focus {
+		background-color: var(--color-background-hover);
+	}
+
+	* {
+		cursor: pointer;
+	}
+
+	&-icon {
+		overflow: hidden;
+		width: $clickable-area;
+		height: $clickable-area;
+		border-radius: var(--border-radius);
+		background-position: center center;
+		background-size: 32px;
+		&--rounded {
+			border-radius: $clickable-area / 2;
+		}
+		&--no-preview {
+			background-size: 32px;
+		}
+		&--with-thumbnail {
+			background-size: cover;
+		}
+		&--with-thumbnail:not(&--rounded) {
+			// compensate for border
+			max-width: $clickable-area - 2px;
+			max-height: $clickable-area - 2px;
+			border: 1px solid var(--color-border);
+		}
+
+		img {
+			// Make sure to keep ratio
+			width: 100%;
+			height: 100%;
+
+			object-fit: cover;
+			object-position: center;
+		}
+	}
+
+	&-icon,
+	&-actions {
+		flex: 0 0 $clickable-area;
+	}
+
+	&-content {
+		display: flex;
+		align-items: center;
+		flex: 1 1 100%;
+		flex-wrap: wrap;
+		// Set to minimum and gro from it
+		min-width: 0;
+		padding-left: $margin;
+	}
+
+	&-line-one,
+	&-line-two {
+		overflow: hidden;
+		flex: 1 1 100%;
+		margin: 0;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		// Use the same color as the `a`
+		color: inherit;
+		font-size: inherit;
+	}
+	&-line-two {
+		opacity: .7;
+		font-size: 14px;
+	}
+}
+
+</style>
diff --git a/core/src/components/login/PasswordLessLoginForm.vue b/core/src/components/login/PasswordLessLoginForm.vue
index 0cd7cb81cfe..df774599f92 100644
--- a/core/src/components/login/PasswordLessLoginForm.vue
+++ b/core/src/components/login/PasswordLessLoginForm.vue
@@ -41,7 +41,7 @@
 import {
 	startAuthentication,
 	finishAuthentication,
-} from '../../service/WebAuthnAuthenticationService'
+} from '../../services/WebAuthnAuthenticationService'
 import LoginButton from './LoginButton'
 
 class NoValidCredentials extends Error {
-- 
cgit v1.2.3


From 71b62c4203a25beefeab73f73668919c813e3a50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Tue, 4 Aug 2020 10:00:27 +0200
Subject: Show mime icon, bump bundles,  make the SearchResultEntry class
 non-abstract, Fix header search icon, various fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 core/src/components/UnifiedSearch/SearchResult.vue | 35 +++++++++--
 .../UnifiedSearch/SearchResultPlaceholder.vue      | 68 ++++++++++++++++++++++
 2 files changed, 98 insertions(+), 5 deletions(-)
 create mode 100644 core/src/components/UnifiedSearch/SearchResultPlaceholder.vue

(limited to 'core/src/components')

diff --git a/core/src/components/UnifiedSearch/SearchResult.vue b/core/src/components/UnifiedSearch/SearchResult.vue
index 832770c9abe..ffd4e2bf2f2 100644
--- a/core/src/components/UnifiedSearch/SearchResult.vue
+++ b/core/src/components/UnifiedSearch/SearchResult.vue
@@ -2,22 +2,28 @@
 	<a :href="resourceUrl || '#'"
 		class="unified-search__result"
 		:class="{
-			'unified-search__result--focused': focused
+			'unified-search__result--focused': focused,
 		}"
 		@click="reEmitEvent"
 		@focus="reEmitEvent">
+
 		<!-- Icon describing the result -->
 		<div class="unified-search__result-icon"
 			:class="{
 				'unified-search__result-icon--rounded': rounded,
 				'unified-search__result-icon--no-preview': !hasValidThumbnail && !loaded,
 				'unified-search__result-icon--with-thumbnail': hasValidThumbnail && loaded,
-				[iconClass]: true
+				[icon]: !loaded && !isIconUrl,
+			}"
+			:style="{
+				backgroundImage: isIconUrl ? `url(${icon})` : '',
 			}"
 			role="img">
+
 			<img v-if="hasValidThumbnail"
+				v-show="loaded"
 				:src="thumbnailUrl"
-				:alt="t('core', 'Thumbnail for {result}', {result: title})"
+				alt=""
 				@error="onError"
 				@load="onLoad">
 		</div>
@@ -59,7 +65,7 @@ export default {
 			type: String,
 			default: null,
 		},
-		iconClass: {
+		icon: {
 			type: String,
 			default: '',
 		},
@@ -90,6 +96,24 @@ export default {
 		}
 	},
 
+	computed: {
+		isIconUrl() {
+			// If we're facing an absolute url
+			if (this.icon.startsWith('/')) {
+				return true
+			}
+
+			// Otherwise, let's check if this is a valid url
+			try {
+				// eslint-disable-next-line no-new
+				new URL(this.icon)
+			} catch {
+				return false
+			}
+			return true
+		},
+	},
+
 	watch: {
 		// Make sure to reset state on change even when vue recycle the component
 		thumbnailUrl() {
@@ -148,6 +172,7 @@ $margin: 10px;
 		width: $clickable-area;
 		height: $clickable-area;
 		border-radius: var(--border-radius);
+		background-repeat: no-repeat;
 		background-position: center center;
 		background-size: 32px;
 		&--rounded {
@@ -195,7 +220,7 @@ $margin: 10px;
 	&-line-two {
 		overflow: hidden;
 		flex: 1 1 100%;
-		margin: 0;
+		margin: 1px 0;
 		white-space: nowrap;
 		text-overflow: ellipsis;
 		// Use the same color as the `a`
diff --git a/core/src/components/UnifiedSearch/SearchResultPlaceholder.vue b/core/src/components/UnifiedSearch/SearchResultPlaceholder.vue
new file mode 100644
index 00000000000..7eb0915b359
--- /dev/null
+++ b/core/src/components/UnifiedSearch/SearchResultPlaceholder.vue
@@ -0,0 +1,68 @@
+<template>
+	<svg
+		class="unified-search__result-placeholder"
+		xmlns="http://www.w3.org/2000/svg"
+		fill="url(#unified-search__result-placeholder-gradient)">
+		<defs>
+			<linearGradient id="unified-search__result-placeholder-gradient">
+				<stop offset="0%" stop-color="#ededed"><animate attributeName="stop-color"
+					values="#ededed; #ededed; #cccccc; #cccccc; #ededed"
+					dur="2s"
+					repeatCount="indefinite" /></stop>
+				<stop offset="100%" stop-color="#cccccc"><animate attributeName="stop-color"
+					values="#cccccc; #ededed; #ededed; #cccccc; #cccccc"
+					dur="2s"
+					repeatCount="indefinite" /></stop>
+			</linearGradient>
+		</defs>
+		<rect class="unified-search__result-placeholder-icon" />
+		<rect class="unified-search__result-placeholder-line-one" />
+		<rect class="unified-search__result-placeholder-line-two" :style="{width: `calc(${randWidth}%)`}" />
+	</svg>
+</template>
+
+<script>
+export default {
+	name: 'SearchResultPlaceholder',
+
+	data() {
+		return {
+			randWidth: Math.floor(Math.random() * 20) + 30,
+		}
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+$clickable-area: 44px;
+$margin: 10px;
+
+.unified-search__result-placeholder {
+	width: calc(100% - 2 * #{$margin});
+	height: $clickable-area;
+	margin: $margin;
+
+	&-icon {
+		width: $clickable-area;
+		height: $clickable-area;
+		rx: var(--border-radius);
+		ry: var(--border-radius);
+	}
+
+	&-line-one,
+	&-line-two {
+		width: calc(100% - #{$margin + $clickable-area});
+		height: 1em;
+		x: $margin + $clickable-area;
+	}
+
+	&-line-one {
+		y: 5px;
+	}
+
+	&-line-two {
+		y: 25px;
+	}
+}
+
+</style>
-- 
cgit v1.2.3


From 06f8c54386f5345827cf9af3bdb54f23bef8ff3c Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Tue, 25 Aug 2020 14:57:26 +0200
Subject: Make ellipsized unified search results visible on hover

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---
 core/src/components/UnifiedSearch/SearchResult.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/src/components')

diff --git a/core/src/components/UnifiedSearch/SearchResult.vue b/core/src/components/UnifiedSearch/SearchResult.vue
index ffd4e2bf2f2..d5374832da9 100644
--- a/core/src/components/UnifiedSearch/SearchResult.vue
+++ b/core/src/components/UnifiedSearch/SearchResult.vue
@@ -30,10 +30,10 @@
 
 		<!-- Title and sub-title -->
 		<span class="unified-search__result-content">
-			<h3 class="unified-search__result-line-one">
+			<h3 class="unified-search__result-line-one" :title="title">
 				<Highlight :text="title" :search="query" />
 			</h3>
-			<h4 v-if="subline" class="unified-search__result-line-two">{{ subline }}</h4>
+			<h4 v-if="subline" class="unified-search__result-line-two" :title="subline">{{ subline }}</h4>
 		</span>
 	</a>
 </template>
-- 
cgit v1.2.3


From f359529555fbf6fa344869d01f0b3c17ecce46c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Wed, 5 Aug 2020 12:56:11 +0200
Subject: Allow unified search filtering
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 core/src/components/UnifiedSearch/SearchFilter.vue | 77 ++++++++++++++++++++++
 core/src/components/UnifiedSearch/SearchResult.vue | 21 ++++++
 2 files changed, 98 insertions(+)
 create mode 100644 core/src/components/UnifiedSearch/SearchFilter.vue

(limited to 'core/src/components')

diff --git a/core/src/components/UnifiedSearch/SearchFilter.vue b/core/src/components/UnifiedSearch/SearchFilter.vue
new file mode 100644
index 00000000000..f3c06a24528
--- /dev/null
+++ b/core/src/components/UnifiedSearch/SearchFilter.vue
@@ -0,0 +1,77 @@
+ <!--
+  - @copyright Copyright (c) 2020 John Molakvoæ <skjnldsv@protonmail.com>
+  -
+  - @author John Molakvoæ <skjnldsv@protonmail.com>
+  -
+  - @license GNU AGPL version 3 or any later version
+  -
+  - This program is free software: you can redistribute it and/or modify
+  - it under the terms of the GNU Affero General Public License as
+  - published by the Free Software Foundation, either version 3 of the
+  - License, or (at your option) any later version.
+  -
+  - This program is distributed in the hope that it will be useful,
+  - but WITHOUT ANY WARRANTY; without even the implied warranty of
+  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  - GNU Affero General Public License for more details.
+  -
+  - You should have received a copy of the GNU Affero General Public License
+  - along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -
+  -->
+<template>
+	<li>
+		<a :title="t('core', 'Search for {name} only', { name })"
+			class="unified-search__filter"
+			href="#"
+			@click.prevent="onClick">
+			{{ filter }}
+		</a>
+	</li>
+</template>
+
+<script>
+export default {
+	name: 'SearchFilter',
+
+	props: {
+		type: {
+			type: String,
+			required: true,
+		},
+		name: {
+			type: String,
+			required: true,
+		},
+	},
+	computed: {
+		filter() {
+			return `in:${this.type}`
+		},
+	},
+
+	methods: {
+		onClick() {
+			this.$emit('click', this.filter)
+		},
+	},
+
+}
+</script>
+
+<style lang="scss" scoped>
+.unified-search__filter {
+	height: 1em;
+	margin-right: 5px;
+	padding: 3px 8px;
+	border-radius: 1em;
+	background-color: var(--color-background-darker);
+
+	&:active,
+	&:focus,
+	&:hover {
+		background-color: var(--color-background-hover);
+	}
+}
+
+</style>
diff --git a/core/src/components/UnifiedSearch/SearchResult.vue b/core/src/components/UnifiedSearch/SearchResult.vue
index d5374832da9..025ddef86c0 100644
--- a/core/src/components/UnifiedSearch/SearchResult.vue
+++ b/core/src/components/UnifiedSearch/SearchResult.vue
@@ -1,3 +1,24 @@
+ <!--
+  - @copyright Copyright (c) 2020 John Molakvoæ <skjnldsv@protonmail.com>
+  -
+  - @author John Molakvoæ <skjnldsv@protonmail.com>
+  -
+  - @license GNU AGPL version 3 or any later version
+  -
+  - This program is free software: you can redistribute it and/or modify
+  - it under the terms of the GNU Affero General Public License as
+  - published by the Free Software Foundation, either version 3 of the
+  - License, or (at your option) any later version.
+  -
+  - This program is distributed in the hope that it will be useful,
+  - but WITHOUT ANY WARRANTY; without even the implied warranty of
+  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  - GNU Affero General Public License for more details.
+  -
+  - You should have received a copy of the GNU Affero General Public License
+  - along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -
+  -->
 <template>
 	<a :href="resourceUrl || '#'"
 		class="unified-search__result"
-- 
cgit v1.2.3


From f04b182b9447231b32cd5b5f8060314dee4fd801 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Wed, 5 Aug 2020 14:42:08 +0200
Subject: Fix search placeholder animation & dark theme compatibility
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 core/src/components/HeaderMenu.vue                 |  11 ++-
 core/src/components/UnifiedSearch/SearchFilter.vue |  77 ----------------
 .../UnifiedSearch/SearchResultPlaceholder.vue      |  68 --------------
 .../UnifiedSearch/SearchResultPlaceholders.vue     | 100 +++++++++++++++++++++
 4 files changed, 110 insertions(+), 146 deletions(-)
 delete mode 100644 core/src/components/UnifiedSearch/SearchFilter.vue
 delete mode 100644 core/src/components/UnifiedSearch/SearchResultPlaceholder.vue
 create mode 100644 core/src/components/UnifiedSearch/SearchResultPlaceholders.vue

(limited to 'core/src/components')

diff --git a/core/src/components/HeaderMenu.vue b/core/src/components/HeaderMenu.vue
index 2cc5b79d6dd..9848dc45e38 100644
--- a/core/src/components/HeaderMenu.vue
+++ b/core/src/components/HeaderMenu.vue
@@ -20,7 +20,7 @@
   -
   -->
 <template>
-	<div v-click-outside="closeMenu" :class="{ 'header-menu--opened': opened }" class="header-menu">
+	<div v-click-outside="clickOutsideConfig" :class="{ 'header-menu--opened': opened }" class="header-menu">
 		<a class="header-menu__trigger"
 			href="#"
 			:aria-controls="`header-menu-${id}`"
@@ -44,6 +44,7 @@
 <script>
 import { directive as ClickOutside } from 'v-click-outside'
 import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
+import excludeClickOutsideClasses from '@nextcloud/vue/dist/Mixins/excludeClickOutsideClasses'
 
 export default {
 	name: 'HeaderMenu',
@@ -52,6 +53,10 @@ export default {
 		ClickOutside,
 	},
 
+	mixins: [
+		excludeClickOutsideClasses,
+	],
+
 	props: {
 		id: {
 			type: String,
@@ -66,6 +71,10 @@ export default {
 	data() {
 		return {
 			opened: this.open,
+			clickOutsideConfig: {
+				handler: this.closeMenu,
+				middleware: this.clickOutsideMiddleware,
+			},
 		}
 	},
 
diff --git a/core/src/components/UnifiedSearch/SearchFilter.vue b/core/src/components/UnifiedSearch/SearchFilter.vue
deleted file mode 100644
index f3c06a24528..00000000000
--- a/core/src/components/UnifiedSearch/SearchFilter.vue
+++ /dev/null
@@ -1,77 +0,0 @@
- <!--
-  - @copyright Copyright (c) 2020 John Molakvoæ <skjnldsv@protonmail.com>
-  -
-  - @author John Molakvoæ <skjnldsv@protonmail.com>
-  -
-  - @license GNU AGPL version 3 or any later version
-  -
-  - This program is free software: you can redistribute it and/or modify
-  - it under the terms of the GNU Affero General Public License as
-  - published by the Free Software Foundation, either version 3 of the
-  - License, or (at your option) any later version.
-  -
-  - This program is distributed in the hope that it will be useful,
-  - but WITHOUT ANY WARRANTY; without even the implied warranty of
-  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  - GNU Affero General Public License for more details.
-  -
-  - You should have received a copy of the GNU Affero General Public License
-  - along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -
-  -->
-<template>
-	<li>
-		<a :title="t('core', 'Search for {name} only', { name })"
-			class="unified-search__filter"
-			href="#"
-			@click.prevent="onClick">
-			{{ filter }}
-		</a>
-	</li>
-</template>
-
-<script>
-export default {
-	name: 'SearchFilter',
-
-	props: {
-		type: {
-			type: String,
-			required: true,
-		},
-		name: {
-			type: String,
-			required: true,
-		},
-	},
-	computed: {
-		filter() {
-			return `in:${this.type}`
-		},
-	},
-
-	methods: {
-		onClick() {
-			this.$emit('click', this.filter)
-		},
-	},
-
-}
-</script>
-
-<style lang="scss" scoped>
-.unified-search__filter {
-	height: 1em;
-	margin-right: 5px;
-	padding: 3px 8px;
-	border-radius: 1em;
-	background-color: var(--color-background-darker);
-
-	&:active,
-	&:focus,
-	&:hover {
-		background-color: var(--color-background-hover);
-	}
-}
-
-</style>
diff --git a/core/src/components/UnifiedSearch/SearchResultPlaceholder.vue b/core/src/components/UnifiedSearch/SearchResultPlaceholder.vue
deleted file mode 100644
index 7eb0915b359..00000000000
--- a/core/src/components/UnifiedSearch/SearchResultPlaceholder.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<template>
-	<svg
-		class="unified-search__result-placeholder"
-		xmlns="http://www.w3.org/2000/svg"
-		fill="url(#unified-search__result-placeholder-gradient)">
-		<defs>
-			<linearGradient id="unified-search__result-placeholder-gradient">
-				<stop offset="0%" stop-color="#ededed"><animate attributeName="stop-color"
-					values="#ededed; #ededed; #cccccc; #cccccc; #ededed"
-					dur="2s"
-					repeatCount="indefinite" /></stop>
-				<stop offset="100%" stop-color="#cccccc"><animate attributeName="stop-color"
-					values="#cccccc; #ededed; #ededed; #cccccc; #cccccc"
-					dur="2s"
-					repeatCount="indefinite" /></stop>
-			</linearGradient>
-		</defs>
-		<rect class="unified-search__result-placeholder-icon" />
-		<rect class="unified-search__result-placeholder-line-one" />
-		<rect class="unified-search__result-placeholder-line-two" :style="{width: `calc(${randWidth}%)`}" />
-	</svg>
-</template>
-
-<script>
-export default {
-	name: 'SearchResultPlaceholder',
-
-	data() {
-		return {
-			randWidth: Math.floor(Math.random() * 20) + 30,
-		}
-	},
-}
-</script>
-
-<style lang="scss" scoped>
-$clickable-area: 44px;
-$margin: 10px;
-
-.unified-search__result-placeholder {
-	width: calc(100% - 2 * #{$margin});
-	height: $clickable-area;
-	margin: $margin;
-
-	&-icon {
-		width: $clickable-area;
-		height: $clickable-area;
-		rx: var(--border-radius);
-		ry: var(--border-radius);
-	}
-
-	&-line-one,
-	&-line-two {
-		width: calc(100% - #{$margin + $clickable-area});
-		height: 1em;
-		x: $margin + $clickable-area;
-	}
-
-	&-line-one {
-		y: 5px;
-	}
-
-	&-line-two {
-		y: 25px;
-	}
-}
-
-</style>
diff --git a/core/src/components/UnifiedSearch/SearchResultPlaceholders.vue b/core/src/components/UnifiedSearch/SearchResultPlaceholders.vue
new file mode 100644
index 00000000000..31f85f413d3
--- /dev/null
+++ b/core/src/components/UnifiedSearch/SearchResultPlaceholders.vue
@@ -0,0 +1,100 @@
+<template>
+	<ul>
+		<!-- Placeholder animation -->
+		<svg class="unified-search__result-placeholder-gradient">
+			<defs>
+				<linearGradient id="unified-search__result-placeholder-gradient">
+					<stop offset="0%" :stop-color="light">
+						<animate attributeName="stop-color"
+							:values="`${light}; ${light}; ${dark}; ${dark}; ${light}`"
+							dur="2s"
+							repeatCount="indefinite" />
+					</stop>
+					<stop offset="100%" :stop-color="dark">
+						<animate attributeName="stop-color"
+							:values="`${dark}; ${light}; ${light}; ${dark}; ${dark}`"
+							dur="2s"
+							repeatCount="indefinite" />
+					</stop>
+				</linearGradient>
+			</defs>
+		</svg>
+
+		<!-- Placeholders -->
+		<li v-for="placeholder in [1, 2, 3]" :key="placeholder">
+			<svg
+				class="unified-search__result-placeholder"
+				xmlns="http://www.w3.org/2000/svg"
+				fill="url(#unified-search__result-placeholder-gradient)">
+				<rect class="unified-search__result-placeholder-icon" />
+				<rect class="unified-search__result-placeholder-line-one" />
+				<rect class="unified-search__result-placeholder-line-two" :style="{width: `calc(${randWidth()}%)`}" />
+			</svg>
+		</li>
+	</ul>
+</template>
+
+<script>
+export default {
+	name: 'SearchResultPlaceholders',
+
+	data() {
+		return {
+			light: null,
+			dark: null,
+		}
+	},
+	mounted() {
+		const styles = getComputedStyle(document.documentElement)
+		this.dark = styles.getPropertyValue('--color-placeholder-dark')
+		this.light = styles.getPropertyValue('--color-placeholder-light')
+	},
+
+	methods: {
+		randWidth() {
+			return Math.floor(Math.random() * 20) + 30
+		},
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+$clickable-area: 44px;
+$margin: 10px;
+
+.unified-search__result-placeholder-gradient {
+	position: fixed;
+	height: 0;
+	width: 0;
+	z-index: -1;
+}
+
+.unified-search__result-placeholder {
+	width: calc(100% - 2 * #{$margin});
+	height: $clickable-area;
+	margin: $margin;
+
+	&-icon {
+		width: $clickable-area;
+		height: $clickable-area;
+		rx: var(--border-radius);
+		ry: var(--border-radius);
+	}
+
+	&-line-one,
+	&-line-two {
+		width: calc(100% - #{$margin + $clickable-area});
+		height: 1em;
+		x: $margin + $clickable-area;
+	}
+
+	&-line-one {
+		y: 5px;
+	}
+
+	&-line-two {
+		y: 25px;
+	}
+}
+
+</style>
-- 
cgit v1.2.3


From 58b19efd7492bd2edc112da9c3acdd0456385061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Fri, 11 Sep 2020 12:18:10 +0200
Subject: Add users and apps inner search and add HeaderMenu cancel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 core/src/components/HeaderMenu.vue | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'core/src/components')

diff --git a/core/src/components/HeaderMenu.vue b/core/src/components/HeaderMenu.vue
index 9848dc45e38..bb58ba27ab3 100644
--- a/core/src/components/HeaderMenu.vue
+++ b/core/src/components/HeaderMenu.vue
@@ -43,7 +43,6 @@
 
 <script>
 import { directive as ClickOutside } from 'v-click-outside'
-import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 import excludeClickOutsideClasses from '@nextcloud/vue/dist/Mixins/excludeClickOutsideClasses'
 
 export default {
@@ -94,15 +93,8 @@ export default {
 	mounted() {
 		document.addEventListener('keydown', this.onKeyDown)
 	},
-
-	beforeMount() {
-		subscribe(`header-menu-${this.id}-close`, this.closeMenu)
-		subscribe(`header-menu-${this.id}-open`, this.openMenu)
-	},
-
 	beforeDestroy() {
-		unsubscribe(`header-menu-${this.id}-close`, this.closeMenu)
-		unsubscribe(`header-menu-${this.id}-open`, this.openMenu)
+		document.removeEventListener('keydown', this.onKeyDown)
 	},
 
 	methods: {
@@ -129,7 +121,6 @@ export default {
 			this.opened = false
 			this.$emit('close')
 			this.$emit('update:open', false)
-			emit(`header-menu-${this.id}-close`)
 		},
 
 		/**
@@ -143,14 +134,19 @@ export default {
 			this.opened = true
 			this.$emit('open')
 			this.$emit('update:open', true)
-			emit(`header-menu-${this.id}-open`)
 		},
 
 		onKeyDown(event) {
 			// If opened and escape pressed, close
 			if (event.key === 'Escape' && this.opened) {
 				event.preventDefault()
-				this.closeMenu()
+
+				/** user cancelled the menu by pressing escape */
+				this.$emit('cancel')
+
+				/** we do NOT fire a close event to differentiate cancel and close */
+				this.opened = false
+				this.$emit('update:open', false)
 			}
 		},
 	},
-- 
cgit v1.2.3


From f59af6060903bd8af09510a40f97ac14d907072e Mon Sep 17 00:00:00 2001
From: "Jan C. Borchardt" <hey@jancborchardt.net>
Date: Tue, 15 Sep 2020 16:18:08 +0200
Subject: Recommended apps: Empty alt text since the app logo is decorative

Signed-off-by: Jan C. Borchardt <hey@jancborchardt.net>
---
 core/src/components/setup/RecommendedApps.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/src/components')

diff --git a/core/src/components/setup/RecommendedApps.vue b/core/src/components/setup/RecommendedApps.vue
index bd0989f3950..03466c6bbc1 100644
--- a/core/src/components/setup/RecommendedApps.vue
+++ b/core/src/components/setup/RecommendedApps.vue
@@ -32,7 +32,7 @@
 			{{ t('core', 'Installing apps …') }}
 		</p>
 		<div v-for="app in recommendedApps" :key="app.id" class="app">
-			<img :src="customIcon(app.id)" :alt="t('core', 'Nextcloud {app}', { app: app.name })">
+			<img :src="customIcon(app.id)" alt="">
 			<div class="info">
 				<h3>
 					{{ app.name }}
-- 
cgit v1.2.3


From 38dd3027459ee703eb1f6ddc40cc0b278561618a Mon Sep 17 00:00:00 2001
From: "Jan C. Borchardt" <hey@jancborchardt.net>
Date: Tue, 15 Sep 2020 16:19:03 +0200
Subject: Recommended apps: Fix loading spinner color

Signed-off-by: Jan C. Borchardt <hey@jancborchardt.net>
---
 core/src/components/setup/RecommendedApps.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/src/components')

diff --git a/core/src/components/setup/RecommendedApps.vue b/core/src/components/setup/RecommendedApps.vue
index 03466c6bbc1..25158d6e915 100644
--- a/core/src/components/setup/RecommendedApps.vue
+++ b/core/src/components/setup/RecommendedApps.vue
@@ -36,7 +36,7 @@
 			<div class="info">
 				<h3>
 					{{ app.name }}
-					<span v-if="app.loading" class="icon icon-loading-small" />
+					<span v-if="app.loading" class="icon icon-loading-small-dark" />
 					<span v-else-if="app.active" class="icon icon-checkmark-white" />
 				</h3>
 				<p v-html="customDescription(app.id)" />
-- 
cgit v1.2.3


From bfe87e501d83ff4dc9e5057c07464a598d951b4b Mon Sep 17 00:00:00 2001
From: GretaD <gretadoci@gmail.com>
Date: Fri, 30 Oct 2020 15:26:07 +0100
Subject: Add default font size

Signed-off-by: GretaD <gretadoci@gmail.com>
---
 core/src/components/UnifiedSearch/SearchResult.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/src/components')

diff --git a/core/src/components/UnifiedSearch/SearchResult.vue b/core/src/components/UnifiedSearch/SearchResult.vue
index 025ddef86c0..e50cc413d03 100644
--- a/core/src/components/UnifiedSearch/SearchResult.vue
+++ b/core/src/components/UnifiedSearch/SearchResult.vue
@@ -250,7 +250,7 @@ $margin: 10px;
 	}
 	&-line-two {
 		opacity: .7;
-		font-size: 14px;
+		font-size: var(--default-font-size);
 	}
 }
 
-- 
cgit v1.2.3


From 73407d9ee17973e396cf124cc31fa1b5c6be6124 Mon Sep 17 00:00:00 2001
From: Nina Pypchenko <22447785+nina-py@users.noreply.github.com>
Date: Wed, 16 Dec 2020 22:04:41 +1100
Subject: Fix untranslated "User disabled" on login screen

Signed-off-by: Nina Pypchenko <22447785+nina-py@users.noreply.github.com>

Closes #24549.
---
 core/src/components/login/LoginForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/src/components')

diff --git a/core/src/components/login/LoginForm.vue b/core/src/components/login/LoginForm.vue
index 5adf5be0eae..9f0d4f9ba1c 100644
--- a/core/src/components/login/LoginForm.vue
+++ b/core/src/components/login/LoginForm.vue
@@ -94,7 +94,7 @@
 			</p>
 			<p v-else-if="userDisabled"
 				class="warning userDisabledMsg">
-				{{ t('lib', 'User disabled') }}
+				{{ t('core', 'User disabled') }}
 			</p>
 
 			<p v-if="throttleDelay && throttleDelay > 5000"
-- 
cgit v1.2.3


From 18fdefee0bbe0a494f4166061da1e6bb9a6369c8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 18 Jan 2021 13:43:46 +0100
Subject: Readd element ID after component mount.

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 core/src/components/HeaderMenu.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'core/src/components')

diff --git a/core/src/components/HeaderMenu.vue b/core/src/components/HeaderMenu.vue
index bb58ba27ab3..12afa16e091 100644
--- a/core/src/components/HeaderMenu.vue
+++ b/core/src/components/HeaderMenu.vue
@@ -20,7 +20,11 @@
   -
   -->
 <template>
-	<div v-click-outside="clickOutsideConfig" :class="{ 'header-menu--opened': opened }" class="header-menu">
+	<div
+		:id="id"
+		v-click-outside="clickOutsideConfig"
+		:class="{ 'header-menu--opened': opened }"
+		class="header-menu">
 		<a class="header-menu__trigger"
 			href="#"
 			:aria-controls="`header-menu-${id}`"
-- 
cgit v1.2.3


From 3e624dc39966f54c6d418eee2e8141fc5c21f751 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Wed, 31 Mar 2021 12:15:40 +0200
Subject: Bump js licenses
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 core/src/components/ContactsMenu.js | 6 ++++--
 core/src/components/MainMenu.js     | 9 ++++++---
 core/src/components/UserMenu.js     | 7 ++++---
 3 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'core/src/components')

diff --git a/core/src/components/ContactsMenu.js b/core/src/components/ContactsMenu.js
index 0791fe83b0c..a2e09341067 100644
--- a/core/src/components/ContactsMenu.js
+++ b/core/src/components/ContactsMenu.js
@@ -1,7 +1,8 @@
 /**
  * @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
  *
- * @author 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -16,7 +17,8 @@
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
 import $ from 'jquery'
diff --git a/core/src/components/MainMenu.js b/core/src/components/MainMenu.js
index d57711010ea..74ca3de1c5e 100644
--- a/core/src/components/MainMenu.js
+++ b/core/src/components/MainMenu.js
@@ -1,7 +1,9 @@
-/*
+/**
  * @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
  *
- * @author 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ * @author Julius Härtl <jus@bitgrid.net>
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -16,7 +18,8 @@
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
 import $ from 'jquery'
diff --git a/core/src/components/UserMenu.js b/core/src/components/UserMenu.js
index a9e7d8725bb..c4cb6527da3 100644
--- a/core/src/components/UserMenu.js
+++ b/core/src/components/UserMenu.js
@@ -1,7 +1,7 @@
-/*
+/**
  * @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
  *
- * @author 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -16,7 +16,8 @@
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
 import OC from '../OC'
-- 
cgit v1.2.3


From 7cbb2bb5957f26e087ff7f56e6ee243f3a8c7913 Mon Sep 17 00:00:00 2001
From: Valdnet <47037905+Valdnet@users.noreply.github.com>
Date: Fri, 9 Apr 2021 12:39:12 +0200
Subject: l10n: Correct spelling

Unify the spelling in applications.

Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
---
 core/src/components/login/ResetPassword.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/src/components')

diff --git a/core/src/components/login/ResetPassword.vue b/core/src/components/login/ResetPassword.vue
index cba7a89fd88..10f1f8269f3 100644
--- a/core/src/components/login/ResetPassword.vue
+++ b/core/src/components/login/ResetPassword.vue
@@ -51,7 +51,7 @@
 			</div>
 			<p v-if="message === 'send-success'"
 				class="update">
-				{{ t('core', 'A password reset message has been sent to the e-mail address of this account. If you do not receive it, check your spam/junk folders or ask your local administrator for help.') }}
+				{{ t('core', 'A password reset message has been sent to the email address of this account. If you do not receive it, check your spam/junk folders or ask your local administrator for help.') }}
 				<br>
 				{{ t('core', 'If it is not there ask your local administrator.') }}
 			</p>
@@ -133,7 +133,7 @@ export default {
 					this.message = 'send-success'
 				})
 				.catch(e => {
-					console.error('could not send reset e-mail request', e)
+					console.error('could not send reset email request', e)
 
 					this.error = true
 					this.message = 'send-error'
-- 
cgit v1.2.3


From dcf044a7a6cbf08fddd3744cb953c8c6cd34f0f5 Mon Sep 17 00:00:00 2001
From: "Jan C. Borchardt" <hey@jancborchardt.net>
Date: Mon, 12 Apr 2021 14:58:26 +0200
Subject: Fix password visibility toggle alt text and hover/focus feedback

Signed-off-by: Jan C. Borchardt <hey@jancborchardt.net>
---
 core/src/components/login/LoginForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/src/components')

diff --git a/core/src/components/login/LoginForm.vue b/core/src/components/login/LoginForm.vue
index 9f0d4f9ba1c..c75b6f2c7ea 100644
--- a/core/src/components/login/LoginForm.vue
+++ b/core/src/components/login/LoginForm.vue
@@ -82,7 +82,7 @@
 				<label for="password"
 					class="infield">{{ t('Password') }}</label>
 				<a href="#" class="toggle-password" @click.stop.prevent="togglePassword">
-					<img :src="toggleIcon">
+					<img :src="toggleIcon" :alt="t('core', 'Toggle password visibility')">
 				</a>
 			</p>
 
-- 
cgit v1.2.3


From ddfb081463227db147b33f601e0c1ce508170146 Mon Sep 17 00:00:00 2001
From: Valdnet <47037905+Valdnet@users.noreply.github.com>
Date: Mon, 12 Apr 2021 10:22:20 +0200
Subject: l10n: Unify spelling

Spelling unification in Nextcloud applications.
---
 core/src/components/login/ResetPassword.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/src/components')

diff --git a/core/src/components/login/ResetPassword.vue b/core/src/components/login/ResetPassword.vue
index 10f1f8269f3..79589a96aca 100644
--- a/core/src/components/login/ResetPassword.vue
+++ b/core/src/components/login/ResetPassword.vue
@@ -61,7 +61,7 @@
 			</p>
 			<p v-else-if="message === 'reset-error'"
 				class="update warning">
-				{{ t('core', 'Password can not be changed. Please contact your administrator.') }}
+				{{ t('core', 'Password cannot be changed. Please contact your administrator.') }}
 			</p>
 			<p v-else-if="message"
 				class="update"
-- 
cgit v1.2.3


From d27aecebc0750765180020a34a3b33beb676436b Mon Sep 17 00:00:00 2001
From: Valdnet <47037905+Valdnet@users.noreply.github.com>
Date: Mon, 12 Apr 2021 10:23:11 +0200
Subject: l10n: Unify spelling

Spelling unification in Nextcloud applications.
---
 core/src/components/login/UpdatePassword.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/src/components')

diff --git a/core/src/components/login/UpdatePassword.vue b/core/src/components/login/UpdatePassword.vue
index 3fa3c60773c..cb615a846d2 100644
--- a/core/src/components/login/UpdatePassword.vue
+++ b/core/src/components/login/UpdatePassword.vue
@@ -125,7 +125,7 @@ export default {
 				}
 			} catch (e) {
 				this.error = true
-				this.message = e.message ? e.message : t('core', 'Password can not be changed. Please contact your administrator.')
+				this.message = e.message ? e.message : t('core', 'Password cannot be changed. Please contact your administrator.')
 			} finally {
 				this.loading = false
 			}
-- 
cgit v1.2.3


From 7bc22370b4528ab2400a566bbdd235de988c6129 Mon Sep 17 00:00:00 2001
From: Valdnet <47037905+Valdnet@users.noreply.github.com>
Date: Mon, 12 Apr 2021 12:58:59 +0200
Subject: l10n: Unify spelling

Spelling unification in Nextcloud applications.
---
 core/src/components/setup/RecommendedApps.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/src/components')

diff --git a/core/src/components/setup/RecommendedApps.vue b/core/src/components/setup/RecommendedApps.vue
index 25158d6e915..e4cd39544cb 100644
--- a/core/src/components/setup/RecommendedApps.vue
+++ b/core/src/components/setup/RecommendedApps.vue
@@ -44,10 +44,10 @@
 					<strong>{{ t('core', 'App download or installation failed') }}</strong>
 				</p>
 				<p v-else-if="!app.isCompatible">
-					<strong>{{ t('core', 'Can\'t install this app because it is not compatible') }}</strong>
+					<strong>{{ t('core', 'Cannot install this app because it is not compatible') }}</strong>
 				</p>
 				<p v-else-if="!app.canInstall">
-					<strong>{{ t('core', 'Can\'t install this app') }}</strong>
+					<strong>{{ t('core', 'Cannot install this app') }}</strong>
 				</p>
 			</div>
 		</div>
-- 
cgit v1.2.3


From 9c6b01abeba6928bd43dc71ac2f2372f2ea0c49f Mon Sep 17 00:00:00 2001
From: Valdnet <47037905+Valdnet@users.noreply.github.com>
Date: Fri, 21 May 2021 15:45:54 +0200
Subject: l10n: Spelling unification

Spelling unification in Transifex.

Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
---
 core/src/components/setup/RecommendedApps.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/src/components')

diff --git a/core/src/components/setup/RecommendedApps.vue b/core/src/components/setup/RecommendedApps.vue
index e4cd39544cb..581fb99582c 100644
--- a/core/src/components/setup/RecommendedApps.vue
+++ b/core/src/components/setup/RecommendedApps.vue
@@ -26,7 +26,7 @@
 			{{ t('core', 'Loading apps …') }}
 		</p>
 		<p v-else-if="loadingAppsError" class="loading-error text-center">
-			{{ t('core', 'Could not fetch list of apps from the app store.') }}
+			{{ t('core', 'Could not fetch list of apps from the App Store.') }}
 		</p>
 		<p v-else class="text-center">
 			{{ t('core', 'Installing apps …') }}
-- 
cgit v1.2.3


From a94236483e26785dcaf97fb10e863f82348eb068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Tue, 11 May 2021 08:22:51 +0200
Subject: Let apps toggle an unread counter on app icons
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Louis Chemineau <louis@chmn.me>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 core/src/components/MainMenu.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'core/src/components')

diff --git a/core/src/components/MainMenu.js b/core/src/components/MainMenu.js
index 74ca3de1c5e..3b5aa19245e 100644
--- a/core/src/components/MainMenu.js
+++ b/core/src/components/MainMenu.js
@@ -32,6 +32,26 @@ import OC from '../OC'
  * If the screen is bigger, the main menu is not a toggle any more.
  */
 export const setUp = () => {
+
+	Object.assign(OC, {
+		setNavigationCounter(id, counter) {
+			const appmenuElement = document.getElementById('appmenu').querySelector('[data-id="' + id + '"] svg')
+			const appsElement = document.getElementById('apps').querySelector('[data-id="' + id + '"] svg')
+			if (counter === 0) {
+				appmenuElement.classList.remove('has-unread')
+				appsElement.classList.remove('has-unread')
+				appmenuElement.getElementsByTagName('image')[0].style.mask = ''
+				appsElement.getElementsByTagName('image')[0].style.mask = ''
+			} else {
+				appmenuElement.classList.add('has-unread')
+				appsElement.classList.add('has-unread')
+				appmenuElement.getElementsByTagName('image')[0].style.mask = 'url(#hole)'
+				appsElement.getElementsByTagName('image')[0].style.mask = 'url(#hole)'
+			}
+			document.getElementById('appmenu').querySelector('[data-id="' + id + '"] .unread-counter').textContent = counter
+			document.getElementById('apps').querySelector('[data-id="' + id + '"] .unread-counter').textContent = counter
+		},
+	})
 	// init the more-apps menu
 	OC.registerMenu($('#more-apps > a'), $('#navigation'))
 
-- 
cgit v1.2.3


From 86080e68b2a23b0759d81509c3bf47ad254f5ce7 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 17 Jun 2021 10:01:31 +0200
Subject: Allow WebAuthn on localhost as well

* browsers typically whiteliste this as well - https://developer.mozilla.org/en-US/docs/Web/API/Web_Authentication_API
* for developing purposes see https://developer.chrome.com/docs/devtools/webauthn/

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Signed-off-by: Louis Chemineau <louis@chmn.me>
---
 core/src/components/login/PasswordLessLoginForm.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'core/src/components')

diff --git a/core/src/components/login/PasswordLessLoginForm.vue b/core/src/components/login/PasswordLessLoginForm.vue
index df774599f92..0203bd74c48 100644
--- a/core/src/components/login/PasswordLessLoginForm.vue
+++ b/core/src/components/login/PasswordLessLoginForm.vue
@@ -1,5 +1,5 @@
 <template>
-	<form v-if="isHttps && hasPublicKeyCredential"
+	<form v-if="(isHttps || isLocalhost) && hasPublicKeyCredential"
 		ref="loginForm"
 		method="post"
 		name="login"
@@ -32,7 +32,7 @@
 	<div v-else-if="!hasPublicKeyCredential">
 		{{ t('core', 'Passwordless authentication is not supported in your browser.') }}
 	</div>
-	<div v-else-if="!isHttps">
+	<div v-else-if="!isHttps && !isLocalhost">
 		{{ t('core', 'Passwordless authentication is only available over a secure connection.') }}
 	</div>
 </template>
@@ -73,6 +73,10 @@ export default {
 			type: Boolean,
 			default: false,
 		},
+		isLocalhost: {
+			type: Boolean,
+			default: false,
+		},
 		hasPublicKeyCredential: {
 			type: Boolean,
 			default: false,
-- 
cgit v1.2.3