diff --git a/Gruntfile.js b/Gruntfile.js index b5bc241..e94fd6b 100755 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -19,7 +19,7 @@ 'use strict'; var pkg = require('./package.json'); -var SEQUENT_CONFIG_VERSION = '6.0.0-beta.1'; +var SEQUENT_CONFIG_VERSION = '6.0.0'; //Using exclusion patterns slows down Grunt significantly //instead of creating a set of patterns like '**/*.js' and '!**/node_modules/**' @@ -292,13 +292,13 @@ module.exports = function (grunt) { remove: ['script[data-remove!="false"]','link[data-remove!="false"]'], append: [ {selector:'body',html:'<%= variables.elections_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:''}, {selector:'head',html:''}, {selector:'head',html:''} @@ -332,9 +332,9 @@ module.exports = function (grunt) { 'temp/libnocompat.js': ['<%= dom_munger.data.libnocompatjs %>'], 'temp/lib.js': ['<%= dom_munger.data.libjs %>'], 'temp/app.js': ['<%= dom_munger.data.appjs %>','<%= ngtemplates.main.dest %>','<%= ngtemplates.common.dest %>'], - 'dist/SequentConfig-v6.0.0-beta.1.js': ['SequentConfig.js'], - 'dist/SequentThemes-v6.0.0-beta.1.js': ['node_modules/common-ui/dist/SequentThemes-v6.0.0-beta.1.js'], - 'dist/SequentPlugins-v6.0.0-beta.1.js': [ + 'dist/SequentConfig-v6.0.0.js': ['SequentConfig.js'], + 'dist/SequentThemes-v6.0.0.js': ['node_modules/common-ui/dist/SequentThemes-v6.0.0.js'], + 'dist/SequentPlugins-v6.0.0.js': [ 'SequentPluginsConfig.js', 'plugins/**/*.js', '!plugins/**/*-spec.js' @@ -401,10 +401,10 @@ module.exports = function (grunt) { beautify: true }, files: { - 'dist/app-v6.0.0-beta.1.min.js': 'temp/app.js', - 'dist/lib-v6.0.0-beta.1.min.js': 'temp/lib.js', - 'dist/libnocompat-v6.0.0-beta.1.min.js': 'temp/libnocompat.js', - 'dist/libcompat-v6.0.0-beta.1.min.js': 'temp/libcompat.js', + 'dist/app-v6.0.0.min.js': 'temp/app.js', + 'dist/lib-v6.0.0.min.js': 'temp/lib.js', + 'dist/libnocompat-v6.0.0.min.js': 'temp/libnocompat.js', + 'dist/libcompat-v6.0.0.min.js': 'temp/libcompat.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 fe07065..8520f53 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.0-beta.1'; +var SEQUENT_CONFIG_VERSION = '6.0.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.0-beta.1', + mainVersion: '6.0.0', repoVersions: [] }; diff --git a/SequentPluginsConfig.js b/SequentPluginsConfig.js index 641fdab..e2f68e4 100644 --- a/SequentPluginsConfig.js +++ b/SequentPluginsConfig.js @@ -1,4 +1,4 @@ -var SEQUENT_PLUGINS_CONFIG_VERSION = '6.0.0-beta.1'; +var SEQUENT_PLUGINS_CONFIG_VERSION = '6.0.0'; angular.module('SequentPluginsConfig', []) .factory('PluginsConfigService', function() { return {}; diff --git a/index.html b/index.html index e91439b..bb575fc 100755 --- a/index.html +++ b/index.html @@ -15,8 +15,8 @@ - - + + @@ -33,10 +33,10 @@ - + - + diff --git a/package.json b/package.json index b65e241..721973c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "election-portal", - "version" : "6.0.0-beta.1", + "version" : "6.0.0", "license": "AGPL-3.0-only", "author": { "name": "Sequent Tech Inc and others", @@ -51,7 +51,7 @@ "yarn": "^1.22.0" }, "dependencies": { - "common-ui": "https://github.com/sequentech/common-ui.git#6.0.0-beta.1", + "common-ui": "https://github.com/sequentech/common-ui.git#6.0.0", "angular-aria": "^1.8.2" }, "resolutions": {