210 commits

Author	SHA1	Message	Date
Sabe Jones	3a9e2a5123	fix(surveys): Visibility tweaks	2015-03-10 19:08:10 -05:00
Sabe Jones	9cfa27f089	feat(surveys): Survey achievement ... Updates the "Helped Habit Grow" achievement to be stackable. Also includes miscellaneous Bailey announcements for 3/10.	2015-03-10 18:39:00 -05:00
Sabe Jones	21fd8061cf	feat(backgrounds): March BGs	2015-03-03 21:42:15 -06:00
Sabe Jones	d4f8acd0ef	feat(mystery): February 2015	2015-02-24 20:15:31 -06:00
Matteo Pagliazzi	6d637e89a2	new bailey	2015-02-24 19:29:00 +01:00
Sabe Jones	47f3122c2d	chore(news): Pet rocks Bailey ... Also fixes incorrectly named golden rocks.	2015-02-17 20:39:04 -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	cc767efa20	Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert ... Conflicts: src/controllers/auth.js src/controllers/challenges.js src/controllers/groups.js src/controllers/members.js src/controllers/payments/index.js src/controllers/user.js src/middleware.js src/models/user.js	2015-02-03 21:13:55 -06:00
Blade Barringer	8a8ce8d80d	Moved folders to website directory	2015-02-03 14:10:55 -06:00

Renamed from views/shared/new-stuff.jade (Browse further)