Skip to content

Commit d615598

Browse files
committed
Removed Ignored Tracked files
1 parent b67c915 commit d615598

File tree

11 files changed

+5440
-130
lines changed

11 files changed

+5440
-130
lines changed

.gitignore

+8-7
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,18 @@ node_modules
3131
#custom
3232
config.json
3333
import.csv
34-
src/mailer/templates/promo/
34+
/src/mailer/templates/promo/
3535
*.pem
36-
public/uploads/tickets/
37-
public/uploads/users/
36+
/public/uploads/tickets/
37+
/public/uploads/users/
3838
coverage.html
3939
*.bk
4040
apidocs
41-
docs
42-
public/js/*
43-
public/css/app.css.map
41+
/docs/*.html
42+
/public/js/
43+
app.css.map
4444
*.diff
4545
private/
4646
.sass-cache/
47-
coverage/
47+
/coverage/
48+
/plugins/

package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"grunt": "1.0.1",
3737
"grunt-apidoc": "0.11.0",
3838
"grunt-contrib-cssmin": "1.0.1",
39-
"grunt-contrib-uglify": "0.11.0",
39+
"grunt-contrib-uglify": "1.0.1",
4040
"grunt-jsdoc": "2.1.0",
4141
"grunt-sass": "1.2.0",
4242
"grunt-shell": "1.3.0",
@@ -66,11 +66,13 @@
6666
"passport.socketio": "3.6.2",
6767
"pm2": "1.1.3",
6868
"prompt": "1.0.0",
69-
"request": "2.67.0",
69+
"request": "2.73.0",
70+
"rimraf": "^2.6.0",
7071
"sanitize-html": "1.13.0",
7172
"serve-favicon": "2.3.0",
7273
"socket.io": "1.4.8",
7374
"socket.io-client": "1.4.8",
75+
"tar": "^2.2.1",
7476
"thirty-two": "1.0.2",
7577
"uglify-js": "2.7.0",
7678
"underscore": "1.8.3",
@@ -89,7 +91,6 @@
8991
"eslint-plugin-node": "3.0.5",
9092
"exports-loader": "0.6.3",
9193
"expose-loader": "0.7.1",
92-
"grunt-contrib-uglify": "1.0.1",
9394
"grunt-contrib-watch": "1.0.0",
9495
"grunt-express-server": "0.5.3",
9596
"grunt-htmlhint": "0.9.13",
@@ -100,7 +101,6 @@
100101
"jsdoc": "3.4.3",
101102
"mocha": "2.5.3",
102103
"mocha-lcov-reporter": "1.2.0",
103-
"request": "2.73.0",
104104
"script-loader": "0.7.0",
105105
"superagent": "2.0.0",
106106
"supertest": "1.2.0",

plugins/ipam/controllers/index.js

-40
This file was deleted.

plugins/ipam/models/ipobj.js

-33
This file was deleted.

plugins/ipam/plugin.json

-13
This file was deleted.

plugins/ipam/public/css/ipam.css

-3
This file was deleted.

plugins/ipam/public/js/ipam.js

-6
This file was deleted.

plugins/ipam/routes/index.js

-11
This file was deleted.

plugins/ipam/views/ipam.hbs

-13
This file was deleted.
-136 KB
Binary file not shown.

0 commit comments

Comments
 (0)