Tyler Renelle f8f8a1334b Merge branch 'develop' into classes ...

Conflicts:
	views/options/inventory/stable.jade

2013-12-07 20:23:26 -07:00

..

controllers

Merge branch 'develop' into classes

2013-12-07 20:23:26 -07:00

directives

change reference to images directory for emoji, fixes #1935

2013-11-27 20:46:18 -08: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 'develop' into classes

2013-12-07 20:23:26 -07:00

app.js

use script tag not eval to execute moment language code

2013-11-25 17:04:07 +01:00

static.js

add loading bar to front page too

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