Commit fff56c65b959de79e1fdb15f8bd275d193e54552

Authored by Eric Fernandez
Exists in master

Merge branch 'master' into 'develop'

Master

See merge request !87
... ... @@ -76,8 +76,6 @@ gulp.task('pre-commit', function() {
76 76 jshint.reporter('fail')
77 77 ]
78 78 );
79   - gulp.start('uglify');
80   - gulp.start('sass');
81 79 });
82 80  
83 81 gulp.task('webserver', function() {
... ... @@ -38,6 +38,7 @@
38 38 <script src="./node_modules/chart.js/dist/Chart.min.js"></script>
39 39 <script src="./node_modules/angular-chart.js/dist/angular-chart.min.js"></script>
40 40 <script src="./node_modules/angular-file-saver/dist/angular-file-saver.bundle.js"></script>
  41 + <script src="./node_modules/angular-md5/angular-md5.min.js"></script>
41 42  
42 43 <script src="./node_modules/foca-abm-chofer/dist/foca-abm-chofer.min.js"></script>
43 44 <script src="./node_modules/foca-abm-precios-condiciones/dist/foca-abm-precios-condiciones.min.js"></script>
... ... @@ -27,6 +27,7 @@
27 27 "angular-file-saver": "^1.1.3",
28 28 "angular-i18n": "^1.7.7",
29 29 "angular-ladda": "^0.4.3",
  30 + "angular-md5": "^0.1.10",
30 31 "angular-mocks": "^1.7.7",
31 32 "angular-route": "^1.7.7",
32 33 "angular-sanitize": "^1.7.7",
... ... @@ -12,6 +12,7 @@ angular.module(&#39;appWrapperDemo&#39;, [
12 12 'ui.grid',
13 13 'ui.grid.exporter',
14 14 'ngFileSaver',
  15 + 'angular-md5',
15 16  
16 17 // MODULOS FOCA
17 18 'focaAbmPreciosCondiciones',