Skip to content

Commit

Permalink
Merge pull request #560 from kuzzleio/2.5.0-proposal
Browse files Browse the repository at this point in the history
Release 2.5.0
  • Loading branch information
jenow authored Jul 8, 2019
2 parents cb88aae + fe6a163 commit 1c48dae
Show file tree
Hide file tree
Showing 11 changed files with 666 additions and 103 deletions.
150 changes: 98 additions & 52 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kuzzle-admin-console",
"version": "2.4.2",
"version": "2.5.0",
"description": "A handy administrative console for Kuzzle",
"author": "The Kuzzle team <[email protected]>",
"private": false,
Expand Down Expand Up @@ -122,17 +122,19 @@
"url-loader": "^1.0.1",
"velocity-animate": "^1.5.1",
"vue": "^2.5.16",
"vue-color": "^2.7.0",
"vue-eslint-parser": "^6.0.4",
"vue-google-charts": "^0.3.2",
"vue-loader": "^13.0.0",
"vue-multiselect": "2.0.0-beta.15",
"vue-quill-editor": "^1.1.1",
"vue-quill-editor": "^3.0.6",
"vue-router": "^2.8.1",
"vue-style-loader": "^2.0.0",
"vue-template-compiler": "^2.5.16",
"vue2-leaflet": "^1.0.2",
"vuex": "^2.5.0",
"webpack": "^2.7.0",
"webpack-bundle-analyzer": "^2.13.1",
"webpack-bundle-analyzer": "^3.3.2",
"webpack-dev-middleware": "^1.12.2",
"webpack-hot-middleware": "^2.22.2",
"webpack-merge": "^2.6.1"
Expand Down
4 changes: 3 additions & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,9 @@ export default {
this.$store.dispatch(kuzzleTypes.SWITCH_LAST_ENVIRONMENT)
})
this.$kuzzle.on('discarded', function(data) {
this.$store.commit(SET_TOAST, { text: data.message })
if (this.$store) {
this.$store.commit(SET_TOAST, { text: data.message })
}
})
},
methods: {
Expand Down
7 changes: 1 addition & 6 deletions src/components/Common/Environments/EnvironmentsSwitch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,7 @@ export default {
return this.$store
.dispatch(SWITCH_ENVIRONMENT, id)
.then(() => {
/* Ugly hack in order to force Vue to refresh and pass in router.beforeEach and let check if user is auth */
this.$router.push({ path: '/fake-route' })
setTimeout(() => {
this.$router.push({ path: '/' })
return Promise.resolve()
}, 0)
this.$router.push({ path: '/' })
})
.catch(e => {
this.$store.commit(
Expand Down
3 changes: 3 additions & 0 deletions src/components/Common/JsonForm/JsonFormItemRichEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
</template>

<script>
import 'quill/dist/quill.core.css'
import 'quill/dist/quill.snow.css'
import 'quill/dist/quill.bubble.css'
import { quillEditor } from 'vue-quill-editor'
export default {
Expand Down
Loading

0 comments on commit 1c48dae

Please sign in to comment.