Commit Graph

339192 Commits

Author SHA1 Message Date
Jared Wein
93625903d2 Bug 940052 - [Australis] Customize tab gets truncated after entering customization mode. r=mconley 2013-12-21 01:17:02 -05:00
Wes Kocher
4bde56e7b6 Merge m-c to fx-team 2013-12-20 19:02:25 -08:00
Wes Kocher
207a21dbe8 Merge m-c to inbound 2013-12-20 19:00:45 -08:00
Wes Kocher
53c4b1ac6a Merge inbound to m-c 2013-12-20 18:42:04 -08:00
Wes Kocher
84b5646ffb Backed out changeset df0855f26e4d (bug 949642) for introducing a new intermittent failure 2013-12-20 18:33:55 -08:00
Wes Kocher
900bc805d5 Backed out changeset 6532bf066bb4 (bug 882299) 2013-12-20 18:33:04 -08:00
Wes Kocher
2f2426fd1c Backed out changeset 9ca7e64ef0d0 (bug 921484) 2013-12-20 18:32:44 -08:00
Wes Kocher
7f84d88bf6 Backed out changeset 00aa14a1f461 (bug 950830) 2013-12-20 18:32:20 -08:00
Wes Kocher
dd72dd2a82 Merge fx-team to m-c 2013-12-20 18:28:28 -08:00
Wes Kocher
971cbb78c9 Merge b2g-inbound to m-c 2013-12-20 18:02:21 -08:00
Steve Fink
9994fec4ef No bug. Hold the line at 3 hazards! r=terrence 2013-12-20 18:00:51 -08:00
Steve Fink
a710319696 Backed out changeset f71e6905567f (bug 952688)
--HG--
extra : rebase_source : 8d66cb74d228fd4e34c72afab98132bf1d2ba549
2013-12-20 16:46:31 -08:00
Tim Taubert
053154b8a5 merge elm to m-c IGNORE BAD COMMIT MESSAGES 2013-12-21 01:36:09 +01:00
Tim Taubert
2632b0d5f5 merge m-c to elm 2013-12-21 01:28:08 +01:00
Olli Pettay
e979b883fc Bug 949722 - Assigning to '.onerror' of XHR appends an event listener, rather than overwriting it (only in workers), r=khuey 2013-12-21 02:22:13 +02:00
Steve Fink
abb96de92a Bug 952688 - Root CallbackObject's CallSetup around GlobalScope() call, r=terrence 2013-12-20 16:07:00 -08:00
Steve Fink
6fd0c4d072 Bug 952682 - New hazards in storage code, r=terrence 2013-12-20 15:58:36 -08:00
Daniel Holbert
1bdeb67c5f Bug 946835 part 7: Add vertical variants of existing reftests for checking the baseline of a multi-line flex container. (no review)
--HG--
rename : layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-line-horiz-1-ref.html => layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-line-vert-1-ref.html
rename : layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-line-horiz-1.html => layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-line-vert-1.html
rename : layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-line-horiz-2-ref.html => layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-line-vert-2-ref.html
rename : layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-line-horiz-2.html => layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-line-vert-2.html
2013-12-20 15:07:58 -08:00
Daniel Holbert
c07d47e936 Bug 946835 part 6: In reftests flexbox-baseline-multi-line-horiz-*, increase some sizes from 18px (arbitrary) to 20px (half the container width) to make upcoming vertical variants simpler. (no review) 2013-12-20 15:07:56 -08:00
Gaia Pushbot
f6b401af9c Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f7a78194ae8e
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 951339 - [Messages][Drafts] Existing thread drafts not properly populated when a new message is sent to that same recipient r=julienw

https://bugzilla.mozilla.org/show_bug.cgi?id=951339
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

========

https://hg.mozilla.org/integration/gaia-central/rev/25b217bf4c6f
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 952225 - [Messages][Drafts] Support subject line in message drafts r=julienw

https://bugzilla.mozilla.org/show_bug.cgi?id=952225
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
2013-12-20 15:05:27 -08:00
Rodrigo Silveira
6d8f46acb7 Bug 883930 - The soft keyboard should not be able to obscure input in dialogs r=mbrubeck
--HG--
extra : rebase_source : 60975825fe841562729daafd7e8ec55d5b76e0b4
2013-12-20 15:01:23 -08:00
Sriram Ramasubramanian
23bd5a736d Bug 940997: Show submenu indicator for MenuItemActionBar. [r=mfinkle] 2013-12-20 14:51:53 -08:00
Gaia Pushbot
e73b7ab49e Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/fd425823b0bc
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #14909 from davidflanagan/bug951932

Bug 951932: don't allow pick from Music for ringtones r=dmarcos

========

https://hg.mozilla.org/integration/gaia-central/rev/dd976f9b6deb
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 951932: don't allow pick from Music for ringtones
2013-12-20 14:50:25 -08:00
Jim Chen
b0775082df Bug 945521 - Make sure button text type is consistent with keyboard text type; r=mcomella 2013-12-20 17:48:59 -05:00
Wes Kocher
1221083b0e Revert the backout of bug 938023 (changesets 19fbd3fb0373:8146150d4df8) 2013-12-20 13:43:46 -08:00
Mark Finkle
b5ad221892 Bug 952473 - SessionStore should only watch for top-level pageshow events r=wesj 2013-12-20 16:41:11 -05:00
Gaia Pushbot
ddbcbb1b36 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/4cc1eb367c65
Author: Fabien Cazenave <fabien@cazenave.cc>
Desc: Merge pull request #14721 from dwilsoncaf/bug-950800

