Skip to content
Permalink
Browse files

Merge with frontend.

  • Loading branch information...
n1try
n1try committed Nov 16, 2016
1 parent e9bc01c commit f8dae07d5519c8aa0cec2008763ffcc527614df9
Showing with 46 additions and 70 deletions.
  1. +10 −0 .editorconfig
  2. +9 −2 .gitignore
  3. +0 −9 bower.json
  4. +27 −3 package.json
  5. +0 −9 public/.gitignore
  6. +0 −12 public/README.md
  7. +0 −35 public/package.json
@@ -0,0 +1,10 @@
# http://editorconfig.org
root = true

[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
@@ -8,5 +8,12 @@ data
log/*
*.log
.vscode
snippets/history.json
snippets/*.log
snippets
dist
.tmp
bower_components
.gitattributes
.jscsrc
.jshintrc
.yo-rc.json
.sass-cache

This file was deleted.

@@ -28,15 +28,39 @@
"underscore": "^1.8.3"
},
"devDependencies": {
"grunt": "^0.4.5",
"grunt-contrib-watch": "^0.6.1",
"grunt-develop": "^0.4.0",
"grunt-env": "^0.4.4",
"grunt-execute": "^0.2.2",
"load-grunt-tasks": "^3.2.0",
"mongodb": "^2.2.10",
"request": "^2.75.0",
"time-grunt": "^1.2.1",
"winston": "^2.2.0"
"winston": "^2.2.0",
"autoprefixer-core": "^5.2.1",
"grunt": "^0.4.5",
"grunt-angular-templates": "^0.5.7",
"grunt-concurrent": "^1.0.0",
"grunt-contrib-clean": "^0.6.0",
"grunt-contrib-concat": "^0.5.0",
"grunt-contrib-connect": "^0.9.0",
"grunt-contrib-copy": "^0.7.0",
"grunt-contrib-cssmin": "^0.12.0",
"grunt-contrib-htmlmin": "^0.4.0",
"grunt-contrib-jshint": "^0.11.0",
"grunt-contrib-uglify": "^0.7.0",
"grunt-contrib-watch": "^0.6.1",
"grunt-filerev": "^2.1.2",
"grunt-google-cdn": "^0.4.3",
"grunt-jscs": "^1.8.0",
"grunt-newer": "^1.1.0",
"grunt-ng-annotate": "^0.9.2",
"grunt-postcss": "^0.5.5",
"grunt-svgmin": "^2.0.0",
"grunt-usemin": "^3.0.0",
"grunt-wiredep": "^2.0.0",
"jit-grunt": "^0.9.1",
"jshint-stylish": "^1.0.0",
"simple-fmt": "^0.1.0",
"time-grunt": "^1.0.0"
}
}

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit f8dae07

Please sign in to comment.
You can’t perform that action at this time.