Skip to content

Commit f8dae07

Browse files
author
n1try
committed
Merge with frontend.
1 parent e9bc01c commit f8dae07

File tree

7 files changed

+46
-70
lines changed

7 files changed

+46
-70
lines changed

.editorconfig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# http://editorconfig.org
2+
root = true
3+
4+
[*]
5+
indent_style = space
6+
indent_size = 2
7+
end_of_line = lf
8+
charset = utf-8
9+
trim_trailing_whitespace = true
10+
insert_final_newline = true

.gitignore

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,12 @@ data
88
log/*
99
*.log
1010
.vscode
11-
snippets/history.json
12-
snippets/*.log
11+
snippets
12+
dist
13+
.tmp
14+
bower_components
15+
.gitattributes
16+
.jscsrc
17+
.jshintrc
18+
.yo-rc.json
19+
.sass-cache

bower.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

package.json

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,39 @@
2828
"underscore": "^1.8.3"
2929
},
3030
"devDependencies": {
31-
"grunt": "^0.4.5",
32-
"grunt-contrib-watch": "^0.6.1",
3331
"grunt-develop": "^0.4.0",
3432
"grunt-env": "^0.4.4",
3533
"grunt-execute": "^0.2.2",
3634
"load-grunt-tasks": "^3.2.0",
3735
"mongodb": "^2.2.10",
3836
"request": "^2.75.0",
3937
"time-grunt": "^1.2.1",
40-
"winston": "^2.2.0"
38+
"winston": "^2.2.0",
39+
"autoprefixer-core": "^5.2.1",
40+
"grunt": "^0.4.5",
41+
"grunt-angular-templates": "^0.5.7",
42+
"grunt-concurrent": "^1.0.0",
43+
"grunt-contrib-clean": "^0.6.0",
44+
"grunt-contrib-concat": "^0.5.0",
45+
"grunt-contrib-connect": "^0.9.0",
46+
"grunt-contrib-copy": "^0.7.0",
47+
"grunt-contrib-cssmin": "^0.12.0",
48+
"grunt-contrib-htmlmin": "^0.4.0",
49+
"grunt-contrib-jshint": "^0.11.0",
50+
"grunt-contrib-uglify": "^0.7.0",
51+
"grunt-contrib-watch": "^0.6.1",
52+
"grunt-filerev": "^2.1.2",
53+
"grunt-google-cdn": "^0.4.3",
54+
"grunt-jscs": "^1.8.0",
55+
"grunt-newer": "^1.1.0",
56+
"grunt-ng-annotate": "^0.9.2",
57+
"grunt-postcss": "^0.5.5",
58+
"grunt-svgmin": "^2.0.0",
59+
"grunt-usemin": "^3.0.0",
60+
"grunt-wiredep": "^2.0.0",
61+
"jit-grunt": "^0.9.1",
62+
"jshint-stylish": "^1.0.0",
63+
"simple-fmt": "^0.1.0",
64+
"time-grunt": "^1.0.0"
4165
}
4266
}

public/.gitignore

Lines changed: 0 additions & 9 deletions
This file was deleted.

public/README.md

Lines changed: 0 additions & 12 deletions
This file was deleted.

public/package.json

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)