Tyler Renelle ce8351d622 chore(Merge): branch 'develop' into origin-paglias-bs3 ...

Conflicts:
	views/options/social/tavern.jade

2014-02-07 00:03:33 -07:00

..

controllers

chore(Merge): branch 'develop' into origin-paglias-bs3

2014-02-07 00:03:33 -07:00

directives

i18n(refactor): load all files in a locale, not the ones defined in app.json, move env.t client code to own file, add env.isStaticPage (from isFrontPage)

2014-02-06 17:17:21 +01:00

filters

feat(quests): allow html in quest notes

2014-01-31 15:06:56 -07:00

services

chore(Merge): branch 'develop' into origin-paglias-bs3

2014-02-07 00:03:33 -07:00

app.js

refactor(errors): refactor the way errors, offline, & queued ops are handled

2014-02-06 21:10:13 -07:00

env.js

i18n(refactor): load all files in a locale, not the ones defined in app.json, move env.t client code to own file, add env.isStaticPage (from isFrontPage)

2014-02-06 17:17:21 +01:00

static.js

feat(administrators): start adding features page for admin accounts

2014-01-27 18:24:24 -08:00