[pull] master from nextcloud:master

apps/dashboard/src/DashboardApp.vue

@@ -234,28 +234,28 @@ export default {
 			const good = {
 				morning: {
 					generic: t('dashboard', 'Good morning'),
-					withName: t('dashboard', 'Good morning, {name}', { name: this.displayName }, undefined, { escape: false }),
+					withName: t('dashboard', 'Good morning, {name}', { name: this.displayName }, { escape: false }),
 				},
 
 				afternoon: {
 					generic: t('dashboard', 'Good afternoon'),
-					withName: t('dashboard', 'Good afternoon, {name}', { name: this.displayName }, undefined, { escape: false }),
+					withName: t('dashboard', 'Good afternoon, {name}', { name: this.displayName }, { escape: false }),
 				},
 
 				evening: {
 					generic: t('dashboard', 'Good evening'),
-					withName: t('dashboard', 'Good evening, {name}', { name: this.displayName }, undefined, { escape: false }),
+					withName: t('dashboard', 'Good evening, {name}', { name: this.displayName }, { escape: false }),
 				},
 
 				night: {
 					// Don't use "Good night" as it's not a greeting
-					generic: t('dashboard', 'Hello'),
-					withName: t('dashboard', 'Hello, {name}', { name: this.displayName }, undefined, { escape: false }),
+					generic: t('dashboard', 'Hello') /* TRANSLATORS: Greeting to be used at night (in English there is no specific greeting, think of it like "good morning") */,
+					withName: t('dashboard', 'Hello, {name}', { name: this.displayName }, { escape: false }) /* TRANSLATORS: Greeting to be used at night (in English there is no specific greeting, think of it like "Good morning, J. Doe" but at night) */,
 				},
 
 				birthday: {
 					generic: t('dashboard', 'Happy birthday 🥳🤩🎂🎉'),
-					withName: t('dashboard', 'Happy birthday, {name} 🥳🤩🎂🎉', { name: this.displayName }, undefined, { escape: false }),
+					withName: t('dashboard', 'Happy birthday, {name} 🥳🤩🎂🎉', { name: this.displayName }, { escape: false }),
 				},
 			}
 

core/src/components/UnifiedSearch/UnifiedSearchModal.vue

@@ -1026,11 +1026,13 @@ export default defineComponent({
 				case '7days':
 				// For 'Last 7 days', start date is 7 days ago, end is today
 					startDate = new Date(today.getFullYear(), today.getMonth(), today.getDate() - 6, 0, 0, 0, 0)
+					endDate = new Date(today.getFullYear(), today.getMonth(), today.getDate(), 23, 59, 59, 999)
 					this.dateFilter.text = t('core', 'Last 7 days')
 					break
 				case '30days':
 				// For 'Last 30 days', start date is 30 days ago, end is today
 					startDate = new Date(today.getFullYear(), today.getMonth(), today.getDate() - 29, 0, 0, 0, 0)
+					endDate = new Date(today.getFullYear(), today.getMonth(), today.getDate(), 23, 59, 59, 999)
 					this.dateFilter.text = t('core', 'Last 30 days')
 					break
 				case 'thisyear':

core/src/globals.js

@@ -1,4 +1,3 @@
-/* eslint-disable @nextcloud/no-deprecated-globals */
 /*!
  * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -10,7 +9,6 @@ import moment from 'moment'
 import _ from 'underscore'
 import { initCore } from './init.js'
 import OC from './OC/index.js'
-import { getRequestToken } from './OC/requesttoken.ts'
 import OCA from './OCA/index.js'
 import OCP from './OCP/index.js'
 
@@ -55,15 +53,6 @@ setDeprecatedProp('moment', () => moment, 'please ship your own, this will be re
 
 window.OC = OC
 setDeprecatedProp('initCore', () => initCore, 'this is an internal function')
-setDeprecatedProp('oc_appswebroots', () => OC.appswebroots, 'use OC.appswebroots instead, this will be removed in Nextcloud 20')
-setDeprecatedProp('oc_config', () => OC.config, 'use OC.config instead, this will be removed in Nextcloud 20')
-setDeprecatedProp('oc_current_user', () => OC.getCurrentUser().uid, 'use OC.getCurrentUser().uid instead, this will be removed in Nextcloud 20')
-setDeprecatedProp('oc_debug', () => OC.debug, 'use OC.debug instead, this will be removed in Nextcloud 20')
-setDeprecatedProp('oc_defaults', () => OC.theme, 'use OC.theme instead, this will be removed in Nextcloud 20')
-setDeprecatedProp('oc_isadmin', OC.isUserAdmin, 'use OC.isUserAdmin() instead, this will be removed in Nextcloud 20')
-setDeprecatedProp('oc_requesttoken', () => getRequestToken(), 'use OC.requestToken instead, this will be removed in Nextcloud 20')
-setDeprecatedProp('oc_webroot', () => OC.webroot, 'use OC.getRootPath() instead, this will be removed in Nextcloud 20')
-setDeprecatedProp('OCDialogs', () => OC.dialogs, 'use OC.dialogs instead, this will be removed in Nextcloud 20')
 window.OCP = OCP
 window.OCA = OCA
 

dist/dashboard-main.css

@@ -1,5 +1,5 @@
 /* extracted by css-entry-points-plugin */
-@import './dashboard-dashboard-main-CiWxwGSm.chunk.css';
+@import './dashboard-dashboard-main-DBQeZOKy.chunk.css';
 @import './common-createElementId-DhjFt1I9-C_oBIsvc.chunk.css';
 @import './common-logger-D3RVzcfQ-Ks0gkIDB.chunk.css';
 @import './common-NcModal-DiDvgcU8-B-yi1OwC.chunk.css';

tests/playwright/e2e/dashboard/widget-performance.spec.ts

@@ -27,7 +27,7 @@ test('dashboard: only loads the data of enabled widgets', async ({ page, user })
 
 	const loaded = page.waitForResponse((r) => WIDGET_ITEMS_API.test(r.url()))
 	await page.goto('apps/dashboard')
-	await expect(page.getByRole('heading', { name: /Good (morning|afternoon|evening|night)/ })).toBeVisible()
+	await expect(page.getByRole('heading', { name: /(Good (morning|afternoon|evening)|Hello)/ })).toBeVisible()
 	await loaded
 
 	// Give any further (unwanted) widget request time to be fired …