Tyler Renelle 4c3f04cc49 Merge branch 'mounts' into develop ...

Conflicts:
	views/options/inventory/stable.jade

2013-11-14 13:04:44 -08:00

..

controllers

Merge branch 'mounts' into develop

2013-11-14 13:04:44 -08:00

models

Merge branch 'mounts' into develop

2013-11-14 13:04:44 -08:00

routes

middleware.locals back to a middleware, use user specified language if avalaible, list of avalaible languages avalaible in window.env

2013-11-12 15:57:46 +01:00

config.js

api & rewrite: buy gems, reroll, fully converted server to JS, bug fixes

2013-08-29 01:45:54 -04:00

middleware.js

remove clientSideStrings part, stringNotFound added to locales/en/app.json, should be added to other languages, readme updated, $rootscope.translations removed

2013-11-14 14:41:42 +01:00

seed.js

updated README to show initial seeding tasks, and fixed a small typo

2013-11-09 08:48:38 -08:00

server.js

remove middleware.splash

2013-11-12 15:10:16 +01:00

utils.js

[#1446] add password-reset (still need change password for this to be useful)

2013-09-06 09:33:23 -04:00