diff --git a/apps/updatenotification/css/admin.css b/apps/updatenotification/css/admin.css
deleted file mode 100644
index 3a74d8801a0324695d9ec891ec8c8dd7fb278771..0000000000000000000000000000000000000000
--- a/apps/updatenotification/css/admin.css
+++ /dev/null
@@ -1,67 +0,0 @@
-#updatenotification {
- margin-top: -25px;
-}
-
-#updatenotification div.update,
-#updatenotification p:not(.inlineblock) {
- margin-bottom: 25px;
-}
-
-
-#updatenotification h2.inlineblock {
- margin-top: 25px;
-}
-
-#updatenotification h3,
-#updatenotification h3 .icon {
- cursor: pointer;
-}
-
-#updatenotification h3:first-of-type {
- margin-top: 0;
-}
-
-#updatenotification .icon {
- display: inline-block;
- margin-bottom: -3px;
-}
-
-#updatenotification .icon-triangle-s,
-#updatenotification .icon-triangle-n {
- opacity: 0.5;
-}
-
-#updatenotification .channel-description span {
- color: #aaa;
-}
-
-#updatenotification .channel-description span strong {
- color: #555;
- font-weight: normal;
-}
-
-#updatenotification .warning {
- color: #ce3702;
-}
-
-#updatenotification .whatsNew {
- display: inline-block;
-}
-
-#updatenotification .toggleWhatsNew {
- position: relative;
-}
-
-#updatenotification .popovermenu p {
- margin-bottom: 0;
- width: 100%;
-}
-
-#updatenotification .popovermenu {
- margin-top: 5px;
- width: 300px;
-}
-
-#updatenotification .applist {
- margin-bottom: 25px;
-}
diff --git a/apps/updatenotification/css/admin.scss b/apps/updatenotification/css/admin.scss
new file mode 100644
index 0000000000000000000000000000000000000000..d975ee9658d1d091fd040372f86c7be215f31247
--- /dev/null
+++ b/apps/updatenotification/css/admin.scss
@@ -0,0 +1,53 @@
+#updatenotification {
+ margin-top: -25px;
+ div.update,
+ p:not(.inlineblock) {
+ margin-bottom: 25px;
+ }
+ h2.inlineblock {
+ margin-top: 25px;
+ }
+ h3 {
+ cursor: pointer;
+ .icon {
+ cursor: pointer;
+ }
+ &:first-of-type {
+ margin-top: 0;
+ }
+ }
+ .icon {
+ display: inline-block;
+ margin-bottom: -3px;
+ }
+ .icon-triangle-s, .icon-triangle-n {
+ opacity: 0.5;
+ }
+ .channel-description span {
+ color: var(--color-text-lighter);
+ strong {
+ color: var(--color-main-text);
+ font-weight: normal;
+ }
+ }
+ .warning {
+ color: var(--color-error);
+ }
+ .whatsNew {
+ display: inline-block;
+ }
+ .toggleWhatsNew {
+ position: relative;
+ }
+ .popovermenu {
+ p {
+ margin-bottom: 0;
+ width: 100%;
+ }
+ margin-top: 5px;
+ width: 300px;
+ }
+ .applist {
+ margin-bottom: 25px;
+ }
+}
\ No newline at end of file
diff --git a/apps/updatenotification/js/updatenotification.js b/apps/updatenotification/js/updatenotification.js
index 57e2292240b3ef0f32b906f23ee2ec42806759cc..b328ac1e1d2d08c55abd1705eb9dbb783904b85d 100644
Binary files a/apps/updatenotification/js/updatenotification.js and b/apps/updatenotification/js/updatenotification.js differ
diff --git a/apps/updatenotification/js/updatenotification.js.map b/apps/updatenotification/js/updatenotification.js.map
index 3e450bbc644b4e971ff117d1f6606a50b02afcd4..21b64f5fa55a4194d36ee690a300ae3b1f06149f 100644
Binary files a/apps/updatenotification/js/updatenotification.js.map and b/apps/updatenotification/js/updatenotification.js.map differ
diff --git a/apps/updatenotification/package-lock.json b/apps/updatenotification/package-lock.json
index d0c9be5402e8e8000ed07aab17074c211fc1c1a5..398b842326d16a5f7498b3e95779d427c6c8bee9 100644
--- a/apps/updatenotification/package-lock.json
+++ b/apps/updatenotification/package-lock.json
@@ -4,6 +4,15 @@
"lockfileVersion": 1,
"requires": true,
"dependencies": {
+ "@babel/polyfill": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.0.0.tgz",
+ "integrity": "sha512-dnrMRkyyr74CRelJwvgnnSUDh2ge2NCTyHVwpOdvRMHtJUyxLtMAfhBN3s64pY41zdw0kgiLPh6S20eb1NcX6Q==",
+ "requires": {
+ "core-js": "^2.5.7",
+ "regenerator-runtime": "^0.11.1"
+ }
+ },
"@vue/component-compiler-utils": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-2.2.0.tgz",
@@ -329,7 +338,7 @@
},
"util": {
"version": "0.10.3",
- "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz",
+ "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
"integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
"dev": true,
"requires": {
@@ -356,6 +365,15 @@
"integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
"dev": true
},
+ "axios": {
+ "version": "0.18.0",
+ "resolved": "http://registry.npmjs.org/axios/-/axios-0.18.0.tgz",
+ "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=",
+ "requires": {
+ "follow-redirects": "^1.3.0",
+ "is-buffer": "^1.1.5"
+ }
+ },
"babel-code-frame": {
"version": "6.26.0",
"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
@@ -375,7 +393,7 @@
},
"chalk": {
"version": "1.1.3",
- "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
@@ -526,7 +544,7 @@
},
"browserify-aes": {
"version": "1.2.0",
- "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+ "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
"integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
"dev": true,
"requires": {
@@ -563,7 +581,7 @@
},
"browserify-rsa": {
"version": "4.0.1",
- "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
"integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
"dev": true,
"requires": {
@@ -690,6 +708,11 @@
}
}
},
+ "charenc": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
+ "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc="
+ },
"chokidar": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
@@ -898,6 +921,11 @@
"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
"dev": true
},
+ "core-js": {
+ "version": "2.5.7",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
+ "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw=="
+ },
"core-util-is": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -916,7 +944,7 @@
},
"create-hash": {
"version": "1.2.0",
- "resolved": "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+ "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
"integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
"dev": true,
"requires": {
@@ -929,7 +957,7 @@
},
"create-hmac": {
"version": "1.1.7",
- "resolved": "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+ "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
"integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
"dev": true,
"requires": {
@@ -954,6 +982,11 @@
"which": "^1.2.9"
}
},
+ "crypt": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
+ "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs="
+ },
"crypto-browserify": {
"version": "3.12.0",
"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
@@ -1113,7 +1146,7 @@
},
"diffie-hellman": {
"version": "5.0.3",
- "resolved": "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+ "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
"integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
"dev": true,
"requires": {
@@ -1238,7 +1271,7 @@
},
"events": {
"version": "1.1.1",
- "resolved": "http://registry.npmjs.org/events/-/events-1.1.1.tgz",
+ "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
"integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
"dev": true
},
@@ -1406,6 +1439,11 @@
"integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
"dev": true
},
+ "fecha": {
+ "version": "2.3.3",
+ "resolved": "http://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz",
+ "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg=="
+ },
"file-loader": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz",
@@ -1469,6 +1507,24 @@
"readable-stream": "^2.0.4"
}
},
+ "follow-redirects": {
+ "version": "1.5.9",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.9.tgz",
+ "integrity": "sha512-Bh65EZI/RU8nx0wbYF9shkFZlqLP+6WT/5FnA3cE/djNSuKNHJEinGGZgu/cQEkeeb2GdFOgenAmn8qaqYke2w==",
+ "requires": {
+ "debug": "=3.1.0"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+ "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+ "requires": {
+ "ms": "2.0.0"
+ }
+ }
+ }
+ },
"for-in": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -2390,8 +2446,7 @@
"is-buffer": {
"version": "1.1.6",
"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
- "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
- "dev": true
+ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
},
"is-data-descriptor": {
"version": "0.1.4",
@@ -2608,6 +2663,11 @@
"integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
"dev": true
},
+ "lodash.merge": {
+ "version": "4.6.1",
+ "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz",
+ "integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ=="
+ },
"lru-cache": {
"version": "4.1.3",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
@@ -2651,6 +2711,16 @@
"object-visit": "^1.0.0"
}
},
+ "md5": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz",
+ "integrity": "sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=",
+ "requires": {
+ "charenc": "~0.0.1",
+ "crypt": "~0.0.1",
+ "is-buffer": "~1.1.1"
+ }
+ },
"md5.js": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
@@ -2821,8 +2891,7 @@
"ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
- "dev": true
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
},
"nan": {
"version": "2.11.1",
@@ -2856,6 +2925,29 @@
"integrity": "sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==",
"dev": true
},
+ "nextcloud-axios": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/nextcloud-axios/-/nextcloud-axios-0.1.2.tgz",
+ "integrity": "sha512-iGmsgetYead0678dpExmYaN4odpiKjKxtPpzuk3TyB1UoQJs4Mop+Dozh1ryWLA0Nqzng9HIvsWkBqLxAm3q5g==",
+ "requires": {
+ "axios": "^0.18.0"
+ }
+ },
+ "nextcloud-vue": {
+ "version": "0.4.4",
+ "resolved": "https://registry.npmjs.org/nextcloud-vue/-/nextcloud-vue-0.4.4.tgz",
+ "integrity": "sha512-iaL7mJGZpiyn9Evg0pnoilSj30wWD/TujGPqC2RN7jggeTdWrQQBuwjfiIoY3n4wcg9DgsZ4TwE9gOHz9+Yhrg==",
+ "requires": {
+ "@babel/polyfill": "^7.0.0",
+ "md5": "^2.2.1",
+ "nextcloud-axios": "^0.1.2",
+ "v-tooltip": "^2.0.0-rc.33",
+ "vue": "^2.5.16",
+ "vue-click-outside": "^1.0.7",
+ "vue-multiselect": "^2.1.0",
+ "vue2-datepicker": "^2.6.1"
+ }
+ },
"nice-try": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
@@ -3061,7 +3153,7 @@
},
"parse-asn1": {
"version": "5.1.1",
- "resolved": "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
+ "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
"integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
"dev": true,
"requires": {
@@ -3136,6 +3228,11 @@
"find-up": "^2.1.0"
}
},
+ "popper.js": {
+ "version": "1.14.5",
+ "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.5.tgz",
+ "integrity": "sha512-fs4Sd8bZLgEzrk8aS7Em1qh+wcawtE87kRUJQhK6+LndyV1HerX7+LURzAylVaTyWIn5NTB/lyjnWqw/AZ6Yrw=="
+ },
"posix-character-classes": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
@@ -3386,6 +3483,11 @@
"integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
"dev": true
},
+ "regenerator-runtime": {
+ "version": "0.11.1",
+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+ "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+ },
"regex-not": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
@@ -3409,7 +3511,7 @@
},
"regjsgen": {
"version": "0.2.0",
- "resolved": "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+ "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
"integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
"dev": true
},
@@ -3515,7 +3617,7 @@
},
"safe-regex": {
"version": "1.1.0",
- "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
"integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
"dev": true,
"requires": {
@@ -3581,7 +3683,7 @@
},
"sha.js": {
"version": "2.4.11",
- "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+ "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
"integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
"dev": true,
"requires": {
@@ -4165,6 +4267,16 @@
"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
"dev": true
},
+ "v-tooltip": {
+ "version": "2.0.0-rc.33",
+ "resolved": "https://registry.npmjs.org/v-tooltip/-/v-tooltip-2.0.0-rc.33.tgz",
+ "integrity": "sha1-ePfY6cNCZWIr5lup3HjGfx3AK3M=",
+ "requires": {
+ "lodash.merge": "^4.6.0",
+ "popper.js": "^1.12.9",
+ "vue-resize": "^0.4.3"
+ }
+ },
"v8-compile-cache": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz",
@@ -4209,10 +4321,15 @@
"vue-style-loader": "^4.1.0"
}
},
- "vue-select": {
- "version": "2.5.1",
- "resolved": "https://registry.npmjs.org/vue-select/-/vue-select-2.5.1.tgz",
- "integrity": "sha512-Hs+arh7+0gLJoYiM3r9V/5CRn5XsAT8tVkouTkpDAWb923KFgraWrKDLSqz3ROedZUkuVIwkFuYq8+baHUf+bg=="
+ "vue-multiselect": {
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/vue-multiselect/-/vue-multiselect-2.1.3.tgz",
+ "integrity": "sha512-ANLvoLEZv5uzissmh2WSHTn8DGhqsKi6zVtctpf1wnGK6vmZBktQZzeuHGxH7KpIb+4A6BlXmq0RR08jtQ67tg=="
+ },
+ "vue-resize": {
+ "version": "0.4.4",
+ "resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-0.4.4.tgz",
+ "integrity": "sha512-Lb/cnE2N9Y42ZJPw8wpjkpuX5a9ReerWNGcQRcbNCwfCnkHG6++FurNNmLIdU8dcCTH4c5rtTPdxBqFoRMK2cQ=="
},
"vue-style-loader": {
"version": "4.1.2",
@@ -4240,6 +4357,14 @@
"integrity": "sha512-x3LV3wdmmERhVCYy3quqA57NJW7F3i6faas++pJQWtknWT+n7k30F4TVdHvCLn48peTJFRvCpxs3UuFPqgeELg==",
"dev": true
},
+ "vue2-datepicker": {
+ "version": "2.6.2",
+ "resolved": "https://registry.npmjs.org/vue2-datepicker/-/vue2-datepicker-2.6.2.tgz",
+ "integrity": "sha512-Z1XaBCBi3oiLm26WSBeYpUtQecFsz8FRZ9CtBofjmlkCNdu45smkzcaRjHsPEtOaV4yhkhJ2fr8EBe/7GVrfyA==",
+ "requires": {
+ "fecha": "^2.3.3"
+ }
+ },
"watchpack": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
@@ -4365,7 +4490,7 @@
},
"wrap-ansi": {
"version": "2.1.0",
- "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
"integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
"dev": true,
"requires": {
diff --git a/apps/updatenotification/package.json b/apps/updatenotification/package.json
index 3daa92881715735b8875562e7c39fec527192918..63ef9e25bc79d5566b38033acf1fc9e27fbe4945 100644
--- a/apps/updatenotification/package.json
+++ b/apps/updatenotification/package.json
@@ -23,9 +23,10 @@
},
"homepage": "https://github.com/nextcloud/notifications#readme",
"dependencies": {
+ "nextcloud-vue": "^0.4.4",
+ "v-tooltip": "^2.0.0-rc.33",
"vue": "^2.5.17",
- "vue-click-outside": "^1.0.7",
- "vue-select": "^2.5.0"
+ "vue-click-outside": "^1.0.7"
},
"devDependencies": {
"css-loader": "^1.0.1",
diff --git a/apps/updatenotification/src/components/popoverMenu.vue b/apps/updatenotification/src/components/popoverMenu.vue
deleted file mode 100644
index 92f62c5090db1fac39c90e9042285894ad5d35bb..0000000000000000000000000000000000000000
--- a/apps/updatenotification/src/components/popoverMenu.vue
+++ /dev/null
@@ -1,18 +0,0 @@
-<template>
- <ul>
- <popover-item v-for="(item, key) in menu" :item="item" :key="key" />
- </ul>
-</template>
-
-
-<script>
-import popoverItem from './popoverMenu/popoverItem';
-
-export default {
- name: 'popoverMenu',
- props: ['menu'],
- components: {
- popoverItem
- }
-}
-</script>
diff --git a/apps/updatenotification/src/components/popoverMenu/popoverItem.vue b/apps/updatenotification/src/components/popoverMenu/popoverItem.vue
deleted file mode 100644
index d496a336c2239e20f869f63296b62dbed442951f..0000000000000000000000000000000000000000
--- a/apps/updatenotification/src/components/popoverMenu/popoverItem.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-<template>
- <li>
- <!-- If item.href is set, a link will be directly used -->
- <a @click="item.action" v-if="item.href" :href="(item.href) ? item.href : '#' " :target="(item.target) ? item.target : '' " rel="noreferrer noopener">
- <span :class="item.icon"></span>
- <span v-if="item.text">{{item.text}}</span>
- <p v-else-if="item.longtext">{{item.longtext}}</p>
- </a>
- <!-- If item.action is set instead, a button will be used -->
- <button @click="item.action" v-else-if="item.action">
- <span :class="item.icon"></span>
- <span v-if="item.text">{{item.text}}</span>
- <p v-else-if="item.longtext">{{item.longtext}}</p>
- </button>
- <!-- If item.longtext is set AND the item does not have an action -->
- <span class="menuitem" v-else>
- <span :class="item.icon"></span>
- <span v-if="item.text">{{item.text}}</span>
- <p v-else-if="item.longtext">{{item.longtext}}</p>
- </span>
- </li>
-</template>
-
-<script>
-export default {
- props: ['item']
-}
-</script>
diff --git a/apps/updatenotification/src/components/root.vue b/apps/updatenotification/src/components/root.vue
index b2fcdf328cca536375488a6de1c64c7b935d1dc7..351fe947765f0d563a6de00668db7a513d6aede3 100644
--- a/apps/updatenotification/src/components/root.vue
+++ b/apps/updatenotification/src/components/root.vue
@@ -53,7 +53,7 @@
<template v-else-if="!isUpdateChecked">{{ t('updatenotification', 'The update check is not yet finished. Please refresh the page.') }}</template>
<template v-else>
{{ t('updatenotification', 'Your version is up to date.') }}
- <span class="icon-info svg" :title="lastCheckedOnString"></span>
+ <span class="icon-info svg" v-tooltip.auto="lastCheckedOnString"></span>
</template>
<template v-if="!isDefaultUpdateServerURL">
@@ -81,7 +81,7 @@
<p id="oca_updatenotification_groups">
{{ t('updatenotification', 'Notify members of the following groups about available updates:') }}
- <v-select multiple :value="notifyGroups" :options="availableGroups"></v-select><br />
+ <multiselect v-model="notifyGroups" :options="availableGroups" :multiple="true" label="label" track-by="value" :tag-width="75" /><br />
<em v-if="currentChannel === 'daily' || currentChannel === 'git'">{{ t('updatenotification', 'Only notification for app updates are available.') }}</em>
<em v-if="currentChannel === 'daily'">{{ t('updatenotification', 'The selected update channel makes dedicated notifications for the server obsolete.') }}</em>
<em v-if="currentChannel === 'git'">{{ t('updatenotification', 'The selected update channel does not support updates of the server.') }}</em>
@@ -90,18 +90,19 @@
</template>
<script>
- import vSelect from 'vue-select';
- import popoverMenu from './popoverMenu';
+ import { PopoverMenu, Multiselect } from 'nextcloud-vue';
+ import { VTooltip } from 'v-tooltip';
import ClickOutside from 'vue-click-outside';
export default {
name: 'root',
components: {
- vSelect,
- popoverMenu,
+ Multiselect,
+ PopoverMenu,
},
directives: {
- ClickOutside
+ ClickOutside,
+ tooltip: VTooltip
},
data: function () {
return {
@@ -355,10 +356,6 @@
this.enableChangeWatcher = true;
}.bind(this)
});
- },
-
- updated: function () {
- this._$el.find('.icon-info').tooltip({placement: 'right'});
}
}
</script>
diff --git a/apps/updatenotification/webpack.common.js b/apps/updatenotification/webpack.common.js
index 7d2bbfae74eb088afac4b0e3db63d85810453b43..08cb60312337ce3ce50033958d0f44ce772903cb 100644
--- a/apps/updatenotification/webpack.common.js
+++ b/apps/updatenotification/webpack.common.js
@@ -20,9 +20,6 @@ module.exports = {
new VueLoaderPlugin()
],
resolve: {
- alias: {
- 'vue$': 'vue/dist/vue.esm.js'
- },
extensions: ['*', '.js', '.vue', '.json']
}
}
diff --git a/apps/updatenotification/webpack.dev.js b/apps/updatenotification/webpack.dev.js
index 88409bbb1d8048eeeab9c9ab45217d7c8439ef6e..9f66562f9084dda19d8f7aef9cd3b60a0acdb64a 100644
--- a/apps/updatenotification/webpack.dev.js
+++ b/apps/updatenotification/webpack.dev.js
@@ -8,5 +8,5 @@ module.exports = merge(common, {
noInfo: true,
overlay: true
},
- devtool: '#eval-source-map',
+ devtool: '#cheap-source-map',
})
diff --git a/core/css/apps.scss b/core/css/apps.scss
index 039374bf7263b08f82799a79a56ae58fa561bb21..b9c2b50c6f2a69533c3caf955f6c169f9172ab55 100644
--- a/core/css/apps.scss
+++ b/core/css/apps.scss
@@ -39,7 +39,7 @@ h4 {
/* do not use italic typeface style, instead lighter color */
em {
font-style: normal;
- opacity: .5;
+ color: var(--color-text-lighter);
}
dl {