Commit Graph

12 Commits

Author SHA1 Message Date
Kathryn Norris 2fc01ee776 Simplified custom day start info in settings. (#5006) 2015-04-14 16:47:37 -07:00
Kathryn Norris 6a461be0a4 Replaced toggleCustomDayStartInfo function with angular magic. (#5006) 2015-04-14 14:49:45 -07:00
Kathryn Norris ddb7643ff7 Updated the custom day start information in settings. (#5006) 2015-04-13 17:13:22 -07:00
Tyler Renelle 84a77695ea feat(ads): remove ads completely 2015-03-19 11:39:17 -06:00
Matteo Pagliazzi 9e540e86af add email with optional message when kicking user from group 2015-03-18 19:12:53 +01:00
Alice Harris c47606c5b2 remove Show Tour button from Settings->Site; (unrelated to that) delete an outdated comment 2015-03-17 07:49:37 +10:00
Matteo Pagliazzi 397a293ca8 change text for recapture emails settings 2015-02-20 18:15:47 +01:00
Bill Parrott 7042c97d5d removing export functionality to move to its own branch 2015-02-17 14:23:55 -06:00
Bill Parrott b1b478bc74 add task export functionality 2015-02-16 21:21:49 -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