Merge branch 'feature/admin-account-management' into dev
# Conflicts: # app/views/admin/transactions-list.server.view.html # app/views/admin/transactions-new.server.view.html
Showing
app/libs/adminBootstrap.js
0 → 100644
app/libs/passwordHash.js
0 → 100644
app/middlewares/basicAuth.js
deleted
100644 → 0
app/middlewares/loginRateLimit.js
0 → 100644
app/middlewares/requireAdmin.js
0 → 100644
app/middlewares/requireLogin.js
0 → 100644
app/models/AdminUser.js
0 → 100644
app/views/admin/login.server.view.html
0 → 100644
| ... | ... | @@ -15,6 +15,7 @@ |
| }, | ||
| "dependencies": { | ||
| "async": "^2.0.1", | ||
| "bcryptjs": "^3.0.3", | ||
| "body-parser": "^1.9.3", | ||
| "bunyan": "^1.8.1", | ||
| "chalk": "^0.5.1", | ||
| ... | ... | @@ -28,6 +29,7 @@ |
| "dateformat": "^3.0.3", | ||
| "dotenv": "^17.4.2", | ||
| "express": "^4.14.0", | ||
| "express-rate-limit": "^6.11.2", | ||
| "express-session": "^1.13.0", | ||
| "glob": "^7.2.3", | ||
| "he": "^0.5.0", | ||
| ... | ... |
Please
register
or
sign in
to comment