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

directives

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

filters

mounts: update all html & javascript to support UserSchema overhaul (60421a8). Also add very basic feeding & saddling mounts functionality. use progress bars to indicate pet feeding progress

2013-11-10 11:04:41 -08:00

services

Merge branch 'mounts' into develop

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

app.js

Merge branch 'mounts' into develop

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

static.js

add loading bar to front page too

2013-11-01 21:07:44 +01:00