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

604 Коммитов

Автор SHA1 Сообщение Дата
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
Nick Chapman bda119b383 Merge pull request #413 from johngruen/design-changes
updated templates, a tiny bit of js but mostly CSS
2014-01-31 14:16:43 -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
Nick Chapman b845a1002b Merge pull request #416 from mozilla/fxa-js-client-1.9
update to fxa-js-client 1.9
2014-01-31 10:45:10 -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
Shane Tomlinson 990bc0ad3c update to fxa-js-client 1.9
Thanks @zaach and @vladikoff!
2014-01-31 17:01:36 +00: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 151d239b9e Merge pull request #400 from mozilla/issue-393-uglify-stuff
Uglify modernizr and requirejs
2014-01-30 14:15:44 -08:00
Nick Chapman 014d24aeb5 Merge pull request #396 from mostlygeek/master
fixes #395, update grunt-contrib-imagemin version to 0.5.0
2014-01-30 14:08:11 -08:00
Benson Wong 40b43c810c ref #395, fix some imagemin build issues with caching 2014-01-30 13:46:39 -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
Shane Tomlinson 0dd91c564c Uglify modernizr and requirejs
fixes #393
2014-01-30 20:07:01 +00: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 0746e71523 Merge pull request #394 from mozilla/issue391-focus-fix
use a recursive setTimeout instead of an interval for focus polling
2014-01-30 11:15:45 -08:00
Benson Wong c69d8dfe73 ref #395, update grunt-contrib-imagemin version to 0.5.0 2014-01-30 11:14:38 -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
Nick Chapman 0e89701989 Merge pull request #377 from mozilla/issue-363-no-save-password-for-sync
Issue 363 no save password for sync
2014-01-30 09:42:48 -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