Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fall 2016 Accounts Rework Integration Branch (DO NOT MERGE) #364

Merged
merged 309 commits into from
Dec 21, 2016
Merged

Fall 2016 Accounts Rework Integration Branch (DO NOT MERGE) #364

merged 309 commits into from
Dec 21, 2016

Conversation

jpslav
Copy link
Member

@jpslav jpslav commented Nov 4, 2016 •
edited by nathanstitt
Loading

Todo before merge:

  • diff locales/eng.yml and submit added/changed strings for translation

@jpslav jpslav force-pushed the 2016-accounts-flow branch 4 times, most recently from 2886f4d to 60e055a Compare November 10, 2016 19:54
nathanstitt and others added 26 commits November 11, 2016 22:42
@nathanstitt
extract logo to partial
e84c50a
@nathanstitt
redirect and use cookie to remember email/username
aaada55
@nathanstitt
use translated string for js alert
8d023ce
@nathanstitt
remove un-needed attributes from hidden field
cdad852
@nathanstitt
rename spec to reflect what it's testing
67b4580
@jpslav
missing translation
b76b245
@jpslav
Merge pull request #373 from openstax/email-signin-flow
cd931fc 
Sign in with email login
@jpslav
Rough sign up flow (#375)
166e073 
Rough sign up flow
@jpslav
Salesforce lead pushing, global config, email validation consistency (#…
5b3f734 
…378)

Salesforce lead pushing, global config, email validation consistency
@nathanstitt
interactive signup that reveals email after type
30a0ae6
@nathanstitt
set alert with translated message
67f2201
@nathanstitt
mark single alert as html_safe like multiple is
301b186
@nathanstitt
translate views
4d8e673
@nathanstitt
update specs for new signup flow
5cc98d2
@nathanstitt
add signup to assets to be built
156fb18
@nathanstitt
type should be :password (without _field)
d372e0f
@nathanstitt
move general styles to common card
1439468
@nathanstitt
use mousedown event for removing 'i am a' option
6236725 
Click fires a bit late and it flickers
@nathanstitt
adjust styles for firefox
da55eda
@nathanstitt
revert outputs status change in favor of fatal_error
3946398
@nathanstitt
save role selection to session when handler fails
8228838
@nathanstitt
messages for errors
e4c4e56
@nathanstitt
rails validation uses raw apostrophe
534ef1a
@jpslav
Merge pull request #380 from openstax/signup-styles-n-spec
f89fbd2 
Signup styles n spec
@nathanstitt
use standard_field helper
6f041e3
@nathanstitt
set inputs to 100% width by default
7c8822a
jpslav and others added 28 commits December 10, 2016 12:34
@jpslav
put filters back in all controllers to guarantee use from authorize r…
f9ec179 
…oute (#428)
@nathanstitt
hide searchable checkbox behind edit cog icon
9cfd6c8
@nathanstitt
style cog darker when expanded
140fe32
@jpslav
Merge pull request #429 from openstax/hide-search
1b8d0c0 
Hide searchable checkbox behind edit cog icon
@jpslav
add role and school to user json (#430)
749b9fc
@nathanstitt @jpslav
Show only email, display controls when clicked (#431)
b66eb8c 
* Toggle delete and searchable when email clicked

* move email after search, enlarge it a bit

* Move resending confirmation into controls

* fix specs to display controls before clicking
@jpslav
Include tutor alt signup in default redirect URIs (#432)
60901dd
@jpslav
unconfirmed styling, change email mods to one per line (#433)
f0bfb9b 
* minor tweak to unconfirmed styling

* change email mods to be one to a line
@jpslav
autofocus on remaining primary fields (#434)
070595e
@jpslav
Changed exception page copy (#436)
1290783
@jpslav
pass param to jump to sign up (#437)
bae50cb
@jpslav
post-sign-up faculty access application (#438)
5148650
@jpslav
minor copy and style changes (#439)
f2717b6
@jpslav
new background, fixes to email label on signup start (#441)
28f06a1
@nathanstitt @jpslav
Remove min-height on card body (#442)
e87a101 
This allows the footer to move up beside the inputs.
@nathanstitt @jpslav
Remove top padding from footer (#443)
c5c3b98 
* Remove min-height on card body

This allows the footer to move up beside the inputs.

* Remove top padding, leaving only 30px top margin
@jpslav
update rescue_from to have this{...} (#444)
39aa8a0
@nathanstitt
Return true if url is blank or nil
5901da9
@nathanstitt
wrap copyright page in ox-card view
86bf56d
@nathanstitt
disable caching off profile page
c1b4db7
@nathanstitt
select previous value, use translation keys
2a5b740
@nathanstitt
test field values are retained on error
d5e4da7
@nathanstitt
check newsletter field if given
153bc37
@nathanstitt
Stop delete warning popup from re-occuring
7bd0c02 
We weren't unbinding the event listener when updating it, meaning we'd
add multiple listeners

Also hide brackets and underlines when adding an email
@nathanstitt
test uri.host exists
36c9c20
@nathanstitt
spec for controllers from @jpslav
fb9a850
@jpslav
Merge pull request #446 from openstax/2016-accounts-flow-ns
78fe842 
Bugfixes from accounts testing
@jpslav
copy cleanup (#447)
c246e6b
@jpslav jpslav merged commit 9ae6fc1 into master Dec 21, 2016
@jpslav jpslav deleted the 2016-accounts-flow branch December 21, 2016 22:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@jpslav @nathanstitt