Commit Graph

5 Commits

Author SHA1 Message Date
Bill Parrott 98c6526cf7 add auto-focus when single/multiple is toggled 2015-02-19 08:46:45 -06:00
Bill Parrott 4563d22bf0 minor updates from code review 2015-02-17 14:05:09 -06:00
Bill Parrott 2de3a5dd55 first draft of bulk add 2015-02-17 00:25:56 -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