Carsten "Tomcat" Book
f1a2c94d74
merge fx-team to mozilla-central
2014-01-31 12:52:17 +01:00
Carsten "Tomcat" Book
c2edd2f424
merge mozilla-inbound to mozilla-central
2014-01-31 12:47:14 +01:00
Richard Newman
a8d1e0fc12
Merge m-c to s-c.
2014-01-30 20:28:12 -08:00
Dagger
e1b5ca4be3
Bug 963937 - Add a pref to disable automatic bracket closing in source editor. r=anton
2014-01-30 20:21:00 -08:00
Matthew Noorenberghe
17bcbf3ddb
Bug 958679 - UITour: Add the Accounts button within the Australis menu panel to the list of targets. r=Unfocused
2014-01-30 22:25:00 -08:00
Stephen Horlander
2cb35695c9
Bug 932235 - [Australis] New "Email Link" Icon. r=jaws
2014-01-31 00:37:33 -05:00
Mark Hammond
b867c97dfe
Bug 966159 - Fix TypeError when trying to unlink account. r=ckarlof
2014-01-30 21:05:23 -08:00
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
Nick Alexander
f9eccb0677
Bug 962126 - Strip debug logging and PII leaks from Android Firefox Accounts. r=rnewman
2014-01-30 18:00:29 -08:00
Nick Alexander
99a55b27d5
Bug 964795 - Update Accept-Language header to be spec-compliant. r=rnewman
2014-01-30 17:59:58 -08:00
Nick Alexander
a6fc1189b0
Bug 965867 - Update final URLs for Android Firefox Accounts landing. r=rnewman
2014-01-30 17:59:30 -08:00
Nick Alexander
c07cdccfb4
Bug 965366 - Make Firefox Account's StatusActivity checkboxes live. r=rnewman
2014-01-30 17:58:56 -08:00
Nick Alexander
cbe3deed81
Bug 965367 - Implement "Choose what to sync" check box. r=rnewman
2014-01-30 17:58:01 -08:00
Richard Newman
694d6e0850
Bug 966110 - Add formatS3 format string. r=trivial
2014-01-30 17:29:13 -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
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
Richard Newman
a7c2340127
Bug 963448 - Add '1.5' to Sync client record protocol list. r=trivial
2014-01-30 11:58:22 -08: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
Gijs Kruitbosch
55bfe4ce4a
Bug 948213 - fix recently closed tabs not closing panel in Australis panel subview, r=jaws
...
--HG--
extra : rebase_source : 37915c9f0afe0fbcaa7748f14c39d970f25ee0c8
2014-01-30 16:54:13 +00:00
Gijs Kruitbosch
a734a4bcf0
Bug 928843 - start polishing the Australis history view by improving labels, r=jaws
...
--HG--
extra : rebase_source : 9ad68a9fc7a576168c2e179167b885c77efda2df
2014-01-30 16:53:14 +00:00
B2G Bumper Bot
889d76ad2b
Bumping manifests a=b2g-bump
2014-01-30 08:51:01 -08:00
Neil Deakin
45b899f53b
Bug 941051, use one pixel sized instead of zero pixel sized anchor rectangles to prevent it from being treated as empty during intersection with screen test, fixes arrow panel placement issues, r=neil
2014-01-30 11:48:09 -05:00
B2G Bumper Bot
27f450b1d8
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/888d0e718e08
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Merge pull request #15835 from comoyo/build-keyboard
Bug 964216 - Use build_stage to build keyboard app. r=janjongboom
========
https://hg.mozilla.org/integration/gaia-central/rev/b77ac420c125
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 964216 - Use build_stage to build keyboard app
2014-01-30 08:45:13 -08:00
Gijs Kruitbosch
1bad5627f5
Bug 965602 - dragexit should always reset dragoveritem in Australis' customize mode, r=mikedeboer
...
--HG--
extra : rebase_source : 4dafeae0c81076a11703466af76c23248477a09a
2014-01-30 16:30:52 +00:00
Patrick Brosset
742d8c2b57
Bug 964014 - Adds copy-image-data-uri option to images in the markup-view, r=harth
2014-01-30 17:33:53 +01:00
Nick Alexander
849e81adfe
Bug 963667 - Use production Firefox Accounts endpoints in Fennec. r=rnewman
2014-01-29 20:04:27 -08:00
Nick Alexander
0b4c331201
Merge m-c to s-c
2014-01-29 20:01:11 -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
Richard Newman
355a33257c
Bug 959915 - Adapt FxA token server client to include X-Client-State header. r=nalexander
2014-01-29 17:08:39 -08:00