Bug 950800 - Add hardware composer setting, r=kaze

========

https://hg.mozilla.org/integration/gaia-central/rev/75c4248062fe
Author: Diego Wilson <dwilson@codeaurora.org>
Desc: Bug 950800 - Add hardware composer setting

Now you can toggle the hardware composer on/off at any point without
restarting B2G.
2013-12-20 13:20:50 -08:00
Gaia Pushbot
6557415bc9 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5b8b38c8dab9
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #13297 from gaye/bug-918303

Bug 918303 - Quick advance through emails

========

https://hg.mozilla.org/integration/gaia-central/rev/2f7e8abb7498
Author: Gareth Aye <gaye@mozilla.com>
Desc: Bug 918303 - Quick advance through emails
2013-12-20 13:20:26 -08:00
Boris Zbarsky
4a425922ba Bug 952062. Fix union codegen to properly destroy the union members if conversion to them fails. r=dzbarsky 2013-12-20 15:33:57 -05:00
Matt Brubeck
4a1fbf06b0 Bug 878935 followup - touch CLOBBER file to clean up bustage 2013-12-20 07:58:12 -08:00
Matt Brubeck
40c57cd5b3 Bug 952324 - Don't block native events for more than 50ms [r=jimm] 2013-12-20 07:51:13 -08:00
Tim Taubert
d041e15611 merge m-c to elm 2013-12-20 15:05:28 +01:00
Carsten "Tomcat" Book
8ba68170dd Backed out changeset 70befb4cf2f4 (bug 878935) for mochitest -4 and bc test failures 2013-12-20 12:42:54 +01:00
Carsten "Tomcat" Book
fdd77494b2 Backed out changeset b84baa03b9d1 (bug 868341) for mochitest -4 and bc testfailures 2013-12-20 12:42:16 +01:00
Tim Taubert
055be4025e Bug 952401 - Collect scroll and pageStyle data as soon as the frame tree is available r=smacleod
From 84ca4ca357b94a5dc9449627e88bb4e3cde69557 Mon Sep 17 00:00:00 2001
2013-12-20 11:13:49 +01:00
Carsten "Tomcat" Book
d59f4da0fb merge b2g-inbound to mozilla-central 2013-12-20 10:23:46 +01:00
Carsten "Tomcat" Book
76b3c9c6c0 merge fx-team to mozilla-central 2013-12-20 10:22:29 +01:00
Mark Hammond
d1658ac407 Bug 949695 tests followup - fix test_handleSyncError to reset error account so it passes when run twice 2013-12-20 15:57:26 +11:00
Mark Hammond
bd3b67b4ff Bug 949695 tests followup - convert more tests to run with both identity managers. 2013-12-20 15:57:26 +11:00
Mark Hammond
6d992cc467 Bug 949695 tests followup - convert test_service_wipeServer to identity_test infrastructure 2013-12-20 15:57:26 +11:00
Mark Hammond
d2933b41f3 Bug 949695 tests followup - Add ability to run tests twice - once with each identity manager - and have test_service_startOver use it. 2013-12-20 15:57:26 +11:00
Mark Hammond
a1683f8a40 Bug 949259 followup - refactor identity config for tests and remove need to pass params to BrowserIDManager. 2013-12-20 15:57:26 +11:00
Mark Hammond
ac310565e0 Bug 949695 followup - add resetCredentials/resetSyncKey to avoid BrowserID setters from being called. 2013-12-20 15:57:25 +11:00
Boris Zbarsky
3fa148f89a Bug 952073. Fix codegen to actually work correctly for the case of a nullable union dictionary member with no default value. r=dzbarsky
This fix just makes us take the normal Optional codepath for this case, since there is no weirdness here.
2013-12-19 23:30:38 -05:00
Cameron McCormack
fbaa80f98d Bug 952270 - Null check result of GetPathForLengthOrPositionMeasuring in nsSVGTextFrame2::GetTextPath. r=longsonr 2013-12-20 15:26:28 +11:00
Wes Kocher
04b251c4ba Merge m-c to b2g-inbound 2013-12-19 19:52:38 -08:00
Gaia Pushbot
15a0fdcdfd Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/6c2b33c8f522
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #14487 from cctuan/945553

Bug 945553 - Rewrite install-gaia.py to install-gaia.js

========

https://hg.mozilla.org/integration/gaia-central/rev/ffad73493158
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 945553 - Rewrite install-gaia.py to install-gaia.js
2013-12-19 19:51:24 -08:00
Wes Kocher
b27e63c236 Merge m-c to inbound 2013-12-19 19:51:23 -08:00
Wes Kocher
5893105125 Backed out changeset 4330724d9e05 (bug 940811) for breaking builds 2013-12-19 19:46:54 -08:00
Wes Kocher
3053bbf32b Backed out changeset 2e2c930a960c (bug 948269) for android 4.0 mochitest-2 permaorange 2013-12-19 19:24:42 -08:00