Commit Graph

12 Commits

Author SHA1 Message Date
Matteo Pagliazzi 9e540e86af add email with optional message when kicking user from group 2015-03-18 19:12:53 +01:00
Matteo Pagliazzi 0722a17897 start working on kick from group email & message 2015-03-18 17:31:07 +01:00
Sabe Jones c8db070b12 fix(quests): Reference string correctly 2015-03-17 21:51:28 -05:00
Sabe Jones 4c5f4377ff fix(quests): Alternate unlock strings 2015-03-17 21:48:22 -05:00
Sabe Jones efdf591eae fix(quest): Different string format 2015-03-17 21:38:22 -05:00
Sabe Jones 7422fe3865 fix(quest): Correct unlock string 2015-03-17 21:33:13 -05:00
Sabe Jones 4cb6783544 feat(quest): Bunny quest 2015-03-17 21:24:46 -05:00
Alice Harris 044930b7d3 add +2 Missed Days to debug menu in footer, adjust addMissedDay function and all calls to it 2015-03-07 18:39:43 +10: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 8ac9dc3ced Merge branch 'develop' into common-convert 2015-02-10 16:27:46 -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