Skip to content

Go #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 28, 2017
Merged

Go #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fe567b
release 103111.2
Jul 25, 2017
140e906
grunt build
Jul 25, 2017
c02d554
Merge pull request #48 from agoravoting/release-go-v2
Findeton Jul 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions Gruntfile.js
View file
Open in desktop
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 @@ -192,10 +192,10 @@ module.exports = function (grunt) {
options: {
remove: ['script[data-remove!="false"]','link[data-remove!="false"]'],
append: [
{selector:'body',html:'<!--[if lte IE 8]><script src="/libcompat-v103111.1.js"></script><![endif]--><!--[if gte IE 9]><script src="/libnocompat-v103111.1.js"></script><![endif]--><!--[if !IE]><!--><script src="/libnocompat-v103111.1.js"></script><!--<![endif]-->'},
{selector:'body',html:'<!--[if lte IE 8]><script src="/libcompat-v103111.2.js"></script><![endif]--><!--[if gte IE 9]><script src="/libnocompat-v103111.2.js"></script><![endif]--><!--[if !IE]><!--><script src="/libnocompat-v103111.2.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="/appCommon-v103111.1.js"></script>'},
{selector:'body',html:'<script src="/avPlugins-v103111.1.js"></script>'},
{selector:'body',html:'<script src="/appCommon-v103111.2.js"></script>'},
{selector:'body',html:'<script src="/avPlugins-v103111.2.js"></script>'},
{selector:'head',html:'<link rel="stylesheet" id="theme" href="/themes/default/app.min.css">'}
]
},
Expand Down Expand Up @@ -225,9 +225,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 %>'],
'dist/avConfig-v103111.1.js': ['avConfig.js'],
'dist/avThemes-v103111.1.js': ['avThemes.js'],
'dist/avPlugins-v103111.1.js': ['plugins/**/*.js']
'dist/avConfig-v103111.2.js': ['avConfig.js'],
'dist/avThemes-v103111.2.js': ['avThemes.js'],
'dist/avPlugins-v103111.2.js': ['plugins/**/*.js']
}
}
},
Expand Down Expand Up @@ -259,10 +259,10 @@ module.exports = function (grunt) {
beautify: true
},
files: {
'dist/appCommon-v103111.1.js': 'temp/app.js',
'dist/libCommon-v103111.1.js': 'temp/lib.js',
'dist/libnocompat-v103111.1.js': 'temp/libnocompat.js',
'dist/libcompat-v103111.1.js': 'temp/libcompat.js',
'dist/appCommon-v103111.2.js': 'temp/app.js',
'dist/libCommon-v103111.2.js': 'temp/lib.js',
'dist/libnocompat-v103111.2.js': 'temp/libnocompat.js',
'dist/libcompat-v103111.2.js': 'temp/libcompat.js',
'dist/avWidgets.js': 'avWidgets.js',

"dist/locales/moment/es.js": "bower_components/moment/lang/es.js",
Expand Down
2 changes: 1 addition & 1 deletion avConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* in this same file, which you might want to edit and tune if needed.
*/

var AV_CONFIG_VERSION = '103111.1';
var AV_CONFIG_VERSION = '103111.2';

var avConfigData = {
// the base url path for ajax requests, for example for sending ballots or
Expand Down
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "avCommon",
"version" : "103111.1",
"version" : "103111.2",
"main": "index.html",
"ignore": [
"tests",
Expand Down
0 dist/appCommon-v103111.1.js → dist/appCommon-v103111.2.js
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion dist/avConfig-v103111.1.js → dist/avConfig-v103111.2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* in this same file, which you might want to edit and tune if needed.
*/

var AV_CONFIG_VERSION = '103111.1';
var AV_CONFIG_VERSION = '103111.2';

var avConfigData = {
// the base url path for ajax requests, for example for sending ballots or
Expand Down
0 dist/avPlugins-v103111.1.js → dist/avPlugins-v103111.2.js
View file
Open in desktop
File renamed without changes.
0 dist/avThemes-v103111.1.js → dist/avThemes-v103111.2.js
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion dist/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<!DOCTYPE html><html id="ng-app" ng-app="agora-gui-common"><head><title>Agora Voting</title><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"><base href="/"><meta charset="utf-8"><link rel="stylesheet" id="theme" href="/themes/default/app.min.css"></head><body><!-- Livereload script for development only (stripped during dist build) --><!-- IE8 bind workaround (needed for less) --><!-- JS from Bower Components --><!-- Add New Bower Component JS Above --><!-- JS from Vendor Components --><!-- Add New Vendor Component JS Above --><!-- Configuration file JS --><!-- Themes JS --><!-- Main App JS --><!-- registration --><!-- ui --><!-- for security, we do not include the dynamic directive in the app,
so in the compiled app e2e tests are not expected work. --><!-- IE10 viewport hack for Surface/desktop Windows 8 bug --><!-- IE9 console workaround --><!-- Add New Component JS Above --><div id="no-js">Page is taking some time to load, wait a moment please. If it takes too long, please check that you have javascript activated, try with another browser or contact us.</div><div id="unsupported-browser">For security reasons, your browser is unsupported. Please use a newer web browser (if you are using Internet Explorer, use version 9 or newer).</div><div><!-- Shown while loading --><div id="angular-preloading" class="avb-start-loading"></div><!-- Main content --><div id="content"><!-- This is where angular injects its content --><div ui-view=""></div></div></div><!--[if lte IE 8]><script src="/libcompat-v103111.1.js"></script><![endif]--><!--[if gte IE 9]><script src="/libnocompat-v103111.1.js"></script><![endif]--><!--[if !IE]><!--><script src="/libnocompat-v103111.1.js"></script><!--<![endif]--><!--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 --><script src="/appCommon-v103111.1.js"></script><script src="/avPlugins-v103111.1.js"></script></body></html>
so in the compiled app e2e tests are not expected work. --><!-- IE10 viewport hack for Surface/desktop Windows 8 bug --><!-- IE9 console workaround --><!-- Add New Component JS Above --><div id="no-js">Page is taking some time to load, wait a moment please. If it takes too long, please check that you have javascript activated, try with another browser or contact us.</div><div id="unsupported-browser">For security reasons, your browser is unsupported. Please use a newer web browser (if you are using Internet Explorer, use version 9 or newer).</div><div><!-- Shown while loading --><div id="angular-preloading" class="avb-start-loading"></div><!-- Main content --><div id="content"><!-- This is where angular injects its content --><div ui-view=""></div></div></div><!--[if lte IE 8]><script src="/libcompat-v103111.2.js"></script><![endif]--><!--[if gte IE 9]><script src="/libnocompat-v103111.2.js"></script><![endif]--><!--[if !IE]><!--><script src="/libnocompat-v103111.2.js"></script><!--<![endif]--><!--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 --><script src="/appCommon-v103111.2.js"></script><script src="/avPlugins-v103111.2.js"></script></body></html>
0 dist/libCommon-v103111.1.js → dist/libCommon-v103111.2.js
View file
Open in desktop
File renamed without changes.
0 dist/libcompat-v103111.1.js → dist/libcompat-v103111.2.js
View file
Open in desktop
File renamed without changes.
0 dist/libnocompat-v103111.1.js → dist/libnocompat-v103111.2.js
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "agora-gui-common",
"version" : "103111.1.0",
"version" : "103111.2.0",
"devDependencies": {
"grunt": "~0.4",
"grunt-angular-templates": "~0.5",
Expand Down