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

737 Коммитов

Автор SHA1 Сообщение Дата
Zach Carter 5d469b702a Merge pull request #594 from mozilla/issue-496-changelog
feat(build): Add a `grunt version` task to stamp a new version.
2014-02-24 18:10:27 -08:00
Peter deHaan f7e5373c50 fix(styles): Removing unneeded vendor prefixes 2014-02-24 18:05:40 -08:00
Zachary Carter f15ba38272 refactor(config): change default language to en-US rather than en 2014-02-24 17:36:18 -08:00
Zach Carter 6fa12e158d Merge pull request #604 from pdehaan/issue-599
fix(style): Fixing duplicated selector in main.scss
2014-02-24 15:55:18 -08:00
Zach Carter d2c5462942 Merge pull request #595 from mozilla/issue-561-real-uid
fix(test) - use a real uid/code when verifying emails in complete_sign_up.js test
2014-02-24 15:41:38 -08:00
Zach Carter 39f0ff570c Merge pull request #592 from pdehaan/po-lint
feat(polint): Lint the i18n .po files
2014-02-24 15:26:28 -08:00
Zach Carter c63e1ca243 Merge pull request #589 from mozilla/issue-554-four-oh-four-style
feat: Add a styled 404 page, rendered and translated on the back end.
2014-02-24 15:24:17 -08:00
Zachary Carter 39bbe87867 refactor(i18n): use dependency injection to pass i18n instance around 2014-02-24 15:05:32 -08:00
Peter deHaan c23f9f9e22 fix(style): Fiding duplicated selector in main.scss 2014-02-24 14:49:55 -08:00
Shane Tomlinson cc2a024bfb feat: Add a styled 404 page, rendered on the back end.
* Add consolidate middleware to handle the interface between express and handlebars
* Add a middleware to respond to 404s
* Add a branch to the 't' handlebars helper to deal with 't' when invoked in templates written using res.render
* Update grunt tasks to manage dist mode server rendered templates.

BREAKING CHANGE:
The production configuration script must add a new option to its config :
```
   page_template_subdirectory: 'dist'
```

issue #554

.
2014-02-24 14:45:35 -08:00
Shane Tomlinson a8d98a4227 Merge pull request #602 from mozilla/issue-596-margin-fix
moved entire form up the page slightly, reduced logo size

beautiful. r+ thanks @johngruen!
2014-02-24 15:31:53 +00:00
johngruen 515556cd25 moved entire form up the page slightly, reduced logo size 2014-02-24 09:36:00 -05:00
Shane Tomlinson aaa6e9d8ec feat(build): Add a `grunt version` task to stamp a new version.
* Adds grunt-version and grunt-conventional-changelog dependencies.
* Updates the version number in package.json
* Updates CHANGELOG.md
* Creates a tag.
* Commits everything.

Closes #496
2014-02-24 11:10:54 +00:00
Peter deHaan 4379f3b527 lint all the files! 2014-02-21 12:50:08 -08:00
Zach Carter be1dd6ec7b Merge pull request #597 from pdehaan/issue-559
style(scss): removed resolved TODO, tweaked some css formatting
2014-02-21 10:53:00 -08:00
Peter deHaan 421314f577 style(scss): removing resolved TODO, tweaked some css formatting 2014-02-21 10:19:15 -08:00
Shane Tomlinson fdd6362eca fix(test) - use a real uid/code when verifying emails in complete_sign_up.js test
fixes #561
2014-02-21 13:35:17 +00:00
Shane Tomlinson c47c37c2f0 Merge pull request #584 from mozilla/fix-json-strings-filename
Fix the file names for locale strings

This looks great, thanks @zaach!
2014-02-21 10:29:10 +00:00
Zach Carter eb6e926e65 Merge pull request #590 from mozilla/tiny-screen-ui
Tiny screen ui
2014-02-20 17:05:58 -08:00
johngruen d821a13b52 sizing tweaks to small screen media queries 2014-02-20 15:16:52 -05:00
johngruen 3d0b4b9407 first pass on tiny screen media query 2014-02-20 15:13:25 -05:00
Zachary Carter 68476d4a2a remove duplicate config entries 2014-02-20 11:37:44 -08:00
Zach Carter 87ae33559c Merge pull request #574 from mozilla/issue-392-legal
Add a route for `/legal`
2014-02-20 11:07:35 -08:00
Shane Tomlinson 945b7ce924 Merge pull request #579 from mozilla/issue-576-merge-po-files
merge po files

@zaach, this looks really good. The string extraction works well, manual testing added new string to the .po files in each subdirectory, and the directions are clear.

My last concern is the diff size every time strings are extracted because of changing line numbers.

