16 Commits

Include renames

Author	SHA1	Message	Date
David Jay	b8fc2c9cc7	Addressing CSRF and user status issues.	2017-01-09 15:39:08 -05:00
David Jay	0f24ab6b28	Merge branch 'master' of github.com:coralproject/talk into moderate-bio	2017-01-06 15:56:03 -05:00
David Jay	d5a82f04c2	Fixing issues with e-mail and status update.	2017-01-06 15:35:32 -05:00
David Jay	565e34e09d	Adding endpoint for admins to send transactional e-mail.	2017-01-06 14:29:50 -05:00
Wyatt Johnson	4eb7c72ae2	Merge branch 'master' into email-confirm	2017-01-05 18:45:06 -07:00
Wyatt Johnson	cabe546ecf	Added email send on new user if enabled for confirming	2017-01-05 17:19:38 -07:00
Wyatt Johnson	a7680ae5d9	Initial pass at email confirmation	2017-01-03 17:35:58 -07:00
Kim GardnerandGitHub	ac66a7bb0e	Merge branch 'master' into csrf	2016-12-23 16:12:53 -05:00
gaba	ec3e9d1cd4	Merge branch 'master' into csrf	2016-12-22 14:23:01 -08:00
Riley Davis	4e3d286740	add environment var for pw reset FROM field	2016-12-22 14:53:33 -07:00
David Jay	a3eb4f5c76	Merge branch 'add-flag-option' of github.com:coralproject/talk into add-flag-option	2016-12-20 11:31:57 -08:00
David Jay	be3d506459	Moving action metadata to nested object.	2016-12-19 20:10:42 -05:00
gaba	dd032521c0	Merge branch 'master' into csrf	2016-12-16 17:55:49 -08:00
gaba	d8d30e512b	Only on POST check for CSRF.	2016-12-16 16:02:45 -08:00
Wyatt Johnson	7f12741c13	added comments to linter	2016-12-16 16:46:15 -07:00
David Jay	d229d5a96f	Updating route to davidjay.	2016-12-09 19:28:19 -05:00