5 Commits

Author	SHA1	Message	Date
Tyler Renelle	7336d5bc23	fix(auth): hacky fix to get around tabset hiding the surrounding ... authctrl scope (due to isolate scope)	2015-04-03 15:48:32 -06:00
Sabe Jones	130261dacf	feat(event): End Valentine's	2015-02-16 18:15:09 -06:00
Blade Barringer	477d3d6085	Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert	2015-02-12 13:32:23 -06:00
Blade Barringer	75c9b5a978	Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert ... Conflicts: src/controllers/groups.js src/controllers/payments/index.js src/controllers/user.js src/models/user.js	2015-02-09 22:21:27 -06:00
Blade Barringer	d2eafdd021	Started moving public folder stuff back to website	2015-02-03 14:02:34 -06:00