opensourcemirror
/
nextcloud-notes
mirror of https://github.com/nextcloud/notes.git
1
0
Fork 0
Code Issues Releases Wiki Activity

update dependencies

This commit is contained in:
korelstar 2021-11-12 16:26:28 +01:00
parent 780bb9b5bf
commit 3c3346688b
6 changed files with 4851 additions and 8975 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -7,7 +7,7 @@ js/
report report
clover.xml clover.xml
composer.lock composer.lock
.php_cs.cache .php-cs-fixer.cache
appinfo/info.xsd appinfo/info.xsd
# just sane ignores # just sane ignores

0
.php_cs.dist → .php-cs-fixer.dist.php
View File

10
composer.json
View File

@ -1,11 +1,11 @@
{ {
"require-dev": { "require-dev": {
"christophwurst/nextcloud": ">=20", "christophwurst/nextcloud": ">=20",
"nextcloud/coding-standard": "^0.5.0", "nextcloud/coding-standard": "^1.0",
"friendsofphp/php-cs-fixer": "^2.18.6", "friendsofphp/php-cs-fixer": "^3",
"squizlabs/php_codesniffer": "3.*", "squizlabs/php_codesniffer": "^3",
"phan/phan": "^4.0", "phan/phan": "^5",
"guzzlehttp/guzzle": "^7.0", "guzzlehttp/guzzle": "^7",
"staabm/annotate-pull-request-from-checkstyle": "^1.1.0" "staabm/annotate-pull-request-from-checkstyle": "^1.1.0"
}, },
"autoload-dev": { "autoload-dev": {

13794
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

18
package.json
View File

@ -13,21 +13,21 @@
"stylelint:fix": "stylelint 'src/**/*.vue' 'css/**/*.scss' --fix" "stylelint:fix": "stylelint 'src/**/*.vue' 'css/**/*.scss' --fix"
}, },
"dependencies": { "dependencies": {
"@nextcloud/axios": "^1.6.0", "@nextcloud/axios": "^1.7.0",
"@nextcloud/dialogs": "^3.1.2", "@nextcloud/dialogs": "^3.1.2",
"@nextcloud/event-bus": "^2.0.0", "@nextcloud/event-bus": "^2.1.1",
"@nextcloud/moment": "^1.1.1", "@nextcloud/moment": "^1.1.1",
"@nextcloud/router": "^2.0.0", "@nextcloud/router": "^2.0.0",
"@nextcloud/vue": "^3.10.1", "@nextcloud/vue": "^4.2.0",
"@nextcloud/vue-dashboard": "^2.0.1", "@nextcloud/vue-dashboard": "^2.0.1",
"diff": "^5.0.0", "diff": "^5.0.0",
"easymde": "^2.15.0", "easymde": "^2.15.0",
"markdown-it": "^12.1.0", "markdown-it": "^12.2.0",
"vue": "^2.6.14", "vue": "^2.6.14",
"vue-fragment": "1.5.1", "vue-fragment": "1.5.1",
"vue-material-design-icons": "^4.12.1", "vue-material-design-icons": "^4.13.0",
"vue-observe-visibility": "^1.0.0", "vue-observe-visibility": "^1.0.0",
"vue-router": "^3.5.2", "vue-router": "^3.5.3",
"vuex": "^3.6.2" "vuex": "^3.6.2"
}, },
"browserslist": [ "browserslist": [
@ -39,9 +39,9 @@
}, },
"devDependencies": { "devDependencies": {
"@nextcloud/babel-config": "^1.0.0", "@nextcloud/babel-config": "^1.0.0",
"@nextcloud/browserslist-config": "^2.1.0", "@nextcloud/browserslist-config": "^2.2.0",
"@nextcloud/eslint-config": "^6.0.0", "@nextcloud/eslint-config": "^6.1.0",
"@nextcloud/stylelint-config": "^1.0.0-beta.0", "@nextcloud/stylelint-config": "^1.0.0-beta.0",
"@nextcloud/webpack-vue-config": "^4.1.0" "@nextcloud/webpack-vue-config": "^4.1.4"
} }
} }

2
src/components/ConflictSolution.vue
View File

@ -3,7 +3,7 @@
<div class="text"> <div class="text">
<pre v-for="(l, i) in diff" :key="i" :class="l.className">{{ l.line }}</pre> <pre v-for="(l, i) in diff" :key="i" :class="l.className">{{ l.line }}</pre>
</div> </div>
<button @click="$emit('onChooseSolution')"> <button @click="$emit('on-choose-solution')">
{{ button }} {{ button }}
</button> </button>
</div> </div>