Skip to content

Commit

Permalink
Merge pull request #48 from agoravoting/release-go-v2
Browse files Browse the repository at this point in the history
release 103111.2
  • Loading branch information
Findeton committed Jul 25, 2017
2 parents e7ce311 + ccf4e71 commit 5379f42
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
28 changes: 14 additions & 14 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
'use strict';

var pkg = require('./package.json');
var AV_CONFIG_VERSION = '103111.1';
var AV_CONFIG_VERSION = '103111.2';

//Using exclusion patterns slows down Grunt significantly
//instead of creating a set of patterns like '**/*.js' and '!**/node_modules/**'
Expand Down Expand Up @@ -270,13 +270,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:'<!--[if lte IE 8]><script src="/election/libcompat-v103111.1.min.js"></script><![endif]--><!--[if gte IE 9]><script src="/election/libnocompat-v103111.1.min.js"></script><![endif]--><!--[if !IE]><!--><script src="/election/libnocompat-v103111.1.min.js"></script><!--<![endif]-->'},
{selector:'body',html:'<!--[if lte IE 8]><script src="/election/libcompat-v103111.2.min.js"></script><![endif]--><!--[if gte IE 9]><script src="/election/libnocompat-v103111.2.min.js"></script><![endif]--><!--[if !IE]><!--><script src="/election/libnocompat-v103111.2.min.js"></script><!--<![endif]-->'},
{selector:'body',html:'<!--All the source code of this program under copyright. Take a look at the license details at https://github.com/agoravoting/agora-core-view/blob/master/README.md -->'},
{selector:'body',html:'<script src="/election/lib-v103111.1.min.js"></script>'},
{selector:'body',html:'<script src="/election/avConfig-v103111.1.js"></script>'},
{selector:'body',html:'<script src="/election/avThemes-v103111.1.js"></script>'},
{selector:'body',html:'<script src="/election/app-v103111.1.min.js"></script>'},
{selector:'body',html:'<script src="/election/avPlugins-v103111.1.js"></script>'},
{selector:'body',html:'<script src="/election/lib-v103111.2.min.js"></script>'},
{selector:'body',html:'<script src="/election/avConfig-v103111.2.js"></script>'},
{selector:'body',html:'<script src="/election/avThemes-v103111.2.js"></script>'},
{selector:'body',html:'<script src="/election/app-v103111.2.min.js"></script>'},
{selector:'body',html:'<script src="/election/avPlugins-v103111.2.js"></script>'},
{selector:'head',html:'<link rel="stylesheet" id="theme" data-base="/election/" href="/election/themes/default/app.min.css">'},
{selector:'head',html:'<link rel="stylesheet" id="plugins" data-base="/election/" href="/election/plugins.css">'}
]
Expand Down Expand Up @@ -309,9 +309,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/avConfig-v103111.1.js': ['avConfig.js'],
'dist/avThemes-v103111.1.js': ['bower_components/avCommon/dist/avThemes-v103111.1.js'],
'dist/avPlugins-v103111.1.js': [
'dist/avConfig-v103111.2.js': ['avConfig.js'],
'dist/avThemes-v103111.2.js': ['bower_components/avCommon/dist/avThemes-v103111.2.js'],
'dist/avPlugins-v103111.2.js': [
'avPluginsConfig.js',
'plugins/**/*.js',
'!plugins/**/*-spec.js'
Expand Down Expand Up @@ -348,10 +348,10 @@ module.exports = function (grunt) {
beautify: true
},
files: {
'dist/app-v103111.1.min.js': 'temp/app.js',
'dist/lib-v103111.1.min.js': 'temp/lib.js',
'dist/libnocompat-v103111.1.min.js': 'temp/libnocompat.js',
'dist/libcompat-v103111.1.min.js': 'temp/libcompat.js',
'dist/app-v103111.2.min.js': 'temp/app.js',
'dist/lib-v103111.2.min.js': 'temp/lib.js',
'dist/libnocompat-v103111.2.min.js': 'temp/libnocompat.js',
'dist/libcompat-v103111.2.min.js': 'temp/libcompat.js',
'dist/avWidgets.min.js': 'avWidgets.js',

"dist/locales/moment/en.js": "bower_components/moment/lang/en-gb.js",
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "agoraGuiElections",
"version" : "103111.1",
"version" : "103111.2",
"main": "index.html",
"ignore": [
"**/.*",
Expand Down
8 changes: 4 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<script src="/ie8-bind-workaround.js"></script>

<!-- JS from Bower Components -->
<script src="bower_components/avCommon/dist/libnocompat-v103111.1.js" class="libnocompat"></script>
<script src="bower_components/avCommon/dist/libCommon-v103111.1.js" class="lib"></script>
<script src="bower_components/avCommon/dist/libnocompat-v103111.2.js" class="libnocompat"></script>
<script src="bower_components/avCommon/dist/libCommon-v103111.2.js" class="lib"></script>
<script src="bower_components/angular-local-storage/dist/angular-local-storage.js" class="lib"></script>

<script src="vendor/angular-date-picker-polyfill/angular-date-picker-polyfill.js" class="lib"></script>
Expand All @@ -32,10 +32,10 @@
<script src="/avPluginsConfig.js"></script>

<!-- Themes JS -->
<script src="bower_components/avCommon/dist/avTheme-v103111.1.js"></script>
<script src="bower_components/avCommon/dist/avTheme-v103111.2.js"></script>

<!-- avCommon -->
<script src="bower_components/avCommon/dist/appCommon-v103111.1.js" class="app"></script>
<script src="bower_components/avCommon/dist/appCommon-v103111.2.js" class="app"></script>

<script src="app.js" class="app"></script>

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "agora-gui-elections",
"version" : "103111.1.0",
"version" : "103111.2.0",
"devDependencies": {
"grunt": "~0.4",
"grunt-angular-templates": "~0.5",
Expand Down

0 comments on commit 5379f42

Please sign in to comment.