Граф коммитов

14 Коммитов

Автор SHA1 Сообщение Дата
Andrew Hayward dde8c37dcd Adding 'go back/restart' buttons to sign-up forms 2013-06-19 14:21:32 +01:00
Andrew Hayward 95184fe9f5 Merge branch 'master' into auth
Conflicts:
	views/auth/signup-next-child.html
	views/auth/signup-next.html
	views/auth/signup.html
2013-06-18 22:00:06 +01:00
Andrew Hayward ee81a8d36f Making sign-up forms a bit more informative 2013-06-18 21:55:48 +01:00
Chris McAvoy 315db05581 Merge pull request #620 from curlee/master
copy update. also re-adding truncation to badge desc
2013-06-17 12:40:48 -07:00
= 98f490955f corrected typo and modified copy as per meeting input 2013-06-17 14:12:21 -05:00
Michael Ballard 04330e04aa change span6 to span12 where content is single-column (and won't break in mobile) 2013-06-16 23:10:49 -04:00
Mike Larsson c657eea550 Removing "Choose your own" button from password field for <13 signup
if passwordGenerated is true.
2013-06-12 11:40:59 -04:00
Mike Larsson 0df2947cf0 This removes autogeneration of passwords for both < and >13
by setting passwordGenerated to false, and copying the >13
password form element stuff into the <13 signup page. If
we're really not going to auto-generate, a follow-up commit
can clean it all out.
2013-06-12 11:27:12 -04:00
Michael Ballard 12424dd38e unnecessary offset removed 2013-06-12 01:30:12 -04:00
Michael Ballard 07db61ca80 Text changed to suggest printing at password page & bootstrap alert css class 2013-06-12 00:55:18 -04:00
Chris McAvoy 0ee52ecde6 small offline approved copychange 2013-06-06 17:09:15 -05:00
Andrew Hayward c4a27b1273 Tidying up auth-related templates 2013-06-06 15:10:20 +01:00
Andrew Hayward ea38e52529 Template/logic updates for first/last name 2013-05-30 10:47:24 +01:00
Andrew Hayward a760085eda Removing parent/guardian sign-up process
Token sign-up still remains, but somewhat refactored
2013-05-16 08:35:47 +01:00