ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4549-landing-page-def-route+have-internal

Browse Source
This commit is contained in:
Wolfgang Huß 2021-07-20 16:29:25 +02:00
commit e42fe3869e
4 changed files with 3859 additions and 1011 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/components/Editor/MenuBarButton.vue
View File

@ -10,7 +10,7 @@ export default {
isActive: Boolean, isActive: Boolean,
icon: String, icon: String,
label: String, label: String,
onClick: Function, onClick: { type: Function, default: () => {} },
}, },
} }
</script> </script>

4858
webapp/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
webapp/package.json
View File

@ -133,7 +133,7 @@
"eslint-plugin-jest": "~24.1.3", "eslint-plugin-jest": "~24.1.3",
"eslint-plugin-node": "~11.1.0", "eslint-plugin-node": "~11.1.0",
"eslint-plugin-prettier": "~3.1.4", "eslint-plugin-prettier": "~3.1.4",
"eslint-plugin-promise": "~4.2.1", "eslint-plugin-promise": "~4.3.1",
"eslint-plugin-standard": "~5.0.0", "eslint-plugin-standard": "~5.0.0",
"eslint-plugin-vue": "~6.2.2", "eslint-plugin-vue": "~6.2.2",
"faker": "^5.1.0", "faker": "^5.1.0",

8
webapp/yarn.lock
View File

@ -8016,10 +8016,10 @@ eslint-plugin-prettier@~3.1.4:
dependencies: dependencies:
prettier-linter-helpers "^1.0.0" prettier-linter-helpers "^1.0.0"
eslint-plugin-promise@~4.2.1: eslint-plugin-promise@~4.3.1:
version "4.2.1" version "4.3.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a" resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.3.1.tgz#61485df2a359e03149fdafc0a68b0e030ad2ac45"
integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw== integrity sha512-bY2sGqyptzFBDLh/GMbAxfdJC+b0f23ME63FOE4+Jao0oZ3E1LEwFtWJX/1pGMJLiTtrSSern2CRM/g+dfc0eQ==
eslint-plugin-standard@~5.0.0: eslint-plugin-standard@~5.0.0:
version "5.0.0" version "5.0.0"