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

737 Коммитов

Автор SHA1 Сообщение Дата
Shane Tomlinson 93c672c54a fix: interpolate error string variables with data from backend.
* authErrors.toMessage can now take an error from the backend as well as other types.
* Add authErrors.toContext which fetches context for string interpolation from data returned from the backend.

fixes #412
2014-02-18 15:35:42 +00:00
Shane Tomlinson 8741ac04ff Better signin/signup error messages!
* Allow users who sign up with an existing account to sign in. If they type an  incorrect password, show them a link to the /signin page.
* Show users who sign in with a non-existent account a link to the /signup page.

* Clarify & simplify error processing of errors returned by the auth server
* Add a table of human understandable string types->numeric codes returned by the auth server to auth-errors.js
* All access to auth-errors goes through three functions, toMessage, toCode, and is;
* Add displayErrorUnsafe - no conversion on HTML before being displayed.
* Add functional tests for /signin and /signup error cases.
2014-02-18 14:29:52 +00:00
Shane Tomlinson d584e09fb8 Whitelist front end pages that can be viewed
fixes #322
2014-02-18 14:17:41 +00:00
Shane Tomlinson 2d99046e05 Merge pull request #550 from mozilla/grunt-refac
Grunt refactor

And thanks to [@vladikoff's suggestion](https://github.com/mozilla/fxa-content-server/pull/550#discussion_r9800061), our logs are down to 4700 lines!

r+ - thanks @pdehaan!
2014-02-18 12:01:36 +00:00
Shane Tomlinson 806901ad8c Update the CONFIG_ROOT to handle the change in directory of the selectconfig task. 2014-02-18 11:50:10 +00:00
Peter deHaan 8e5357883d Cleaning up the Gruntfile into the grunttasks dir 2014-02-17 17:21:13 +00:00
Shane Tomlinson 370c84bd01 Merge pull request #544 from pdehaan/issue-533
Adding login and registration links to reset password

r+ thanks @pdehaan!
2014-02-17 15:17:14 +00:00
Shane Tomlinson a913c867e3 Merge pull request #538 from mozilla/locale_directories
add locale directories

This is a beast @zaach! r+.
2014-02-17 15:03:42 +00:00
Zach Carter eb50b36292 Merge pull request #547 from pdehaan/copythat
Copythat
2014-02-15 10:59:48 -08:00
Peter deHaan 545924097a Reordering modules 2014-02-14 16:40:28 -08:00
Peter deHaan 5e7daa3a67 Switching to the grunt-copyright task instead of internal function 2014-02-14 16:16:47 -08:00
Zach Carter ae6d446a50 Merge pull request #526 from mozilla/tooltip-refresh
Tooltips are now done programatically.
2014-02-14 14:45:10 -08:00
Zachary Carter 52707f0a7d add locale directories 2014-02-14 11:43:51 -08:00
Peter deHaan 3bfe9bab57 Adding back button to reset password 2014-02-14 10:10:39 -08:00
Shane Tomlinson 6a2e3664fb Merge branch 'issue-535'
Manually rebased against master and fixed the merge conflicts in tos.mustache.

Thanks @pdehaan!

fixes #535
2014-02-14 10:18:10 +00:00
Peter deHaan 266b18791a removing inline styles. fixing smart quotes 2014-02-14 10:17:43 +00:00
Shane Tomlinson 4bfe84b38d Merge branch 'issue-511'
Thanks for this @pdehaan!

fixes #511
2014-02-14 10:12:41 +00:00
Shane Tomlinson 3462997a69 Add -webkit and -moz vendor prefixed keyframes for the movein animation. 2014-02-14 10:12:11 +00:00
Peter deHaan 34781a6071 Missed an animation near the top of the page 2014-02-14 10:07:36 +00:00
Peter deHaan cd8555b202 Fixing signup animation on low-res media query 2014-02-14 10:07:36 +00:00
Shane Tomlinson 7d408f9aff Hide tooltips on element 'change' event as well. 2014-02-14 10:04:32 +00:00
Shane Tomlinson 8debdabdfa Add unit tests around trackSubview and untrackSubview. 2014-02-14 09:44:16 +00:00
Shane Tomlinson 5fb219d448 Tooltips are now done programatically.
* Prepare for IE8 which has no `content: attr(title)` CSS support.
* Position the tooltip programatically to avoid problems with password help text.
* Eliminates the extra HTML needed to position tooltips.
* Fixes the "password help text" now displaying when focusing the password field on /signup

fixes #492
fixes #498
fixes #525
2014-02-14 09:44:16 +00:00
Shane Tomlinson 78c7ad658b Merge pull request #541 from pdehaan/issue-539
Changing Firefox Online Services to Firefox Cloud Services

`rgrep -i "Firefox online" .` from both the `app` and `server` directories reveals no missed strings. We'll have to re-run `grunt l10n-extract` to update the .pot files for translation.

r+ thanks @pdehaan!
2014-02-14 09:37:52 +00:00
Zachary Carter ed4df34117 fix merge error 2014-02-13 23:07:44 -08:00
Zachary Carter f93515557b Merge branch 'jsonlint' of github.com:pdehaan/fxa-content-server into pdehaan-jsonlint
Conflicts:
	package.json
2014-02-13 22:51:00 -08:00
Peter deHaan cc274133cb Changing Firefox Online Services to Firefox Cloud Services 2014-02-13 17:37:25 -08:00
Nick Chapman 2db1949007 Merge pull request #518 from mozilla/issues-455-502-verified-screens
Update the email verified screens to match the mocks.
2014-02-13 15:58:32 -08:00
Zach Carter 37ab84d217 Merge pull request #534 from mozilla/template_email_fix
fix issue with email interpolation in templates
2014-02-13 13:57:50 -08:00
Zachary Carter b1a55df7d4 fix issue with email interpolation in templates 2014-02-13 13:40:58 -08:00
Peter deHaan 2debb2250f Excluding the patched in fxa-auth-server files 2014-02-13 08:50:23 -08:00
Shane Tomlinson 15b3052c77 Merge pull request #522 from pdehaan/issue-513
adding styling to the h3 tag in a header so it uses the correct font-fam...

Got the all good from @johngruen and @ryanfeeley!
2014-02-13 16:31:53 +00:00
Shane Tomlinson a4a6a714ad Update the email verified screens to match the mocks.
* Move translation.js->interpolate into strings.js so it can be reused.
* Update the templates to match the mocks.
* Linkify the service name if redirectTo is available.

fixes #455
fixes #502
2014-02-13 10:28:01 +00:00
Zach Carter fd6f309ec0 Merge pull request #514 from mozilla/issue-488
Run `npm install --silent` to only show npm installation errors/compilation steps.
2014-02-12 23:16:42 -08:00
Peter deHaan bb5e6e6702 Adding missing copyright 2014-02-12 17:01:40 -08:00
Peter deHaan 507a073964 Lint all the JSON files 2014-02-12 16:53:34 -08:00
Peter deHaan c60a4e98e1 adding styling to the h3 tag in a header so it uses the correct font-family 2014-02-12 14:41:02 -08:00
Shane Tomlinson 1fc35b0f3d fix the spelling mistake 2014-02-12 21:59:29 +00:00
Shane Tomlinson 01ead87785 Run `npm install --silent` to only show npm installation errors/compilation steps
* fxa-auth-server is now a dependency in package.json and does not need a separate installation.

issue #488
2014-02-12 21:59:29 +00:00
Zach Carter b3e29437c3 install libgmp on travis 2014-02-12 13:33:16 -08:00
Zach Carter 332169c3d6 Merge pull request #510 from pdehaan/lint-take-2
retighten up the linting rules
2014-02-12 13:31:54 -08:00
Peter deHaan d5bbddce36 excluding the server directory from jscs 2014-02-12 13:09:09 -08:00
Zach Carter 1757948aa3 Merge pull request #520 from zaach/latest_js_client
update fxa-js-client
2014-02-12 10:53:56 -08:00
Zachary Carter 036e00d4bc update fxa-js-client 2014-02-12 10:29:44 -08:00
Peter deHaan 9c75a1bab5 ignore the fxa-auth-server dependency files 2014-02-12 10:01:02 -08:00
Peter deHaan 42fbf0750f Merge remote-tracking branch 'upstream/master' into lint-take-2 2014-02-12 09:55:08 -08:00
Nick Chapman 751a91ed7e Merge pull request #517 from mozilla/issue-516-failing-tests
Fix the intermittent failing front end tests.
2014-02-12 09:30:14 -08:00
Shane Tomlinson a9dacb74bf Fix the JSHint errors. 2014-02-12 16:03:07 +00:00
Shane Tomlinson 1d8389decb Merge pull request #483 from mozilla/move_email_templates
Move email templates into content server and create a route to serve them

When rebased and merged with #517, all tests pass everywhere, all the time. Code looks good to me, reads well, all my requests have either been made or answered appropriately.

Nice work @zaach!

r+
2014-02-12 15:43:34 +00:00
Shane Tomlinson 04d8322c50 Fix the intermittent failing front end tests.
The session tests attach a test "channel". "channel" cannot be cleared, and since Session is a singleton, the test channel never goes away. in fxa-clien.js->signIn, we attempt to send a message to a channel without a send function.

fixes #516
2014-02-12 15:20:33 +00:00