r+
2014-02-20 12:27:53 +00:00
Shane Tomlinson 065ab83c5f fix: keyframe animations should go to 360 degrees, not 365 2014-02-20 11:58:04 +00:00
Peter deHaan 62d83fcbb7 Sass-ification, lets try this again...
* Note by shane-tomlinson, this based on 6a739d5, ab9f627, rebased from master(46f3d50), and squashed.
2014-02-20 11:58:04 +00:00
Shane Tomlinson 5ac5887fb6 Add a route for `/legal` 2014-02-20 11:34:05 +00:00
Shane Tomlinson 11348c2807 Merge pull request #585 from pdehaan/issue-564
Moving ids to h2s

This gets a stamp of approval.

r+

Thanks @pdehaan!
2014-02-20 11:24:26 +00:00
Zach Carter 46f3d50d6a Merge pull request #578 from mozilla/issue-485-anchor-focus
fix: show the focus ring on anchors
2014-02-19 18:19:13 -08:00
Zachary Carter e91b4ac4b9 new po merge grunttask and README for locales 2014-02-19 17:07:21 -08:00
Peter deHaan 9cba7d5d82 Moving ids to h2s 2014-02-19 16:52:06 -08:00
Zachary Carter cd26c5b057 Fix the file names for locale strings
Two things:
 - The grunt script was checking for the wrong .po name, and thus wasn't generating
messages.json.
 - i18n-abide module use on the server is hardcoded to look for messages.json,
   rather than server.json.

So, convert server.po to messages.json and change the client code to look for
client.json instead.
2014-02-19 16:32:06 -08:00
Zach Carter 66f5a36cad Merge pull request #582 from mozilla/issue-581-remove-grunt-contrib-connect
fix: remove grunt-contrib-connect dependency.
2014-02-19 14:54:00 -08:00
Shane Tomlinson 77d913933a fix: remove grunt-contrib-connect dependency.
fixes #581
2014-02-19 21:46:54 +00:00
Shane Tomlinson f469462785 fix: show the focus ring on anchors
fixes #485
2014-02-19 21:27:46 +00:00
Zachary Carter 31b681dd59 update locales with the latest strings 2014-02-19 13:20:32 -08:00
Zachary Carter fbf6cb527a add po merge script 2014-02-19 13:19:33 -08:00
Zach Carter 4430f0af07 Merge pull request #571 from mozilla/issue-492-password-hint-flicker
Fix the password hint flicker on mouse down.
2014-02-19 12:12:09 -08:00
Zach Carter b985f20e78 Merge pull request #573 from mozilla/issue-572-submit-coppa
Fix: Allow user to submit /signup form using enter key when COPPA year is focused.
2014-02-19 12:04:24 -08:00
Shane Tomlinson f169d67fd0 Fix: Allow user to submit /signup form using enter key when COPPA year is focused.
fixes #572
2014-02-19 15:34:24 +00:00
Shane Tomlinson fcd97d2857 Fix the password hint flicker on mouse down.
fixes #492
2014-02-19 15:10:10 +00:00
Shane Tomlinson 0b2fbaf493 Merge branch 'email-updates-squashed' 2014-02-19 14:49:31 +00:00
johngruen c6e6e32c84 updated email templates to match mocks
* note from shane-tomlinson - This is a squashed rebase of johngruen's work across several commits, minus style changes to main.css and the templates.

(cherry picked from commit 5bcb582973)
(cherry picked from commit d9901a26bd)
(cherry picked from commit 1f0e0e780b)
(cherry picked from commit af101caa95)
2014-02-19 14:48:28 +00:00
Zach Carter 4ce94cdbca Merge pull request #563 from pdehaan/grunt-todo
Filing all the TODOs as issues
2014-02-18 18:01:48 -08:00
Zach Carter bcd543fef3 Merge pull request #551 from mozilla/issue-322-four-oh-four
Whitelist front end pages that can be viewed
2014-02-18 17:59:34 -08:00
Nick Chapman f284d0e13e Merge pull request #567 from mozilla/issue-566-fix-session_status-redirect
do not redirect when the route includes a specific page - fixes #566
2014-02-18 15:05:12 -08:00
Zachary Carter ed95ca3782 do not redirect when the route includes a specific page - fixes #566 2014-02-18 14:44:06 -08:00
Zach Carter 54cb34d223 Merge pull request #553 from mozilla/issue-412-error-message-interpolate
Issue 412 error message interpolate
2014-02-18 11:52:31 -08:00
Zach Carter 7ad6242f0d Merge pull request #542 from mozilla/issue-182-sign-in-messages
Better signin/signup error messages!
2014-02-18 11:46:06 -08:00
Peter deHaan e07eb15715 Filing all the TODOs as issues 2014-02-18 10:57:46 -08:00