summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/lint-php.yml2
-rw-r--r--.github/workflows/phpunit.yml5
-rw-r--r--appinfo/info.xml2
-rw-r--r--composer.json2
-rw-r--r--composer.lock6
-rw-r--r--l10n/eu.js3
-rw-r--r--l10n/eu.json3
-rw-r--r--l10n/sk.js4
-rw-r--r--l10n/sk.json4
-rw-r--r--package-lock.json18
-rw-r--r--package.json2
-rw-r--r--src/components/ContactDetails/ContactDetailsProperty.vue15
12 files changed, 41 insertions, 25 deletions
diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml
index 8d7f63f8..a0081dc1 100644
--- a/.github/workflows/lint-php.yml
+++ b/.github/workflows/lint-php.yml
@@ -25,7 +25,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- php-versions: [ "8.0", "8.1", "8.2" ]
+ php-versions: [ "8.0", "8.1", "8.2", "8.3"]
name: php-lint
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 4b7ada07..031b1c10 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -88,10 +88,13 @@ jobs:
# do not stop on another job's failure
fail-fast: false
matrix:
- php-versions: ['8.0', '8.1', '8.2']
+ php-versions: ['8.1', '8.2', '8.3']
databases: ['mysql']
server-versions: ['master']
include:
+ - php-versions: '8.0'
+ server-versions: 'master'
+ databases: 'mysql'
- php-versions: '7.4'
server-versions: stable25
databases: 'mysql'
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 4070bd8c..193ab38c 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -38,7 +38,7 @@
<screenshot>https://raw.githubusercontent.com/nextcloud/screenshots/master/apps/Contacts/contacts.png</screenshot>
<dependencies>
- <php min-version="7.4" max-version="8.2" />
+ <php min-version="7.4" max-version="8.3" />
<nextcloud min-version="25" max-version="28" />
</dependencies>
diff --git a/composer.json b/composer.json
index d5eadb9e..4207e601 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
"test:integration": "phpunit -c phpunit.integration.xml --fail-on-warning"
},
"require": {
- "php": ">=7.4 <=8.2"
+ "php": ">=7.4 <=8.3"
},
"require-dev": {
"christophwurst/nextcloud_testing": "^0.12.4",
diff --git a/composer.lock b/composer.lock
index 9afd28da..dbd129e1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "7fe5308939c4dcb823f6375366303261",
+ "content-hash": "e67e8e0b4ca7f901bff816cc045ed61a",
"packages": [],
"packages-dev": [
{
@@ -3989,11 +3989,11 @@
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
- "php": ">=7.4 <=8.2"
+ "php": ">=7.4 <=8.3"
},
"platform-dev": [],
"platform-overrides": {
"php": "7.4"
},
- "plugin-api-version": "2.3.0"
+ "plugin-api-version": "2.6.0"
}
diff --git a/l10n/eu.js b/l10n/eu.js
index ec9c7f7c..29f69d39 100644
--- a/l10n/eu.js
+++ b/l10n/eu.js
@@ -103,7 +103,7 @@ OC.L10N.register(
"More fields" : "Eremu gehiago",
"Crop contact photo" : "Moztu kontaktuaren argazkia",
"Cancel" : "Utzi",
- "Upload a new picture" : "Kargatu irudi berri bat",
+ "Upload a new picture" : "Igo irudi berri bat",
"Choose from Files" : "Aukeratu Fitxategiak-etik",
"Get from " : "Hartu hemendik",
"Download picture" : "Deskargatu irudia",
@@ -128,6 +128,7 @@ OC.L10N.register(
"Contact vCard as QR code" : "Kontaktuaren vCard QR kode bezala",
"Pick an address book" : "Aukeratu helbide-liburu bat",
"Select address book" : "Hautatu helbide-liburua",
+ "Go to talk conversation" : "Joan talk elkarrizketara",
"View profile" : "Ikusi profila",
"This contact is in read-only mode. You do not have permission to edit this contact." : "Kontaktu hau irakurtzeko soilik moduan dago. Ez daukazu baimenik kontaktu hau editatzeko.",
"The contact you were trying to edit has changed. Please manually refresh the contact. Any further edits will be discarded." : "Editatzen saiatu zaren kontaktua aldatu egin da. Mesedez freskatu kontaktua eskuz. Hurrengo editatze guztiak baztertu egingo dira.",
diff --git a/l10n/eu.json b/l10n/eu.json
index 3d4eeb0f..faffaa48 100644
--- a/l10n/eu.json
+++ b/l10n/eu.json
@@ -101,7 +101,7 @@
"More fields" : "Eremu gehiago",
"Crop contact photo" : "Moztu kontaktuaren argazkia",
"Cancel" : "Utzi",
- "Upload a new picture" : "Kargatu irudi berri bat",
+ "Upload a new picture" : "Igo irudi berri bat",
"Choose from Files" : "Aukeratu Fitxategiak-etik",
"Get from " : "Hartu hemendik",
"Download picture" : "Deskargatu irudia",
@@ -126,6 +126,7 @@
"Contact vCard as QR code" : "Kontaktuaren vCard QR kode bezala",
"Pick an address book" : "Aukeratu helbide-liburu bat",
"Select address book" : "Hautatu helbide-liburua",
+ "Go to talk conversation" : "Joan talk elkarrizketara",
"View profile" : "Ikusi profila",
"This contact is in read-only mode. You do not have permission to edit this contact." : "Kontaktu hau irakurtzeko soilik moduan dago. Ez daukazu baimenik kontaktu hau editatzeko.",
"The contact you were trying to edit has changed. Please manually refresh the contact. Any further edits will be discarded." : "Editatzen saiatu zaren kontaktua aldatu egin da. Mesedez freskatu kontaktua eskuz. Hurrengo editatze guztiak baztertu egingo dira.",
diff --git a/l10n/sk.js b/l10n/sk.js
index 6cacb618..306c99f6 100644
--- a/l10n/sk.js
+++ b/l10n/sk.js
@@ -22,7 +22,7 @@ OC.L10N.register(
"Add contacts" : "Pridať kontakty",
"Loading …" : "Načítava sa...",
"Add member" : "Pridať člena",
- "Leave circle" : "Opustiť okruh",
+ "Leave circle" : "Opustiť kruh",
"Delete circle" : "Zmazať kruh",
"Contacts settings" : "Nastavenia kontaktov",
"General settings" : "Všeobecné nastavenia",
@@ -52,6 +52,7 @@ OC.L10N.register(
"Renaming of address book was not successful." : "Premenovanie adresára nebolo úspešné.",
"_Shared with {num} entity_::_Shared with {num} entities_" : ["Zdieľané s {num} entitou","Zdieľané s {num} entitami","Zdieľané s {num} entitami","Zdieľané s {num} entitami"],
"Share with users or groups" : "Sprístupniť používateľom alebo skupinám",
+ "Share with users" : "Zdieľať s používateľmi",
"No users or groups" : "Žiadny používatelia alebo skupiny",
"can edit" : "môže upravovať",
"Unable to delete the share" : "Nemožno zmazať zdieľanie.",
@@ -96,6 +97,7 @@ OC.L10N.register(
"Download picture" : "Stiahnuť obrázok",
"Delete picture" : "Zmazať obrázok",
"Invalid image" : "Chybný obrázok",
+ "Error cropping picture" : "Chyba počas orezávania obrázku",
"Pick an avatar" : "Zvoľte si avatar",
"Error while processing the picture." : "Chyba pri spracovaní obrázka.",
"Avatar downloaded from social network" : "Avatar stiahnutý zo sociálnej siete",
diff --git a/l10n/sk.json b/l10n/sk.json
index 06071f09..13b11cbd 100644
--- a/l10n/sk.json
+++ b/l10n/sk.json
@@ -20,7 +20,7 @@
"Add contacts" : "Pridať kontakty",
"Loading …" : "Načítava sa...",
"Add member" : "Pridať člena",
- "Leave circle" : "Opustiť okruh",
+ "Leave circle" : "Opustiť kruh",
"Delete circle" : "Zmazať kruh",
"Contacts settings" : "Nastavenia kontaktov",
"General settings" : "Všeobecné nastavenia",
@@ -50,6 +50,7 @@
"Renaming of address book was not successful." : "Premenovanie adresára nebolo úspešné.",
"_Shared with {num} entity_::_Shared with {num} entities_" : ["Zdieľané s {num} entitou","Zdieľané s {num} entitami","Zdieľané s {num} entitami","Zdieľané s {num} entitami"],
"Share with users or groups" : "Sprístupniť používateľom alebo skupinám",
+ "Share with users" : "Zdieľať s používateľmi",
"No users or groups" : "Žiadny používatelia alebo skupiny",
"can edit" : "môže upravovať",
"Unable to delete the share" : "Nemožno zmazať zdieľanie.",
@@ -94,6 +95,7 @@
"Download picture" : "Stiahnuť obrázok",
"Delete picture" : "Zmazať obrázok",
"Invalid image" : "Chybný obrázok",
+ "Error cropping picture" : "Chyba počas orezávania obrázku",
"Pick an avatar" : "Zvoľte si avatar",
"Error while processing the picture." : "Chyba pri spracovaní obrázka.",
"Avatar downloaded from social network" : "Avatar stiahnutý zo sociálnej siete",
diff --git a/package-lock.json b/package-lock.json
index ec5e0ccf..39fc3ec4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,7 @@
"@nextcloud/event-bus": "^3.1.0",
"@nextcloud/initial-state": "^2.1.0",
"@nextcloud/l10n": "^2.2.0",
- "@nextcloud/logger": "^2.5.0",
+ "@nextcloud/logger": "^2.7.0",
"@nextcloud/moment": "^1.2.1",
"@nextcloud/paths": "^2.1.0",
"@nextcloud/router": "^2.1.2",
@@ -3025,16 +3025,16 @@
}
},
"node_modules/@nextcloud/logger": {
- "version": "2.5.0",
- "resolved": "https://registry.npmjs.org/@nextcloud/logger/-/logger-2.5.0.tgz",
- "integrity": "sha512-vJx5YxPyS9/tg3YoqA8CBN7YTZFHfuhMKJIIWFV28phxXqKhGwKVKh+/Ir8ZIPweIM5n8VNT6JOJq1JjGiMg2w==",
+ "version": "2.7.0",
+ "resolved": "https://registry.npmjs.org/@nextcloud/logger/-/logger-2.7.0.tgz",
+ "integrity": "sha512-DSJg9H1jT2zfr7uoP4tL5hKncyY+LOuxJzLauj0M/f6gnpoXU5WG1Zw8EFPOrRWjkC0ZE+NCqrMnITgdRRpXJQ==",
"dependencies": {
"@nextcloud/auth": "^2.0.0",
"core-js": "^3.6.4"
},
"engines": {
- "node": "^16.0.0",
- "npm": "^7.0.0 || ^8.0.0"
+ "node": "^20.0.0",
+ "npm": "^9.0.0"
}
},
"node_modules/@nextcloud/moment": {
@@ -19919,9 +19919,9 @@
}
},
"@nextcloud/logger": {
- "version": "2.5.0",
- "resolved": "https://registry.npmjs.org/@nextcloud/logger/-/logger-2.5.0.tgz",
- "integrity": "sha512-vJx5YxPyS9/tg3YoqA8CBN7YTZFHfuhMKJIIWFV28phxXqKhGwKVKh+/Ir8ZIPweIM5n8VNT6JOJq1JjGiMg2w==",
+ "version": "2.7.0",
+ "resolved": "https://registry.npmjs.org/@nextcloud/logger/-/logger-2.7.0.tgz",
+ "integrity": "sha512-DSJg9H1jT2zfr7uoP4tL5hKncyY+LOuxJzLauj0M/f6gnpoXU5WG1Zw8EFPOrRWjkC0ZE+NCqrMnITgdRRpXJQ==",
"requires": {
"@nextcloud/auth": "^2.0.0",
"core-js": "^3.6.4"
diff --git a/package.json b/package.json
index 0befb0d2..248a5e65 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
"@nextcloud/event-bus": "^3.1.0",
"@nextcloud/initial-state": "^2.1.0",
"@nextcloud/l10n": "^2.2.0",
- "@nextcloud/logger": "^2.5.0",
+ "@nextcloud/logger": "^2.7.0",
"@nextcloud/moment": "^1.2.1",
"@nextcloud/paths": "^2.1.0",
"@nextcloud/router": "^2.1.2",
diff --git a/src/components/ContactDetails/ContactDetailsProperty.vue b/src/components/ContactDetails/ContactDetailsProperty.vue
index d0e1ec4f..254911e2 100644
--- a/src/components/ContactDetails/ContactDetailsProperty.vue
+++ b/src/components/ContactDetails/ContactDetailsProperty.vue
@@ -252,11 +252,18 @@ export default {
// https://jsperf.com/array-map-and-intersection-perf
const matchingTypes = this.propModel.options
.map(type => {
- return {
- type,
- // "WORK,HOME" => ['WORK', 'HOME']
- score: type.id.split(',').filter(value => selectedType.indexOf(value) !== -1).length,
+ let score = 0
+ const types = type.id.split(',') // "WORK,HOME" => ['WORK', 'HOME']
+
+ if (types.length === selectedType.length) {
+ // additional point for same length
+ score++
}
+
+ const intersection = types.filter(value => selectedType.includes(value))
+ score = score + intersection.length
+
+ return { type, score }
})
// Sort by score, filtering out the null score and selecting the first match
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 20:12:31 +0000