Commit Graph

8 Commits

Author SHA1 Message Date
Matteo Pagliazzi 4151b0733f add ability to unsubscribe from a single event using a dedicated link 2015-02-23 21:25:01 +01:00
Matteo Pagliazzi 6d38086b66 use profile name in emails for fb users 2015-02-20 18:17:54 +01:00
Blade Barringer 84ce4bb5d8 Corrected path to config.json 2015-02-13 09:45:18 -06:00
Blade Barringer 9dfd96b84f Moved and configured config.json to be in root of directory 2015-02-13 09:24:16 -06:00
Blade Barringer bf4f2299e2 Moved src to website/src (again) 2015-02-10 16:04:17 -06:00
Blade Barringer e243887563 Deleted website/src 2015-02-10 16:03:11 -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