Ed Morley
bf7e2c6121
Merge mozilla-central and fx-team
2014-03-07 15:54:49 +00:00
Mark Hammond
12eb0933da
Bug 969528 - only show the 'login needed' UI state when in a LOGIN_FAILED_LOGIN_REJECTED state. r=ttaubert
2014-03-07 15:41:33 +11:00
Steven MacLeod
c087494bc6
Bug 971778 - Remove the richlistbox from the sync datatype selection in preferences. r=ttaubert
2014-03-03 16:55:34 -05:00
Steven MacLeod
1499a2612e
Bug 971765 - Reorder Sync datatype options to match marketing. r=ttaubert
2014-03-02 20:57:47 -05:00
Mahdi Dibaiee
467f1d7b4d
Bug 767047 - Don't overwrite existing proxy backup preferences; r=MattN
...
--HG--
rename : browser/components/preferences/in-content/tests/browser_connection.js => browser/components/preferences/in-content/tests/browser_proxy_backup.js
2014-02-26 11:06:00 -05:00
Matthew Noorenberghe
18a868fab0
No bug - Cleanup browser_connection.js so it's a better example for related tests. r=me
2014-03-01 16:19:57 -05:00
Marco Bonardo
963f31df2d
Bug 971283 - Preferences links to Terms of Service and Privacy Notice are too high and and too large. r=ttaubert
2014-02-28 11:07:14 +01:00
Marco Bonardo
dd0aed7be9
Bug 965032 - Fix layout of Sync preferences in signed-out state. r=ttaubert
2014-02-27 21:37:19 +01:00
Ted Mielczarek
699d90bdae
bug 968403 - Switch some tests to not use preprocessing. r=jmaher
2014-02-19 09:20:49 -05:00
Mark Hammond
ae0dc3da66
Bug 975894 - sync prefs listens for weave:service:start-over:finish instead of weave:service:start-over. r=ttaubert.
2014-02-27 10:43:31 +11:00
Ryan VanderMeulen
917a319f58
Merge m-c to inbound.
2014-02-25 15:28:35 -05:00
Nikhil Johny
5478f1dbcd
Bug 283754 - Awkward phrasing in language selection dialog - "in order of preference" used twice. r=dao
2014-02-25 08:18:56 -05:00
Florian Quèze
b4f865560b
Bug 804611 - Add a way to grant/deny getUserMedia permissions persistently, r=jesup,dolske, ui-r=Boriss.
2014-02-25 12:50:42 +01:00
Marco Bonardo
a9d97aeb1e
Bug 971713 - Device name field in Preferences should be inline. r=ttaubert
2014-02-25 11:17:04 +01:00
Tim Taubert
7e8a253b98
Bug 966124 - focusing the "Manage" link in Sync preferences produces a weird huge focus outline r=markh
2014-02-20 16:59:16 +01:00
Ted Mielczarek
be7cc08ee9
Bug 974368 - Fix ! operator precedence in manifestparser's expression parser. r=jmaher
2014-02-19 09:18:13 -05:00
Ted Mielczarek
d9fcae3d66
Bug 972510 - Move some healthreport tests to manifests (and re-enable them and a few others). r=gps
2014-02-19 08:47:35 -05:00
Ryan VanderMeulen
6bcf42d1bf
Merge inbound to m-c.
2014-02-18 15:18:19 -05:00
Manish Goregaokar
8ae96543e5
Bug 910670 - Preference for proxy autologin. r=adw
2014-02-18 09:20:24 -05:00
Tim Taubert
4768f19be3
Bug 966124 - focusing the "Manage" link in Sync preferences produces a weird huge focus outline r=markh
2014-02-18 12:16:44 +01:00
Tim Taubert
0f98e74c72
Bug 967197 - "Create Account" and "Sign In" links in Sync preferences should go to separate pages r=markh
2014-02-18 12:05:13 +01:00
Honza Bambas
3dccf0de8b
Bug 968606 - Update in-content/advanced.js to use HTTP cache v2 API, r=bbondy
2014-02-14 20:27:32 +01:00
Ehsan Akhgari
0871976be5
Bug 973658 - Actually revert the value of the Permanent Private Browsing pref when the user presses Cancel in response to the restart dialog; r=jdm
...
Before we were implicitly relying on the pref being reverted through
the checkbox, but that won't happen if the checkbox was never clicked
by the user.
2014-02-18 08:49:39 -05:00
Ehsan Akhgari
b870bb3fe9
Bug 969757 - Remove the dead code in our tree which pretends to support OS/2; r=roc,mcmanus,gps,jorendorf,bsmedberg sr=bsmedberg
2014-02-10 17:57:01 -05:00
Manish Goregaokar
af79dbf890
Bug 665319 - Add a checkbox to activate network.proxy.socks_remote_dns. r=ttaubert, ui-r=philipp
2014-02-08 21:01:27 -05:00
Tim Taubert
ae7a4fe4bf
Bug 967479 - Use oncommand attribute to handle button clicks in sync prefpane r=markh
2014-02-06 03:54:41 +01:00
Phil Ringnalda
f95558444a
Back out e78a7c6d9601 (bug 965896) for xpcshell orange
2014-02-04 21:19:19 -08:00
Mark Hammond
8858a7121a
Bug 965896 - allow a legacy sync reset to re-enable fxa accounts. r=rnewman
2014-02-05 14:59:19 +11:00
Gavin Sharp
21a0f176ab
Bug 965113: remove reference to "Firefox Accounts" in sync settings, r=markh
2014-02-02 20:27:26 -08:00
Zachary Carter
920a69f870
Bug 965117 - Custom fonts on about:accounts and other visual/string tweaks. r=ttaubert
2014-01-31 16:50:55 -08:00
Gavin Sharp
970320af84
Bug 966511: Tweak Sync UI, r=ttaubert
...
Changes:
- rename browser-fxaccounts.js "toggle" to onMenuPanelCommand
- rename openSignInPage->openSignInAgainPage and change it to point to about:accounts?signin=true
- introduce openAccountsPage and change the menu panel "signed in"'s UI to call it
- remove period at the end of "Firefox is now syncing" in the success doorhanger
- rename syncErrorPanel.title->syncErrorPanel.heading for consistency
- remove the "Preferences" button from the "you need to sign in again" doorhanger
- "manage"->"change" in the "What would you like to Sync" dialog
- change "Unlink Browser" to "Disconnect", in both the prefs button and confirmation dialog title
- adjust string in the "Disconnect" confirmation dialog
- change "Device"->"computer" in the relink verification dialog
- fix success panel heading styling (should be bold)
--HG--
extra : rebase_source : 358c93e1123e11200523b96d97ecd25421edaca4
2014-01-31 17:20:21 -08:00
Mark Hammond
bf712b98a7
Bug 966520 - have sync prefs pane open the new "force sign in" page. r=gavin
2014-01-31 17:27:59 -08:00
Gavin Sharp
e718eb93f6
Bug 966150: adjust wording/layout of new-sync preferences pane, r=ttaubert
...
--HG--
extra : rebase_source : 2736e75660a0def3561070f8f5e4d50f9de1e5cf
2014-01-30 20:37:43 -08:00
Mark Hammond
297d793733
Bug 966123 - have sync prefs listen for the onverified observer and update accordingly. t=ttaubert.
2014-01-30 20:07:49 -08:00
Gavin Sharp
f1c97cd33a
Bug 966122: fix typo that led to "Verify" button missing its label, r=markh
...
--HG--
extra : rebase_source : bf0b6d1117cc246d9990a197457063e1e81ce164
2014-01-30 17:59:39 -08:00
Mark Hammond
98d4c9b8e8
Bug 965474 - allow for an initial sync on new user signin. r=ckarlof
...
--HG--
extra : rebase_source : f5fd22db384606112900b2caef11cc7bdc262f98
2014-01-30 19:02:46 -08:00
Gavin Sharp
9380c7d80a
Backed out changeset 00cead8f21d4 (bug 965464, should have been bug 965474)
...
--HG--
extra : rebase_source : 43997ecb392c716aa147407985b6f823ac087db8
2014-01-30 19:08:08 -08:00
Mark Hammond
9a83695045
Bug 965464 - allow for an initial sync on new user signin. r=ckarlof
2014-01-30 19:02:46 -08:00
Mark Hammond
8a50b148fc
Bug 965461 - ensure sync itself and sync prefs pane considers we are logged in after key fetch. r=ttaubert
2014-01-30 14:50:31 -08:00
Carsten "Tomcat" Book
bddabadbe2
Backed out changeset 2b4f723f6c60 (bug 965461) for XPC Bustage on a CLOSED TREE
2014-01-30 10:39:40 +01:00
Mark Hammond
701d4b0045
Bug 965461 - ensure sync itself and sync prefs pane considers we are logged in after key fetch. r=ttaubert
2014-01-30 00:22:55 -08:00
Wes Kocher
9f96220b89
Backed out changeset 2bfa24370b7c (bug 965461)
2014-01-29 21:04:08 -08:00
Mark Hammond
b107d4328f
Bug 965461 - ensure sync itself and sync prefs pane considers we are logged in after key fetch. r=ttaubert
2014-01-29 19:26:01 -08:00
Mark Hammond
e595dddc14
Bug 958927 - XUL dialogs for sync unlink and relink confirmation dialogs. r=gavin
...
Conflicts:
browser/base/content/aboutaccounts/aboutaccounts.js
--HG--
extra : rebase_source : 2c81fe29d3b85eb8174b988cbaff516e71c39358
2014-01-28 20:43:01 -08:00
Mark Hammond
c428a82013
Bug 957426 - Update Sync Options for Firefox Accounts. r=rnewman
2014-01-28 17:51:09 -08:00
ytx
17588a9c93
Bug 956151 - Remove the perm attribute in permissions.js. r=dao
2014-01-03 09:32:57 -05:00
Henri Sivonen
2fabf9a684
Bug 213517 part 2 - Remove the x-user-def language group. r=jfkthame.
2014-01-02 09:18:20 +02:00
Mark Hammond
96724917cd
Have the sync setup dialog do the right thing if identity.fxaccounts.enabled=true
2013-12-19 16:38:35 +11:00
Tim Taubert
e84978acf6
Bug 951857 - Bring back UI entry points and the setup dialog for old sync r=markh
...
From 046c19dae155a175cf6fa5e480f1fa1882f7d51f Mon Sep 17 00:00:00 2001
2013-12-18 23:10:11 +01:00
Tim Taubert
f96735c7a9
merge m-c to elm
2013-12-18 17:54:23 +01:00