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

283 Коммитов

Автор SHA1 Сообщение Дата
Shane Tomlinson 7aa99d7346 Merge pull request #445 from pdehaan/issue-406
Updating to match UX PDF - Fixes #406

Good catch on the PDF.

r+
2014-02-03 03:40:06 -08:00
Shane Tomlinson 3984634a53 Merge pull request #443 from pdehaan/issue-442
removing unused assets

@ryanfeeley gave the OK. I give the OK.

@pdehaan is on a roll!

r+
2014-02-03 03:38:19 -08:00
Peter deHaan b96dfefe81 Updating to match UX PDF - Fixes #406 2014-02-01 00:17:05 -08:00
Peter deHaan d7aabc141d removing unused assets 2014-01-31 23:28:34 -08:00
Peter deHaan abd96abf40 Adding a missing ; and a couple other minor issues reported by CSSLint 2014-01-31 18:19:12 -08:00
Peter deHaan fbaed8a080 Fixes #438 -- plus a few changes for CSS-consistency 2014-01-31 17:12:23 -08:00
Nick Chapman 04a0e8920f Merge pull request #433 from pdehaan/pptos
minor tweaks of PP/TOS
2014-01-31 15:55:14 -08:00
Peter deHaan 5c3177f27e removing extra lt 2014-01-31 15:53:51 -08:00
Nick Chapman 9cd449fcc1 Merge pull request #432 from johngruen/design-changes
minor css bug tweaks
2014-01-31 15:45:11 -08:00
Peter deHaan 8dd4c14432 minor tweaks of PP/TOS 2014-01-31 15:43:39 -08:00
johngruen 8b86a1d3ce minor css bug tweaks 2014-01-31 15:42:34 -08:00
Zach Carter 29d1fab628 Merge pull request #429 from mozilla/issue-418-disable-delete-account
Disabled "Delete account"
2014-01-31 15:29:38 -08:00
Nick Chapman 0c10af07db Disabled "Delete account". 2014-01-31 15:17:32 -08:00
John Gruen e7a660f2c6 Update confirm.mustache
string corrected to match UX spec
2014-01-31 15:10:30 -08:00
Nick Chapman 5b32aead5d Merge pull request #409 from pdehaan/issue-407
Fixes #407
2014-01-31 15:00:02 -08:00
Nick Chapman 6b90a573f2 Merge pull request #422 from vladikoff/typo527
Fixes a typo, tabs to spaces
2014-01-31 14:35:09 -08:00
vladikoff a324f924e7 Fixes a typo, tabs to spaces 2014-01-31 17:31:39 -05:00
Zach Carter b03dcf293b Merge pull request #421 from mozilla/issue-411-blank-legal-pages
Fixed browsing directly to pages under legal
2014-01-31 14:31:06 -08:00
Nick Chapman ae924124bc Fixed browsing directly to pages under legal. 2014-01-31 14:27:04 -08:00
Zach Carter 4835568b1d Merge pull request #420 from mozilla/force_auth_fix
do not navigate to settings if in forceauth flow
2014-01-31 14:24:26 -08:00
Zachary Carter a70d14dc79 do not navigate to settings if in forceauth flow 2014-01-31 14:19:12 -08:00
johngruen 6f82657701 added ids and translation 2014-01-31 14:06:58 -08:00
johngruen 5dd0c07f5c fixed legal routes 2014-01-31 14:01:11 -08:00
johngruen 73f347296b fixing things 2014-01-31 13:54:29 -08:00
johngruen 3b3f3e713c addedlegal copy and updated a css to accomodate 2014-01-31 13:25:20 -08:00
johngruen 4d2f811eee Merge branch 'refs/heads/master' into design-changes
Conflicts:
	app/scripts/templates/sign_up.mustache
