diff --git a/Gruntfile.js b/Gruntfile.js index 9d3737a9..125e6c98 100755 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -19,7 +19,7 @@ 'use strict'; var pkg = require('./package.json'); -var SEQUENT_CONFIG_VERSION = '6.0.2'; +var SEQUENT_CONFIG_VERSION = '6.1.0'; //Using exclusion patterns slows down Grunt significantly //instead of creating a set of patterns like '**/*.js' and '!**/node_modules/**' @@ -222,13 +222,13 @@ module.exports = function (grunt) { remove: ['script[data-remove!="false"]','link[data-remove!="false"]'], append: [ {selector:'body',html:'<%= variables.booth_html_body_include %>'}, - {selector:'body',html:''}, + {selector:'body',html:''}, {selector:'body',html:''}, - {selector:'body',html:''}, - {selector:'body',html:''}, - {selector:'body',html:''}, - {selector:'body',html:''}, - {selector:'body',html:''}, + {selector:'body',html:''}, + {selector:'body',html:''}, + {selector:'body',html:''}, + {selector:'body',html:''}, + {selector:'body',html:''}, {selector:'head',html:''} ] }, @@ -257,9 +257,9 @@ module.exports = function (grunt) { ], 'temp/lib.js': ['<%= dom_munger.data.libjs %>'], 'temp/app.js': ['<%= dom_munger.data.appjs %>','<%= ngtemplates.main.dest %>'], - 'dist/SequentConfig-v6.0.2.js': ['SequentConfig.js'], - 'dist/SequentThemes-v6.0.2.js': ['node_modules/common-ui/dist/SequentThemes-v6.0.2.js'], - 'dist/SequentPlugins-v6.0.2.js': ['plugins/**/*.js'] + 'dist/SequentConfig-v6.1.0.js': ['SequentConfig.js'], + 'dist/SequentThemes-v6.1.0.js': ['node_modules/common-ui/dist/SequentThemes-v6.1.0.js'], + 'dist/SequentPlugins-v6.1.0.js': ['plugins/**/*.js'] } } }, @@ -321,9 +321,9 @@ module.exports = function (grunt) { beautify: true }, files: { - 'dist/app-v6.0.2.min.js': 'temp/app.js', - 'dist/lib-v6.0.2.min.js': 'temp/lib.js', - 'dist/libnocompat-v6.0.2.min.js': 'temp/libnocompat.js', + 'dist/app-v6.1.0.min.js': 'temp/app.js', + 'dist/lib-v6.1.0.min.js': 'temp/lib.js', + 'dist/libnocompat-v6.1.0.min.js': 'temp/libnocompat.js', 'dist/avWidgets.min.js': 'avWidgets.js', "dist/locales/moment/en.js": "node_modules/moment/locale/en-gb.js", diff --git a/SequentConfig.js b/SequentConfig.js index d27b192e..cead3ff6 100644 --- a/SequentConfig.js +++ b/SequentConfig.js @@ -20,7 +20,7 @@ * in this same file, which you might want to edit and tune if needed. */ -var SEQUENT_CONFIG_VERSION = '6.0.2'; +var SEQUENT_CONFIG_VERSION = '6.1.0'; var SequentConfigData = { // the base url path for ajax requests, for example for sending ballots or @@ -219,7 +219,7 @@ var SequentConfigData = { title: "" }, - mainVersion: '6.0.2', + mainVersion: '6.1.0', repoVersions: [] }; diff --git a/index.html b/index.html index 10c8d620..2c4af33f 100755 --- a/index.html +++ b/index.html @@ -15,8 +15,8 @@ - - + + @@ -39,7 +39,7 @@ - + diff --git a/package.json b/package.json index 8eed69fc..3ec5e448 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "voting-booth", - "version" : "6.0.2", + "version" : "6.1.0", "license": "AGPL-3.0-only", "browsers": [ "ie >= 8", @@ -54,7 +54,7 @@ "yarn": "^1.22.0" }, "dependencies": { - "common-ui": "https://github.com/sequentech/common-ui.git#6.1.x", + "common-ui": "https://github.com/sequentech/common-ui.git#6.1.0", "angular-aria": "^1.8.2", "pdfmake": "^0.1.65", "qrcode-generator": "^1.4.4"