Skip to content

Commit

Permalink
Merge pull request #122 from CSCfi/devel
Browse files Browse the repository at this point in the history
bump to 1.0.0rc14
  • Loading branch information
blankdots authored Jan 28, 2021
2 parents d7a6744 + 84b4c29 commit 46824c9
Show file tree
Hide file tree
Showing 12 changed files with 436 additions and 401 deletions.
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
author = 'CSC Developers'

# The full version, including alpha/beta/rc tags
version = release = '1.0.0rc13'
version = release = '1.0.0rc14'


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion swift_browser_ui/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@


__name__ = "swift_browser_ui"
__version__ = "1.0.0rc13"
__version__ = "1.0.0rc14"
__author__ = "CSC Developers"
__license__ = "MIT License"
174 changes: 88 additions & 86 deletions swift_browser_ui_frontend/package-lock.json

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

8 changes: 4 additions & 4 deletions swift_browser_ui_frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "swift_browser_ui_frontend_npm",
"version": "1.0.0rc13",
"version": "1.0.0rc14",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
Expand All @@ -11,7 +11,7 @@
},
"dependencies": {
"@vue/cli-service-global": "^4.5.11",
"buefy": "^0.8.20",
"buefy": "^0.9.4",
"core-js": "^3.8.3",
"lodash": "^4.17.20",
"material-design-icons": "^3.0.1",
Expand All @@ -22,8 +22,8 @@
"vue": "^2.6.12",
"vue-i18n": "^8.22.4",
"vue-material-design-icons": "^3.4.0",
"vue-router": "^3.4.9",
"vuex": "^3.6.0"
"vue-router": "^3.5.1",
"vuex": "^3.6.2"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^4.5.11",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ export default {
return this.$store.state.active;
},
},
watch: {
container: function () {
this.createDownloadLink();
},
},
beforeMount () {
this.createDownloadLink();
},
Expand Down
Loading

0 comments on commit 46824c9

Please sign in to comment.