2014-01-31 11:47:30 -08:00
johngruen 8713bc047e fixed option bug and reversed coppa list 2014-01-31 11:26:57 -08:00
johngruen 43406adf02 minimized use of sibling selector, fixed d placement in change_password.mustache 2014-01-31 11:14:52 -08:00
johngruen 1800c2c48a updated foxLogo class to match normal class syntax 2014-01-31 10:43:31 -08:00
johngruen 4d57ff3aff added browser prefixes for transitions 2014-01-31 10:39:37 -08:00
johngruen 8b1462b17b fixed missing span closures and removed hsla color val 2014-01-31 10:31:48 -08:00
johngruen 8e755f123e fixed header h1 text display:none bug 2014-01-31 09:39:52 -08:00
johngruen 52b9d692b4 tidied up legal css + templates to match others 2014-01-31 09:36:02 -08:00
johngruen 62eac0153f fixed min-height bug 2014-01-30 20:26:41 -08:00
johngruen b05df42ff6 updated templates, a tiny bit of js but mostly CSS 2014-01-30 20:11:04 -08:00
Peter deHaan bb4830f7f9 Fixes #407 2014-01-30 16:30:40 -08:00
Nick Chapman 94510057ae Merge pull request #398 from pdehaan/signin_copy
Fixes #380 and #378
2014-01-30 13:43:32 -08:00
Zach Carter afcc49c406 Merge pull request #388 from mozilla/issue-339-background-flash
Fixed background flash on first load
2014-01-30 12:12:45 -08:00
Peter deHaan 996f00a433 Removing nbsp since the text would wrap differently for each locale 2014-01-30 11:48:28 -08:00
Peter deHaan 509ec086e3 Fixes #380 and #378 2014-01-30 11:26:11 -08:00
Nick Chapman 423445a8a3 Fixed background flash on first load and fixed top and bottom padding. 2014-01-30 11:11:48 -08:00
Zachary Carter 67f9e6d924 use a recursive setTimeout instead of an interval for focus polling - fixes #391 2014-01-30 11:11:41 -08:00
Nick Chapman 51f3570750 Merge pull request #390 from mozilla/issue-389-missing-h1-signin
add the missing header on /signin
2014-01-30 10:16:46 -08:00
Shane Tomlinson a5c7f6e1e8 add the missing header on /signin
fixes #389
2014-01-30 17:14:38 +00:00
Shane Tomlinson 20680a4d1a Do not allow auto-fill/auto-save of passwords when used with sync.
issue #363
2014-01-30 16:39:42 +00:00
Nick Chapman 5d78c3d325 Merge pull request #385 from mozilla/issue-353-modernizr
Fix Modernizr and focus issues when embedded in about:accounts
2014-01-30 08:25:58 -08:00
Shane Tomlinson 8aa14d1e5d Fix Modernizr and focus issues when embedded in about:accounts
* Modernizr blows up when trying to query for indexedDB. To get around this, for prod, we build modernizr with only the components we need. This has the advantage of being a smaller download as well. Since modernizr was throwing an exception, there were some interesting side effects - like the #stage element was never hidden in the embedded context. With modernizr working, content remained hidden because of the way $.show works, and this had to be fixed.
* Only elements that are visible can be focused. Keep trying to autofocus an element until it is focused.
* Ensure requirejs has a cache busting URL.

issue #384
fixes #353
2014-01-30 13:43:58 +00:00
Shane Tomlinson f1215c1079 Require an email address to use the /force_auth screen. 2014-01-30 13:42:05 +00:00
Shane Tomlinson 2e1e23dbfc A /force_auth screen.
* Save forceAuth to the session. If forceAuth is set, only show back button in the reset_password screen.
* Reset the forceAuth flag from sign_in and sign_up
2014-01-30 13:42:05 +00:00
Shane Tomlinson 1fa9fbca58 Fix the test blowup. 2014-01-30 13:40:54 +00:00
Zachary Carter b7c4e7db93 fix for email input focus on about:accounts - fixes #351 2014-01-29 19:17:32 -08:00
Shane Tomlinson 1e4824f056 Work around the Firefox 29 password flow under the show/hide button problem.
* Set a background color on the show/hide button and position the button just right to cover up the password field.

see https://bugzilla.mozilla.org/show_bug.cgi?id=965237

fixes #349
2014-01-29 19:44:11 +00:00
Shane Tomlinson a4775d252a Password field cleanup.
* Ensure "hide" text is centered
* Simplify show/hide button css selectors to be more compatible with IE8
* Fix underflow for browsers other than Firefox 29.

