Merge branch 'master' into 'master'

Master See merge request !3

Merge branch 'master' into 'master'
Master See merge request !3
Nicolás Guarnieri
2 parents 948b32a1fa dcc700601b
Showing 1 changed file Show diff stats
package.json
@@ -4,8 +4,12 @@
   "description": "foca-crear-login",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
+        "test": "echo \"Error: no test specified\" && exit 1",
+        "compile": "gulp uglify && gulp html",
+        "gulp-pre-commit": "gulp pre-commit",
+        "postinstall": "npm run compile && rm -R src && rm index.html && rm .jshintrc && rm gulpfile.js",
+        "install-dev": "npm install angular bootstrap font-awesome jquery gulp gulp-connect jasmine-core pre-commit gulp-angular-templatecache gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify-es jshint pump"
+    },
   "repository": {
     "type": "git",
     "url": "git@git.focasoftware.com:npm/foca-crear-login.git"
...	...	@@ -4,8 +4,12 @@
4	4	"description": "foca-crear-login",
5	5	"main": "index.js",
6	6	"scripts": {
7		- "test": "echo \"Error: no test specified\" && exit 1"
8		- },
	7	+ "test": "echo \"Error: no test specified\" && exit 1",
	8	+ "compile": "gulp uglify && gulp html",
	9	+ "gulp-pre-commit": "gulp pre-commit",
	10	+ "postinstall": "npm run compile && rm -R src && rm index.html && rm .jshintrc && rm gulpfile.js",
	11	+ "install-dev": "npm install angular bootstrap font-awesome jquery gulp gulp-connect jasmine-core pre-commit gulp-angular-templatecache gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify-es jshint pump"
	12	+ },
9	13	"repository": {
10	14	"type": "git",
11	15	"url": "git@git.focasoftware.com:npm/foca-crear-login.git"