vikunja
/
frontend
Archived
6
39
Fork 49
Code Issues 1 Pull Requests 4 Projects Releases 26 Activity

Merge branch 'master' into feature/tooltip 

# Conflicts:
#	yarn.lock
This commit is contained in:
kolaente 2020-11-10 21:18:06 +01:00
parent b25d0f80ff 70508202c0
commit 09573ee1d9
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
5 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
package.json
View File

@ -4,7 +4,7 @@
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
"build": "vue-cli-service build --modern",
"lint": "vue-cli-service lint"
},
"dependencies": {
@ -12,14 +12,14 @@
"camel-case": "4.1.1",
"copy-to-clipboard": "3.3.1",
"date-fns": "2.16.1",
"dompurify": "2.2.1",
"dompurify": "2.2.2",
"lodash": "4.17.20",
"marked": "1.2.2",
"marked": "1.2.3",
"register-service-worker": "1.7.1",
"snake-case": "3.0.3",
"verte": "0.0.12",
"vue": "2.6.12",
"vue-advanced-cropper": "0.17.7",
"vue-advanced-cropper": "0.17.8",
"vue-drag-resize": "1.4.2",
"vue-easymde": "1.3.0",
"vue-shortkey": "3.1.7",
@ -38,15 +38,14 @@
"@vue/cli-service": "4.5.8",
"axios": "0.21.0",
"babel-eslint": "10.1.0",
"core-js": "3.6.5",
"eslint": "7.12.1",
"eslint": "7.13.0",
"eslint-plugin-vue": "7.1.0",
"node-sass": "5.0.0",
"sass-loader": "10.0.5",
"vue-flatpickr-component": "8.1.6",
"vue-multiselect": "2.1.6",
"vue-notification": "1.3.20",
"vue-router": "3.4.8",
"vue-router": "3.4.9",
"vue-template-compiler": "2.6.12"
},
"eslintConfig": {

2
src/views/user/Login.vue
View File

@ -17,6 +17,7 @@
ref="username"
required
type="text"
autocomplete="username"
v-focus
/>
</div>
@ -32,6 +33,7 @@
ref="password"
required
type="password"
autocomplete="current-password"
/>
</div>
</div>

2
src/views/user/PasswordReset.vue
View File

@ -13,6 +13,7 @@
placeholder="e.g. ••••••••••••"
required
type="password"
autocomplete="new-password"
v-focus
v-model="credentials.password"/>
</div>
@ -27,6 +28,7 @@
placeholder="e.g. ••••••••••••"
required
type="password"
autocomplete="new-password"
v-model="credentials.password2"/>
</div>
</div>

3
src/views/user/Register.vue
View File

@ -13,6 +13,7 @@
placeholder="e.g. frederick"
required
type="text"
autocomplete="username"
v-focus
v-model="credentials.username"/>
</div>
@ -40,6 +41,7 @@
placeholder="e.g. ••••••••••••"
required
type="password"
autocomplete="new-password"
v-model="credentials.password"/>
</div>
</div>
@ -53,6 +55,7 @@
placeholder="e.g. ••••••••••••"
required
type="password"
autocomplete="new-password"
v-model="credentials.password2"/>
</div>
</div>

50
yarn.lock
View File

@ -4930,16 +4930,16 @@ core-js-compat@^3.6.5:
browserslist "^4.8.5"
semver "7.0.0"
core-js@3.6.5, core-js@^3.0.1, core-js@^3.4.0, core-js@^3.6.5:
version "3.6.5"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==
core-js@^2.4.0, core-js@^2.5.0:
version "2.6.11"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
core-js@^3.0.1, core-js@^3.4.0, core-js@^3.6.5:
version "3.6.5"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==
core-util-is@1.0.2, core-util-is@~1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@ -5617,10 +5617,10 @@ domhandler@^2.3.0:
dependencies:
domelementtype "1"
dompurify@2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.1.tgz#835a78bafbfc99c326df34fb428e6ba74c7301b2"
integrity sha512-FE7cSplSZgg0CPoUKL4qqzZ80pYt8GVSNvmViTL9XVO4hVN7ctrSaQkrM06/OSCTnkAx3pCgENx7jZWPF2mu1w==
dompurify@2.2.2:
version "2.2.2"
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.2.tgz#cb8c2b1a2f3c8a0b565127504ae4eedec176a972"
integrity sha512-BsGR4nDLaC5CNBnyT5I+d5pOeaoWvgVeg6Gq/aqmKYWMPR07131u60I80BvExLAJ0FQEIBQ1BTicw+C5+jOyrg==
domutils@1.5.1:
version "1.5.1"
@ -5992,10 +5992,10 @@ eslint-visitor-keys@^2.0.0:
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
eslint@7.12.1:
version "7.12.1"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.12.1.tgz#bd9a81fa67a6cfd51656cdb88812ce49ccec5801"
integrity sha512-HlMTEdr/LicJfN08LB3nM1rRYliDXOmfoO4vj39xN6BLpFzF00hbwBoqHk8UcJ2M/3nlARZWy/mslvGEuZFvsg==
eslint@7.13.0:
version "7.13.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.13.0.tgz#7f180126c0dcdef327bfb54b211d7802decc08da"
integrity sha512-uCORMuOO8tUzJmsdRtrvcGq5qposf7Rw0LwkTJkoDbOycVQtQjmnhZSuLQnozLE4TmAzlMVV45eCHmQ1OpDKUQ==
dependencies:
"@babel/code-frame" "^7.0.0"
"@eslint/eslintrc" "^0.2.1"
@ -8948,10 +8948,10 @@ map-visit@^1.0.0:
dependencies:
object-visit "^1.0.0"
marked@1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/marked/-/marked-1.2.2.tgz#5d77ffb789c4cb0ae828bfe76250f7140b123f70"
integrity sha512-5jjKHVl/FPo0Z6ocP3zYhKiJLzkwJAw4CZoLjv57FkvbUuwOX4LIBBGGcXjAY6ATcd1q9B8UTj5T9Umauj0QYQ==
marked@1.2.3:
version "1.2.3"
resolved "https://registry.yarnpkg.com/marked/-/marked-1.2.3.tgz#58817ba348a7c9398cb94d40d12e0d08df83af57"
integrity sha512-RQuL2i6I6Gn+9n81IDNGbL0VHnta4a+8ZhqvryXEniTb/hQNtf3i26hi1XWUhzb9BgVyWHKR3UO8MaHtKoYibw==
marked@^1.2.0:
version "1.2.0"
@ -13188,10 +13188,10 @@ vscode-uri@^1.0.6:
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz#9769aaececae4026fb6e22359cb38946580ded59"
integrity sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ==
vue-advanced-cropper@0.17.7:
version "0.17.7"
resolved "https://registry.yarnpkg.com/vue-advanced-cropper/-/vue-advanced-cropper-0.17.7.tgz#8772f6695d4ef8581bd5da7f458bb8d614ccdadc"
integrity sha512-M0bSUZLJJRb61ojOqh5u6GoKMrwvodglc9hT87ot/N5a4jYe9gChuNmqADXffWCTIHeztaoW+R5nQDdNKMB+mA==
vue-advanced-cropper@0.17.8:
version "0.17.8"
resolved "https://registry.yarnpkg.com/vue-advanced-cropper/-/vue-advanced-cropper-0.17.8.tgz#bf4b6cffa5096bff5edcf94ff3f887ca5757c5da"
integrity sha512-mEweSoGH3HvWtE4Pa8XVXYVSRKf6ICj44dnR/gRpUMQSvFY1FFz9Btc1YEQeq5gKdN3yhm0qyIECePdVh3x4xA==
dependencies:
classnames "^2.2.6"
debounce "^1.2.0"
@ -13316,10 +13316,10 @@ vue-notification@1.3.20:
resolved "https://registry.yarnpkg.com/vue-notification/-/vue-notification-1.3.20.tgz#d85618127763b46f3e25b8962b857947d5a97cbe"
integrity sha512-vPj67Ah72p8xvtyVE8emfadqVWguOScAjt6OJDEUdcW5hW189NsqvfkOrctxHUUO9UYl9cTbIkzAEcPnHu+zBQ==
vue-router@3.4.8:
version "3.4.8"
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.8.tgz#2c06261d35d8075893470352d42d70b6287b8194"
integrity sha512-3BsR84AqarcmweXjItxw3jwQsiYNssYg090yi4rlzTnCJxmHtkyCvhNz9Z7qRSOkmiV485KkUCReTp5AjNY4wg==
vue-router@3.4.9:
version "3.4.9"
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.9.tgz#c016f42030ae2932f14e4748b39a1d9a0e250e66"
integrity sha512-CGAKWN44RqXW06oC+u4mPgHLQQi2t6vLD/JbGRDAXm0YpMv0bgpKuU5bBd7AvMgfTz9kXVRIWKHqRwGEb8xFkA==
vue-shortkey@3.1.7:
version "3.1.7"