fixes #341
issue #305
2014-01-29 19:44:10 +00:00
Nick Chapman b1ef38389a Merge pull request #374 from mozilla/issues-366-372-tos-pp-updates
Issues 366 372 tos pp updates
2014-01-29 11:20:35 -08:00
Shane Tomlinson a5df416a30 Update the TOS/PP links with the /legal prefix
fixes #366
2014-01-29 14:59:16 +00:00
Shane Tomlinson d553bee4a8 Change "Sync" to "Firefox online services" in the TOS/PP text
fixes #372
2014-01-29 14:47:20 +00:00
Shane Tomlinson 06d3b9edf0 Cleanup of the change password errors.
* Change the "passwords are the same!" error to "old and new passwords must be different"
* Hide error messages on form submission.
* Hide the form if the password change was successful.
2014-01-29 13:01:43 +00:00
Shane Tomlinson 998294d21d Fix the duplicate show-password element ids.
* change one to 'show-old-password', the other to 'show-new-password'

fixes #340
2014-01-29 12:35:12 +00:00
Shane Tomlinson b78ba3b865 Add the password rules below the new password field.
fixes #342
2014-01-29 12:35:12 +00:00
Shane Tomlinson 57ac08cff5 change password UX cleanup
* If the passwords are the same, print an error message.
* Hide any error messages when a success message is printed.

fixes #336
fixes #343
2014-01-29 12:35:12 +00:00
Nick Chapman 3201e5a973 Merge pull request #361 from mozilla/issue-347-settings-layout
Space out the links in the settings page.
2014-01-28 16:00:35 -08:00
Nick Chapman 08a205a1d0 Made list styles more specific. 2014-01-28 15:59:41 -08:00
Shane Tomlinson 2e6d120dcd Space out the links in the settings page.
fixes #347
2014-01-28 15:55:03 +00:00
Shane Tomlinson fa2fa71b2f Simplify search parameter passing across screen transitions.
* Add the search parameters to the new URL in one place only, router.js->navigate.
* Remove the searchParam passing in other locations.
* Add a mocha test for router.js
2014-01-28 14:24:40 +00:00
Shane Tomlinson 907f2596fc Add "navigate" to the baseview to reduce boilerplate. 2014-01-28 13:49:42 +00:00
Nick Chapman ef6939f2ea Persist search params when navigating between views. 2014-01-24 17:07:50 -08:00
Zachary Carter e7798948e3 fix merge bug 2014-01-24 15:40:26 -08:00
Shane Tomlinson 43752a7cb7 Hookup resend verification email links
* Add reset password resend to the fxa-client wrapper.
* Rename requestPasswordReset to passwordReset - update consumers.
* Add visual feedback when email is resent.
* Add BaseView.preventDefaultThen to reduce event handling boilerplate. BaseView.preventDefault returns a proxy event handler that backbone can use to call event.preventDefault, then another handler.

fixes #272
2014-01-24 15:27:11 -08:00
Zach Carter bf8883aac3 Merge pull request #333 from mozilla/issue-267-combine-strings-l10n
Issue 267 combine strings l10n
2014-01-24 11:53:10 -08:00
Nick Chapman d7a2a99a00 Removed transitional animations. 2014-01-24 11:10:33 -08:00
Nick Chapman 6882983e9d Merge pull request #331 from mozilla/issues-329-330-settings-updates
Issues 329 330 settings updates
2014-01-24 10:02:31 -08:00
Nick Chapman ea03a164ea Merge pull request #312 from mozilla/issue-309-customize-sync
Customize sync option
2014-01-24 09:52:23 -08:00
Shane Tomlinson 9a5981c8ac Combine disparate strings for easier l10n.
* Interpolate on %s and %(name)s that the Mozilla l10n team is accustomed to using.
* Write email HTML from JS to simplify the translator's job

fixes #267
2014-01-24 13:05:24 +00:00
Shane Tomlinson 09ea53c863 Add string interpolation to the translator.
* The translator looks for strings with %s and %(named)s and replaces with values from context.
2014-01-24 12:53:42 +00:00
Shane Tomlinson 755d575e6a Ensure the noscript tag displays when JS is disabled.
* Only set the #main opacity to 0 if the .js class is on the html

