Gavin Sharp
afbdf2585c
Bug 966134: merge warning dialog should mention new email, not old email, and we should avoid storing the plaintext of signed-in users forever, r=markh
...
--HG--
extra : rebase_source : cee71c3201ee6fffc477d2cced50e0df567a0976
2014-01-30 19:05:24 -08:00
Gavin Sharp
e437d43475
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
Chris Karlof
0fc62dc3fc
Bug 966131 - On first sync set firstSync pref to resetClient instead of calling resetClient directly. r=markh
2014-01-30 20:19:48 -08:00
Mark Hammond
ab6595d56f
Bug 966123 - have sync prefs listen for the onverified observer and update accordingly. t=ttaubert.
2014-01-30 20:07:49 -08:00
Tim Taubert
d1bf0905f5
Bug 963865 - [Australis] Fix browser_946320_tabs_from_other_computers.js to run with FxA enabled r=markh
2014-01-30 15:54:36 -08:00
Tim Taubert
7b84b52ad4
Bug 965641 - [Australis] prompt user to sign-in again UI in the menu panel r=markh
2014-01-29 19:06:50 -08:00
Tim Taubert
aa79e9da0a
Bug 964349 - Follow-up: use gCrashReporter instead of Services.appinfo r=bustage
2014-01-30 18:53:35 -08:00
Gavin Sharp
5d943a9cac
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
56235d724a
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
9c3c787f78
Backed out changeset 00cead8f21d4 (bug 965464, should have been bug 965474)
...
--HG--
extra : rebase_source : 43997ecb392c716aa147407985b6f823ac087db8
2014-01-30 19:08:08 -08:00
Wes Kocher
39881bb81f
[Australis] Backed out changeset 3d0775f7bd0f (bug 897496) for the same error it caused last time.
2014-01-30 19:09:08 -08:00
Mark Hammond
26d5aedfa8
Bug 965464 - allow for an initial sync on new user signin. r=ckarlof
2014-01-30 19:02:46 -08:00
Blair McBride
70b754dd3e
Bug 958673 - [Australis] UITour: Style doorhanger menu for Australis Update Tour. r=MattN
2014-01-31 15:25:45 +13:00
Tim Taubert
ffa823ed32
Bug 965607 - [Australis] Show FxA doorhangers only for the most recent non-popup browser window r=markh
2014-01-30 11:15:46 -08:00
Michael Comella
f8a9288ffe
Bug 960135 - Security check 'Open in New Tab' urls. r=mfinkle,mgoodwin
2014-01-30 18:08:38 -08:00
Tim Taubert
9374d65e86
Backed out [Australis] changeset 7560f1dfaa97 (bug 965641)
2014-01-30 17:44:58 -08:00
Tim Taubert
04517e5abb
Backed out [Australis] changeset 1471e8762222 (bug 965607)
2014-01-30 17:44:56 -08:00
Tim Taubert
c3c0d37a99
Bug 936271 - Remove load event handling from SessionStore.jsm r=yoric
2014-01-27 08:56:00 -08:00
Tim Taubert
692ce0d425
Bug 936271 - Add tests to ensure we ignore dynamic history entries r=yoric
...
--HG--
rename : browser/components/sessionstore/test/browser_597315_a.html => browser/components/sessionstore/test/browser_frame_history_a.html
rename : browser/components/sessionstore/test/browser_597315_c.html => browser/components/sessionstore/test/browser_frame_history_c.html
rename : browser/components/sessionstore/test/browser_597315_c1.html => browser/components/sessionstore/test/browser_frame_history_c1.html
rename : browser/components/sessionstore/test/browser_597315_c2.html => browser/components/sessionstore/test/browser_frame_history_c2.html
2014-01-25 00:30:31 +01:00
Tim Taubert
61a58e47b0
Bug 936271 - Ignore dynamic session history entries r=yoric
2014-01-24 22:26:47 +01:00
Tim Taubert
e0d7d2f063
Bug 964349 - Move CrashReporter.annotateCrashReport() calls out of sessionstore r=gavin
2014-01-27 08:45:28 -08:00
Wes Kocher
861e46dbd7
Backed out changeset 066920d21e0e (bug 964349) for breaking browser-chrome tests
2014-01-30 17:35:36 -08:00
Wes Kocher
3157fcc217
Backed out changeset 81a3b56a4147 (bug 936271)
2014-01-30 17:34:58 -08:00
Wes Kocher
b4192d7207
Backed out changeset c5505e97155f (bug 936271)
...
--HG--
rename : browser/components/sessionstore/test/browser_frame_history_a.html => browser/components/sessionstore/test/browser_597315_a.html
rename : browser/components/sessionstore/test/browser_frame_history_c.html => browser/components/sessionstore/test/browser_597315_c.html
rename : browser/components/sessionstore/test/browser_frame_history_c1.html => browser/components/sessionstore/test/browser_597315_c1.html
rename : browser/components/sessionstore/test/browser_frame_history_c2.html => browser/components/sessionstore/test/browser_597315_c2.html
2014-01-30 17:34:55 -08:00
Wes Kocher
076272c22f
Backed out changeset 392c8cf7a623 (bug 936271)
2014-01-30 17:34:50 -08:00
Jared Wein
93bc576cd1
Bug 897496 - [Australis] Fade out and cut off third-to-nth line of toolbarbutton labels in menupane. r=Gijs ui-r=mmaslaney
2014-01-28 10:35:00 +00:00
Gijs Kruitbosch
ca03b6db29
Bug 940116 - part 3: update XUL buttons to have a dynamic tooltip that includes a shortcut (Australis), r=jaws
2014-01-31 00:16:05 +00:00
Tim Taubert
be768e4e7c
Bug 936271 - Remove load event handling from SessionStore.jsm r=yoric
2014-01-27 08:56:00 -08:00
Tim Taubert
0aff6fc12f
Bug 936271 - Add tests to ensure we ignore dynamic history entries r=yoric
...
--HG--
rename : browser/components/sessionstore/test/browser_597315_a.html => browser/components/sessionstore/test/browser_frame_history_a.html
rename : browser/components/sessionstore/test/browser_597315_c.html => browser/components/sessionstore/test/browser_frame_history_c.html
rename : browser/components/sessionstore/test/browser_597315_c1.html => browser/components/sessionstore/test/browser_frame_history_c1.html
rename : browser/components/sessionstore/test/browser_597315_c2.html => browser/components/sessionstore/test/browser_frame_history_c2.html
2014-01-25 00:30:31 +01:00
Tim Taubert
30b2f5b3ba
Bug 936271 - Ignore dynamic session history entries r=yoric
2014-01-24 22:26:47 +01:00
Tim Taubert
5cc244f13b
Bug 964349 - Move CrashReporter.annotateCrashReport() calls out of sessionstore r=gavin
2014-01-27 08:45:28 -08:00
Tim Taubert
89d5527898
Bug 965607 - [Australis] Show FxA doorhangers only for the most recent non-popup browser window r=markh
2014-01-30 11:15:46 -08:00
Tim Taubert
c10f8b0ad0
Bug 965641 - [Australis] prompt user to sign-in again UI in the menu panel r=markh
2014-01-29 19:06:50 -08:00
Chris Karlof
34a6bff150
Bug 960887 - Handle storage endpoints returned by 1.5 token server. r=rnewman
...
--HG--
extra : rebase_source : a78f079a22f4e196de21b7b15d63ecdc4d475a04
2014-01-29 19:26:01 -08:00
Gavin Sharp
a2ff16b5b8
Remove comment reference to fix-buildconfig, which was made unused in revision ec95c1d93af0 and removed in revision e9f39220b8e7 (no bug)
...
--HG--
extra : rebase_source : ae2d0597c39890596f1275386f1e0bcb51cd3ff1
2014-01-30 11:53:24 -08:00
Mark Hammond
f080b05c6a
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
Wes Kocher
a308f2af69
[Australis] Backed out changeset a6ac946ef4fe (bug 897496) for m-bc bustage to fix a CLOSED TREE
2014-01-30 13:59:35 -08:00
Victor Porof
7a37f8c656
Bug 965821 - Unfocused black-boxed sources have a transparent label. r=bgrins
2014-01-30 18:44:14 +02:00
Victor Porof
b4e7a4ec5b
Bug 965814 - Make the shader editor look good on the light theme. r=bgrins
2014-01-30 21:25:51 +02:00
Ryan VanderMeulen
36edb17218
Merge m-c to fx-team.
2014-01-30 16:40:31 -05:00
Ryan VanderMeulen
997a649ab0
Merge b2g-inbound to m-c.
2014-01-30 16:32:42 -05:00
Ryan VanderMeulen
23aef59aa2
Merge fx-team to m-c.
2014-01-30 16:23:01 -05:00
B2G Bumper Bot
877bf15a21
Bumping manifests a=b2g-bump
2014-01-30 11:36:11 -08:00
B2G Bumper Bot
8056ade289
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/7240a5ab28ef
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #15821 from jrburke/bug905940-email-text-font
Bug 905940 - [Buri][Email] E-mail app compose UI uses a non-monospace font r=asuth
========
https://hg.mozilla.org/integration/gaia-central/rev/afe8d1498d6a
Author: jrburke <jrburke@gmail.com>
Desc: Bug 905940 - [Buri][Email] E-mail app compose UI uses a non-monospace font
========
https://hg.mozilla.org/integration/gaia-central/rev/75c179f3b6ce
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #15824 from jrburke/bug964530-email-unselectable-folder
Bug 964530 - [B2G][Email] non-folders are selectable r=asuth
========
https://hg.mozilla.org/integration/gaia-central/rev/7097d02a44b6
Author: jrburke <jrburke@gmail.com>
Desc: Bug 964530 - [B2G][Email] non-folders are selectable
2014-01-30 11:30:11 -08:00
B2G Bumper Bot
6a1e535a4e
Bumping manifests a=b2g-bump
2014-01-30 10:21:08 -08:00
B2G Bumper Bot
ba204f3fcb
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/95c85e15e8ba
Author: Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
Desc: Merge pull request #15654 from jaoo/962453
Bug 962453 - [DSDS] Once visit APN setting of one SIM, same APN of another SIM will be changed to "Custom". r=arthurcc
========
https://hg.mozilla.org/integration/gaia-central/rev/32dae85bf414
Author: Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
Desc: Bug 962453 - [DSDS] Once visit APN setting of one SIM, same APN of another SIM will be changed to Custom
2014-01-30 10:15:13 -08:00
B2G Bumper Bot
daeb295006
Bumping manifests a=b2g-bump
2014-01-30 09:57:47 -08:00
B2G Bumper Bot
1c9edb399f
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/1a92a507a2b0
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #15839 from jaoo/964216-followup
Bug 964216 - follow-up: fix getEnv issue r=julien
========
https://hg.mozilla.org/integration/gaia-central/rev/025501f1bc5f
Author: Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
Desc: Bug 964216 - follow-up: fix getEnv issue
2014-01-30 09:57:38 -08:00
Ryan VanderMeulen
72f02a1423
Backed out changeset 93d6dfcc20e7 (bug 958666) for B2G reftest failures.
2014-01-30 12:53:33 -05:00
Sola Ogunsakin
9b73303b7f
Bug 965070 - Add GRID constant to Home.jsm. r=lucasr
2014-01-30 09:51:32 -08:00