Connor Turland 13937ae51d merged conflicts coming from develop branch		2014-10-22 11:52:31 -04:00
..
confirmations	added completely new logging in system	2013-07-10 14:02:38 -04:00
mailer	added completely new logging in system	2013-07-10 14:02:38 -04:00
passwords	Sign In, Sign Up, Edit User pages have been changed. Edit User page needs lots of work still.	2014-09-25 12:25:46 -04:00
registrations	remove request invite from the sign up form	2014-10-18 20:32:19 -04:00
sessions	style changes for account pages	2014-09-26 22:31:06 -04:00
shared	added completely new logging in system	2013-07-10 14:02:38 -04:00
unlocks	added completely new logging in system	2013-07-10 14:02:38 -04:00
edit.html.erb	got profile picture uploading working, as well as profile picture removing, as well as password changing	2014-10-21 20:31:59 -04:00