fixes #287
2014-01-24 11:19:09 +00:00
Shane Tomlinson fd71f5e9f0 Split the change password screen from the settings screen.
fixes #330
2014-01-24 10:49:54 +00:00
Shane Tomlinson fb3fe5b218 Add show/hide buttons to password fields in /delete_account and /settings
fixes #329
2014-01-24 10:49:54 +00:00
Shane Tomlinson 36880ccc5d Pass the customizeSync option to fxa-client wrapper.signUp as well as .signIn 2014-01-24 10:16:59 +00:00
Nick Chapman e07391175e Added "Customize sync" checkbox to Sign up. 2014-01-24 10:08:46 +00:00
Shane Tomlinson 779f2612cc Fix JSHint errors. 2014-01-24 09:55:50 +00:00
Nick Chapman f3f042df3a Merge pull request #306 from mozilla/issue-254-manage-page
Settings and delete account screens.
2014-01-23 17:15:02 -08:00
Shane Tomlinson ceb2bf3889 Fix jscs errors. 2014-01-24 01:03:54 +00:00
Nick Chapman 56e7931005 Merge pull request #320 from mozilla/issue-313-complete-reset-password-button
Disable the complete reset password "next" button by default
2014-01-23 16:59:26 -08:00
Shane Tomlinson da43896808 Clean up the fxa-client
* Use a mock channel to prevent blowups.
* Ensure the login message is sent to the channel when expected
2014-01-24 00:47:15 +00:00
Shane Tomlinson e2dedb2c92 Handle mustAuth in base.js
* Add the 'mustAuth' flag to the delete_account and settings page & get rid of common code.
2014-01-24 00:24:11 +00:00
Shane Tomlinson 45c8943105 Clean up Session code, add better documentation. 2014-01-24 00:13:46 +00:00
Zach Carter 59c05c5ee0 Merge pull request #324 from mozilla/sync-pages
Embeddable sync pages
2014-01-23 15:49:30 -08:00
Nick Chapman 81f14e1465 Sync HTMLs to be embedded in Firefox. 2014-01-23 14:13:05 -08:00
Shane Tomlinson a3cd956b92 Various cleanup:
* Update the settings test to handle unverified emails.
* After password change, sign the user in again.
* Get rid of unused dependencies.
2014-01-23 20:47:28 +00:00
Shane Tomlinson bf77955d4c Notify the Session.channel of user status changes from within fxa-client.js
* Reduces the number of places this needs to be done.
2014-01-23 20:47:28 +00:00
Shane Tomlinson 00a87bca2f Users must be signed in to see the settings and delete_account pages. 2014-01-23 20:47:27 +00:00
Shane Tomlinson 6dbdf6ab7c Session is now saved to localStorage to allow the user to reload the screen.
* Must use accessor functions to save data to Session
* Data stored in localStorage is automatically loaded into Session on startup.

fixes #310
2014-01-23 20:47:27 +00:00
Shane Tomlinson 0eb843ad11 Start to use accessor functions when working with session information.
* Add get/set/clear functionality for Session.
2014-01-23 20:47:27 +00:00
Shane Tomlinson 95c2f5816b Start on the settings page and delete account screen.
* Update the /settings screen with change password and sign out functionality
* Add /delete_account
* Add new auth-server functions to the fxa-client
* Allow the fxa-client to handle updating the Session state
* When visiting /, redirect to /signup

issue #254
2014-01-23 20:47:27 +00:00
Shane Tomlinson 2d640fb8ba Remove a lot of View display boilerplate by creating a generic function showView 2014-01-23 20:47:27 +00:00
Zach Carter dcf726c409 Merge pull request #314 from mozilla/unverified_login
Redirect unverified users to confirm screen on log in
2014-01-23 12:38:45 -08:00
Shane Tomlinson c2e409bd13 propogate errors by adding a return statement when calling `client.recoveryEmailResendCode` 2014-01-23 20:13:45 +00:00
Shane Tomlinson ba56445475 Disable the complete reset password "next" button by default
fixes #313
2014-01-23 18:52:00 +00:00
Shane Tomlinson 779ca72fbd Merge pull request #315 from mozilla/select-styles
Fancy select tag styles

Going to open a new issue with cross browser issues.

Nice work @nchapman!

r+
2014-01-23 09:45:40 -08:00
Shane Tomlinson f2d6d7d3f7 Simplify the sign in tests by looking for known ids. Check the email address was written in the confirm screen. 2014-01-23 11:47:22 +00:00