summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2020-10-12 14:10:58 +0200
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2020-10-12 14:10:58 +0200
commit5c2eb89b0fe280eaf819b9690cf15146a81d8e0a (patch)
treedf2af0af918dadbd4d3540791bda4ce8851ee4a6
parent3181da77bbfcdd37969083a2f44b2172efe6d477 (diff)
parent5db0aae9c57d53d7a5d4a4e11d23591b4a8b4682 (diff)
Merge branch 'master' of https://github.com/nextcloud/contacts into master
zsh:1: command not found: q
-rw-r--r--l10n/el.js1
-rw-r--r--l10n/el.json1
-rw-r--r--l10n/ja.js2
-rw-r--r--l10n/ja.json2
-rw-r--r--l10n/sl.js1
-rw-r--r--l10n/sl.json1
-rw-r--r--lib/Service/SocialApiService.php4
-rw-r--r--package-lock.json173
-rw-r--r--package.json18
-rw-r--r--src/components/Properties/PropertyText.vue14
10 files changed, 151 insertions, 66 deletions
diff --git a/l10n/el.js b/l10n/el.js
index 8b645d9f..8f3c3881 100644
--- a/l10n/el.js
+++ b/l10n/el.js
@@ -86,6 +86,7 @@ OC.L10N.register(
"Group name" : "Όνομα ομάδας",
"Loading contacts …" : "Φόρτωση επαφών ...",
"Not grouped" : "Χωρίς ομάδα",
+ "Recently contacted" : "Πρόσφατη επικοινωνία",
"Unable to create the contact." : "Αδυναμία δημιουργίας επαφής.",
"Contact not found" : "Δεν βρέθηκε η επαφή.",
"Close" : "Κλείσιμο",
diff --git a/l10n/el.json b/l10n/el.json
index a0e56b8f..acd2404c 100644
--- a/l10n/el.json
+++ b/l10n/el.json
@@ -84,6 +84,7 @@
"Group name" : "Όνομα ομάδας",
"Loading contacts …" : "Φόρτωση επαφών ...",
"Not grouped" : "Χωρίς ομάδα",
+ "Recently contacted" : "Πρόσφατη επικοινωνία",
"Unable to create the contact." : "Αδυναμία δημιουργίας επαφής.",
"Contact not found" : "Δεν βρέθηκε η επαφή.",
"Close" : "Κλείσιμο",
diff --git a/l10n/ja.js b/l10n/ja.js
index 4f90ba79..d1dcd668 100644
--- a/l10n/ja.js
+++ b/l10n/ja.js
@@ -35,7 +35,7 @@ OC.L10N.register(
"This contact is not yet synced. Edit it to save it to the server." : "この連絡先はまだ同期されていません。 それを編集してサーバーに保存してください。",
"This contact is in read-only mode. You do not have permission to edit this contact." : "この連絡先は読み取り専用モードです。 この連絡先を編集する権限がありません。",
"The contact you were trying to edit has changed. Please manually refresh the contact. Any further edits will be discarded." : "編集しようとした連絡先が変更されました。 連絡先を手動で更新してください。 それ以上の編集は破棄されます。",
- "Address book" : "連絡帳",
+ "Address book" : "アドレス帳",
"Groups" : "グループ",
"New contact" : "新しい連絡先",
"Syntax error. Cannot open the contact." : "構文エラー。 連絡先を開けません",
diff --git a/l10n/ja.json b/l10n/ja.json
index c332353b..3cb4b673 100644
--- a/l10n/ja.json
+++ b/l10n/ja.json
@@ -33,7 +33,7 @@
"This contact is not yet synced. Edit it to save it to the server." : "この連絡先はまだ同期されていません。 それを編集してサーバーに保存してください。",
"This contact is in read-only mode. You do not have permission to edit this contact." : "この連絡先は読み取り専用モードです。 この連絡先を編集する権限がありません。",
"The contact you were trying to edit has changed. Please manually refresh the contact. Any further edits will be discarded." : "編集しようとした連絡先が変更されました。 連絡先を手動で更新してください。 それ以上の編集は破棄されます。",
- "Address book" : "連絡帳",
+ "Address book" : "アドレス帳",
"Groups" : "グループ",
"New contact" : "新しい連絡先",
"Syntax error. Cannot open the contact." : "構文エラー。 連絡先を開けません",
diff --git a/l10n/sl.js b/l10n/sl.js
index a1914ae7..14a43753 100644
--- a/l10n/sl.js
+++ b/l10n/sl.js
@@ -96,6 +96,7 @@ OC.L10N.register(
"There are no contacts in this group" : "V tej skupini ni stikov",
"Create contacts" : "Ustvari stike",
"Not grouped" : "Brez skupine",
+ "Recently contacted" : "Nedavno v stiku",
"Unable to create the contact." : "Ni mogoče ustvariti stika.",
"Contact not found" : "Stika ni mogoče najti",
"Group not found" : "Skupine ni mogoče najti",
diff --git a/l10n/sl.json b/l10n/sl.json
index 1bb0582b..5a1ba95c 100644
--- a/l10n/sl.json
+++ b/l10n/sl.json
@@ -94,6 +94,7 @@
"There are no contacts in this group" : "V tej skupini ni stikov",
"Create contacts" : "Ustvari stike",
"Not grouped" : "Brez skupine",
+ "Recently contacted" : "Nedavno v stiku",
"Unable to create the contact." : "Ni mogoče ustvariti stika.",
"Contact not found" : "Stika ni mogoče najti",
"Group not found" : "Skupine ni mogoče najti",
diff --git a/lib/Service/SocialApiService.php b/lib/Service/SocialApiService.php
index 8594ba68..03484c99 100644
--- a/lib/Service/SocialApiService.php
+++ b/lib/Service/SocialApiService.php
@@ -209,7 +209,7 @@ class SocialApiService {
}
$addressBook->createOrUpdate($changes, $addressbookId);
- } catch (Exception $e) {
+ } catch (\Exception $e) {
return new JSONResponse([], Http::STATUS_INTERNAL_SERVER_ERROR);
}
return new JSONResponse([], Http::STATUS_OK);
@@ -383,7 +383,7 @@ class SocialApiService {
try {
$r = $this->updateContact($addressBook->getURI(), $contact['UID'], $network);
$response = $this->registerUpdateResult($response, $contact['FN'], $r->getStatus());
- } catch (Exception $e) {
+ } catch (\Exception $e) {
$response = $this->registerUpdateResult($response, $contact['FN'], '-1');
}
diff --git a/package-lock.json b/package-lock.json
index fe640359..8b2e38b5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2430,14 +2430,24 @@
}
},
"@nextcloud/dialogs": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/@nextcloud/dialogs/-/dialogs-2.0.1.tgz",
- "integrity": "sha512-Bme8vcs8n4XT5spBgkDEv1z9zNOE23AIbr5jF1WJ1A2XNMNj5Zvy29RosIh0k7H+1lN0PlU38u+eMV1Ets3E4A==",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/@nextcloud/dialogs/-/dialogs-3.0.0.tgz",
+ "integrity": "sha512-5FVP0RSxIpKTKdSUlQ4osDDz/oCx2/4+InliB5MX2EcrjDe6q3fZMabSGnFTnIAu0CXRTzBk7RpneaIFGv+d5A==",
"requires": {
"@nextcloud/l10n": "^1.3.0",
- "@nextcloud/typings": "^0.2.2",
+ "@nextcloud/typings": "^1.0.0",
"core-js": "^3.6.4",
"toastify-js": "^1.9.1"
+ },
+ "dependencies": {
+ "@nextcloud/typings": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@nextcloud/typings/-/typings-1.0.0.tgz",
+ "integrity": "sha512-r8SRvXszWTyKWEhVd3gx7eBAcCKwdoLlr+ZrR8hrSxs2nfH00de/QoGdo0n/Rcv/9mMtX/haJNd71KwODM2+uQ==",
+ "requires": {
+ "@types/jquery": "2.0.54"
+ }
+ }
}
},
"@nextcloud/eslint-config": {
@@ -2447,9 +2457,9 @@
"dev": true
},
"@nextcloud/eslint-plugin": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/@nextcloud/eslint-plugin/-/eslint-plugin-1.4.0.tgz",
- "integrity": "sha512-w3k04Rj1lBHO4MNhiO4e4WPnijsqTYJhBJ3v+8bYlBi83L5OG+oqu7UHq4ETeDrHVC8QLweu/8vx6iGah00img==",
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/@nextcloud/eslint-plugin/-/eslint-plugin-1.5.0.tgz",
+ "integrity": "sha512-cM8+xlJy1FPiADGBcFn3mB2RYQLQjME/jMF5YVEIA1AQGavgT4JHo+I6DVIBoTyoGbAGrTf94FDrRKdoIm1JWQ==",
"dev": true,
"requires": {
"requireindex": "^1.2.0"
@@ -2466,9 +2476,9 @@
}
},
"@nextcloud/initial-state": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/@nextcloud/initial-state/-/initial-state-1.1.2.tgz",
- "integrity": "sha512-AmewfDmsCgL9j062VWkgWPg+dfyu63xxqv29ErAJ1WZiEQK/gb2IyiILDMTXdVeNHGDY874mzBcAAkpFO/DxnQ==",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/@nextcloud/initial-state/-/initial-state-1.2.0.tgz",
+ "integrity": "sha512-/ZN4f/gihvRPXa7S2mgV2Is5QyEGqb4/Z2OGHxilJV86ZKBnR9DlA5dFqtzdV86dHVsZ+PfthUI3vDPJ81hTJA==",
"requires": {
"core-js": "^3.6.4"
}
@@ -2507,9 +2517,9 @@
}
},
"@nextcloud/vue": {
- "version": "2.6.8",
- "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-2.6.8.tgz",
- "integrity": "sha512-9yi9V4gX4Y1uxh2hNxCAlTHaS9zolzAy7x1sowII/WZfxMysF/yIGmEsnYGyz6CZ5eYCzxNUgrU5p/HQ21/09Q==",
+ "version": "2.7.0",
+ "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-2.7.0.tgz",
+ "integrity": "sha512-iZxTUWsDvfQdi3FRqEBfv5MGqJPPISk9FEXhX98wnWX37YaDwx9qOpvAQo+/6bjVVwwu8E7oWJN24NE4rxWhBg==",
"requires": {
"@nextcloud/auth": "^1.2.3",
"@nextcloud/axios": "^1.3.2",
@@ -2532,6 +2542,19 @@
"vue-multiselect": "^2.1.6",
"vue-visible": "^1.0.2",
"vue2-datepicker": "^3.6.2"
+ },
+ "dependencies": {
+ "@nextcloud/dialogs": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/@nextcloud/dialogs/-/dialogs-2.0.1.tgz",
+ "integrity": "sha512-Bme8vcs8n4XT5spBgkDEv1z9zNOE23AIbr5jF1WJ1A2XNMNj5Zvy29RosIh0k7H+1lN0PlU38u+eMV1Ets3E4A==",
+ "requires": {
+ "@nextcloud/l10n": "^1.3.0",
+ "@nextcloud/typings": "^0.2.2",
+ "core-js": "^3.6.4",
+ "toastify-js": "^1.9.1"
+ }
+ }
}
},
"@nextcloud/webpack-vue-config": {
@@ -3665,8 +3688,8 @@
"dev": true
},
"cdav-library": {
- "version": "git+https://github.com/nextcloud/cdav-library.git#f70901a4f3cf353350cee9801bb43f86308dbb64",
- "from": "git+https://github.com/nextcloud/cdav-library.git#f70901a4f3cf353350cee9801bb43f86308dbb64",
+ "version": "git+https://github.com/nextcloud/cdav-library.git#d078bd55ac4e89d5bb485fa2c7b04be9b72ef172",
+ "from": "git+https://github.com/nextcloud/cdav-library.git#d078bd55ac4e89d5bb485fa2c7b04be9b72ef172",
"requires": {
"core-js": "^3.6.5",
"regenerator-runtime": "^0.13.7"
@@ -4532,9 +4555,9 @@
}
},
"emoji-mart-vue-fast": {
- "version": "7.0.5",
- "resolved": "https://registry.npmjs.org/emoji-mart-vue-fast/-/emoji-mart-vue-fast-7.0.5.tgz",
- "integrity": "sha512-+ayg30hhxqqM9oMtN9uUG470hT9gtOdFenByJJBm3XTfzI2QMVJ69euwk+xF55OphLfKZxQG7mnVz13lDOjb3g==",
+ "version": "7.0.6",
+ "resolved": "https://registry.npmjs.org/emoji-mart-vue-fast/-/emoji-mart-vue-fast-7.0.6.tgz",
+ "integrity": "sha512-nvGoIRMhgVYHFBcHJMjjYKS71RopuBRGuO/51DqOcIFreRJAaTvAwmk9eUjI1mwXHY7b/cCarrGi3FBE7Kz37A==",
"requires": {
"@babel/polyfill": "7.2.5",
"@babel/runtime": "7.3.4",
@@ -5496,19 +5519,25 @@
}
},
"file-loader": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.1.0.tgz",
- "integrity": "sha512-26qPdHyTsArQ6gU4P1HJbAbnFTyT2r0pG7czh1GFAd9TZbj0n94wWbupgixZH/ET/meqi2/5+F7DhW4OAXD+Lg==",
+ "version": "6.1.1",
+ "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.1.1.tgz",
+ "integrity": "sha512-Klt8C4BjWSXYQAfhpYYkG4qHNTna4toMHEbWrI5IuVoxbU6uiDKeKAP99R8mmbJi3lvewn/jQBOgU4+NS3tDQw==",
"dev": true,
"requires": {
"loader-utils": "^2.0.0",
- "schema-utils": "^2.7.1"
+ "schema-utils": "^3.0.0"
},
"dependencies": {
+ "@types/json-schema": {
+ "version": "7.0.6",
+ "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz",
+ "integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==",
+ "dev": true
+ },
"ajv": {
- "version": "6.12.4",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz",
- "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==",
+ "version": "6.12.5",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz",
+ "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==",
"dev": true,
"requires": {
"fast-deep-equal": "^3.1.1",
@@ -5535,13 +5564,13 @@
}
},
"schema-utils": {
- "version": "2.7.1",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
- "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+ "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
"dev": true,
"requires": {
- "@types/json-schema": "^7.0.5",
- "ajv": "^6.12.4",
+ "@types/json-schema": "^7.0.6",
+ "ajv": "^6.12.5",
"ajv-keywords": "^3.5.2"
}
}
@@ -7970,9 +7999,9 @@
}
},
"moment": {
- "version": "2.29.0",
- "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.0.tgz",
- "integrity": "sha512-z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA=="
+ "version": "2.29.1",
+ "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+ "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
},
"move-concurrently": {
"version": "1.0.1",
@@ -10920,9 +10949,9 @@
}
},
"toastify-js": {
- "version": "1.9.1",
- "resolved": "https://registry.npmjs.org/toastify-js/-/toastify-js-1.9.1.tgz",
- "integrity": "sha512-B3LTJURySMix/xWqVHyj2XGVsIHesb4euGVuIaFfKxfmjM4F6HMgbW9V66DHUEt98jGlGpeTWSiSJ78UfrJVbA=="
+ "version": "1.9.2",
+ "resolved": "https://registry.npmjs.org/toastify-js/-/toastify-js-1.9.2.tgz",
+ "integrity": "sha512-CwYTmslNmUytxkLq0pDjeC7lqyGonztn4e3TAzu4eOnXkESJQSx9cDmxApIUNIfgAY0hIydTCx9eoLWDaNmQZw=="
},
"tough-cookie": {
"version": "2.5.0",
@@ -11273,16 +11302,40 @@
}
},
"url-loader": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.0.tgz",
- "integrity": "sha512-IzgAAIC8wRrg6NYkFIJY09vtktQcsvU8V6HhtQj9PTefbYImzLB1hufqo4m+RyM5N3mLx5BqJKccgxJS+W3kqw==",
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz",
+ "integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==",
"dev": true,
"requires": {
"loader-utils": "^2.0.0",
- "mime-types": "^2.1.26",
- "schema-utils": "^2.6.5"
+ "mime-types": "^2.1.27",
+ "schema-utils": "^3.0.0"
},
"dependencies": {
+ "@types/json-schema": {
+ "version": "7.0.6",
+ "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz",
+ "integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==",
+ "dev": true
+ },
+ "ajv": {
+ "version": "6.12.5",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz",
+ "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==",
+ "dev": true,
+ "requires": {
+ "fast-deep-equal": "^3.1.1",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.4.1",
+ "uri-js": "^4.2.2"
+ }
+ },
+ "ajv-keywords": {
+ "version": "3.5.2",
+ "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+ "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+ "dev": true
+ },
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
@@ -11294,14 +11347,30 @@
"json5": "^2.1.2"
}
},
+ "mime-db": {
+ "version": "1.44.0",
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+ "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
+ "dev": true
+ },
+ "mime-types": {
+ "version": "2.1.27",
+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+ "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+ "dev": true,
+ "requires": {
+ "mime-db": "1.44.0"
+ }
+ },
"schema-utils": {
- "version": "2.6.5",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz",
- "integrity": "sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ==",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+ "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
"dev": true,
"requires": {
- "ajv": "^6.12.0",
- "ajv-keywords": "^3.4.1"
+ "@types/json-schema": "^7.0.6",
+ "ajv": "^6.12.5",
+ "ajv-keywords": "^3.5.2"
}
}
}
@@ -11334,9 +11403,9 @@
"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
},
"uuid": {
- "version": "8.3.0",
- "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz",
- "integrity": "sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ=="
+ "version": "8.3.1",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz",
+ "integrity": "sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg=="
},
"v-click-outside": {
"version": "3.1.2",
@@ -11538,9 +11607,9 @@
"integrity": "sha512-bhP7MlgJQ8TIkZJXAfDf78uJO+mEI3CaLABLjv0WNzr4CcGRGPIAItyWYnP6LsPA4Oq0WE+suidNs6dgpO4RHg=="
},
"vue-router": {
- "version": "3.4.5",
- "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.5.tgz",
- "integrity": "sha512-ioRY5QyDpXM9TDjOX6hX79gtaMXSVDDzSlbIlyAmbHNteIL81WIVB2e+jbzV23vzxtoV0krdS2XHm+GxFg+Nxg=="
+ "version": "3.4.6",
+ "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.6.tgz",
+ "integrity": "sha512-kaXnB3pfFxhAJl/Mp+XG1HJMyFqrL/xPqV7oXlpXn4AwMmm6VNgf0nllW8ksflmZANfI4kdo0bVn/FYSsAolPQ=="
},
"vue-style-loader": {
"version": "4.1.2",
diff --git a/package.json b/package.json
index 894e722d..d3638347 100644
--- a/package.json
+++ b/package.json
@@ -36,30 +36,30 @@
"@mattkrick/sanitize-svg": "^0.3.1",
"@nextcloud/auth": "^1.3.0",
"@nextcloud/axios": "^1.4.0",
- "@nextcloud/dialogs": "^2.0.1",
- "@nextcloud/initial-state": "^1.1.2",
+ "@nextcloud/dialogs": "^3.0.0",
+ "@nextcloud/initial-state": "^1.2.0",
"@nextcloud/l10n": "^1.4.1",
"@nextcloud/paths": "^1.1.2",
"@nextcloud/router": "^1.2.0",
- "@nextcloud/vue": "2.6.8",
+ "@nextcloud/vue": "2.7.0",
"axios": "^0.20.0",
"cdav-library": "git+https://github.com/nextcloud/cdav-library.git",
"core-js": "^3.6.5",
"debounce": "^1.2.0",
"downloadjs": "^1.4.7",
"ical.js": "^1.4.0",
- "moment": "^2.29.0",
+ "moment": "^2.29.1",
"p-limit": "^3.0.2",
"p-queue": "^6.6.1",
"qr-image": "^3.2.0",
"regenerator-runtime": "^0.13.7",
"string-natural-compare": "^3.0.1",
- "uuid": "^8.3.0",
+ "uuid": "^8.3.1",
"vue": "^2.6.12",
"vue-click-outside": "^1.1.0",
"vue-clipboard2": "^0.3.1",
"vue-masonry": "^0.11.8",
- "vue-router": "^3.4.5",
+ "vue-router": "^3.4.6",
"vue-virtual-scroll-list": "^2.3.1",
"vue-virtual-scroller": "^1.0.10",
"vuex": "^3.4.0",
@@ -75,7 +75,7 @@
"@babel/preset-env": "^7.11.5",
"@nextcloud/browserslist-config": "^1.0.0",
"@nextcloud/eslint-config": "^2.2.0",
- "@nextcloud/eslint-plugin": "^1.4.0",
+ "@nextcloud/eslint-plugin": "^1.5.0",
"@nextcloud/webpack-vue-config": "^1.2.0",
"babel-eslint": "^10.1.0",
"babel-loader": "^8.1.0",
@@ -88,14 +88,14 @@
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.1",
"eslint-plugin-vue": "^6.2.2",
- "file-loader": "^6.1.0",
+ "file-loader": "^6.1.1",
"node-sass": "^4.14.1",
"sass-loader": "^8.0.2",
"stylelint": "^13.7.2",
"stylelint-config-recommended-scss": "^4.2.0",
"stylelint-scss": "^3.18.0",
"stylelint-webpack-plugin": "^2.1.0",
- "url-loader": "^4.1.0",
+ "url-loader": "^4.1.1",
"vue-loader": "^15.9.3",
"vue-template-compiler": "^2.6.12",
"webpack": "^4.44.2",
diff --git a/src/components/Properties/PropertyText.vue b/src/components/Properties/PropertyText.vue
index f1273a05..2a6efe2c 100644
--- a/src/components/Properties/PropertyText.vue
+++ b/src/components/Properties/PropertyText.vue
@@ -72,7 +72,7 @@
:class="{'property__value--with-ext': haveExtHandler}"
type="text"
class="property__value"
- :placeholder="localType.placeholder"
+ :placeholder="placeholder"
@input="updateValue">
<!-- external link -->
@@ -158,6 +158,18 @@ export default {
haveExtHandler() {
return this.externalHandler.trim() !== '' && this.localValue && this.localValue.length > 0
},
+
+ /**
+ * Return the selected type placeholder if any
+ * or the propModel default placeholder
+ * @returns {string}
+ */
+ placeholder() {
+ if (this.localType?.placeholder) {
+ return this.localType.placeholder
+ }
+ return this.propModel.placeholder
+ },
},
mounted() {