7 commits

Author	SHA1	Message	Date
Sacha Greif	ce11b81f29	fixed conflicts and merged with Twitter branch	2012-10-01 13:35:20 +09:00
Tom Coleman	c7ad8794ea	Put email back.	2012-10-01 14:18:30 +10:00
Tom Coleman	486f3b5c40	Updated accounts page a little.	2012-10-01 13:08:46 +10:00
Tom Coleman	e8bed27752	Route to user_edit page until the profile is complete.	2012-10-01 12:11:08 +10:00
Sacha Greif	9737ffd5ad	getting rid of underscores in variable names	2012-10-01 10:59:08 +09:00
Sacha Greif	54375236b5	working on new auth	2012-09-24 14:29:54 +09:00
Sacha Greif	9e1069132c	working on user account edit page	2012-09-19 09:03:25 +09:00