7 commits

Author	SHA1	Message	Date
Luke Pulverenti	33b01d778c	merge from dev	2015-12-14 10:43:03 -05:00
Luke Pulverenti	f40a5f2e0d	update merge	2015-09-20 13:36:09 -04:00
Luke Pulverenti	e4bd2fbead	update merge	2015-09-20 13:30:39 -04:00
Luke Pulverenti	c86543dc59	fix forgot password page	2015-09-07 12:53:58 -04:00
Luke Pulverenti	bbfda77868	modularize scripts	2015-06-08 00:47:19 -04:00
Luke Pulverenti	7d1dbeddec	update login page	2015-05-05 19:15:47 -04:00
Luke Pulverenti	7f6f74fb54	fixes #941 - Rework password recovery and remove IsLocal checks	2014-11-08 22:18:14 -05:00