Tyler Renelle 3473b73452 chore(Merge): branch 'develop' into bs3 ...

Conflicts:
	views/options/inventory/inventory.jade

2014-02-07 17:42:12 -07:00

..

controllers

refactor(errors): remove more res.json(500) in favor of next(err)

2014-02-07 09:20:40 -07:00

models

feat(bug-crushing): add the critical hammer of bug-crushing

2014-02-07 11:41:50 -07:00

routes

refactor(bs3): sync with develop

2014-02-06 17:36:33 +01:00

logging.js

fix(winston): typo

2014-02-02 23:26:57 -07:00

middleware.js

Revert "chore(cluster): temporarily disable cluster (revert here)"

2014-02-07 14:17:48 -07:00

seed.js

chore(logging): replace console.* with new logging module

2014-02-01 02:01:19 -06:00

server.js

chore(cluster): max 2-core

2014-02-07 14:18:04 -07:00

utils.js

chore(cluster): use domain-middleware properly, so domains are used to restart cluster workers

2014-02-06 10:58:47 -07:00