Wes Kocher
91089506cf
Merge changes
2014-03-03 20:35:08 -08:00
Wes Kocher
523a5e692f
Merge m-c to b2g-inbound
2014-03-03 20:34:02 -08:00
Timothy Nikkel
01722478f5
Bug 978248. If the scrollframe has gone away just use the scroll offset that the APZC controller had instead of (0,0). r=botond
2014-03-03 22:33:09 -06:00
Wes Kocher
8d4c76f215
Merge inbound to m-c
2014-03-03 20:25:51 -08:00
Wes Kocher
ba05da543b
Merge b2g-inbound to m-c
2014-03-03 20:23:17 -08:00
Wes Kocher
abec953a8d
Merge fx-team to m-c
2014-03-03 20:20:23 -08:00
Kyle Machulis
328c3823db
Bug 979088 - Add padding to pickling in ipc so valgrind doesn't complain; r=bent
2014-03-03 20:05:14 -08:00
Phil Ringnalda
6663fbaa8e
Merge m-c to b-i
2014-03-03 19:51:31 -08:00
B2G Bumper Bot
ef6923c633
Bumping manifests a=b2g-bump
2014-03-03 18:16:45 -08:00
B2G Bumper Bot
83111d1eab
Bumping gaia.json for 5 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/020bf0df084e
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Merge pull request #16755 from qdot/978364-fix-ftu-tests
978364 fix ftu tests
========
https://hg.mozilla.org/integration/gaia-central/rev/bb11e2a9fb86
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Bug 978364 - Move FTU Tests to correct filename scheme
========
https://hg.mozilla.org/integration/gaia-central/rev/20c00f5bf6c3
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Bug 978364 - Fix missing helper call in FTU integration tests
========
https://hg.mozilla.org/integration/gaia-central/rev/d021424e69bf
Author: Jan Keromnes <janx@linux.com>
Desc: Merge pull request #16748 from jankeromnes/target
Bug 978058 - Make Firefox OS' devtools track frames instead of manifests. r=21
========
https://hg.mozilla.org/integration/gaia-central/rev/ae27845e0f86
Author: Jan Keromnes <janx@linux.com>
Desc: Bug 978058 - Make Firefox OS' devtools track frames instead of app manifests. r=vingtetun
2014-03-03 18:15:28 -08:00
B2G Bumper Bot
4484496a54
Bumping manifests a=b2g-bump
2014-03-03 17:26:22 -08:00
B2G Bumper Bot
7c4f1a9c9f
Bumping manifests a=b2g-bump
2014-03-03 17:23:22 -08:00
B2G Bumper Bot
0244cee565
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/6bddd383012e
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #16582 from mcav/perfmark
Bug 837670 - [Clock] "ready to use" perf measurement. r=jugglinmike
========
https://hg.mozilla.org/integration/gaia-central/rev/687699b043d2
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 837670 - [Clock] "ready to use" perf measurement. r=jugglinmike
========
https://hg.mozilla.org/integration/gaia-central/rev/5b1b283beeb1
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #16630 from mcav/dumb-l10n-gmail
Bug 975654 - [B2G][l10n][Email] Disabling IMAP on a Gmail account expose...
========
https://hg.mozilla.org/integration/gaia-central/rev/c9f9392bd474
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 975654 - [B2G][l10n][Email] Disabling IMAP on a Gmail account exposes user to old UI which is globally not translated. r=asuth
2014-03-03 17:23:13 -08:00
Botond Ballo
1d03331bd2
Bug 978997 - Fix a regression caused by bug 959847 where the root layer sometimes doesn't get an APZC. r=tnikkel on a CLOSED TREE
...
Root scroll frames in display root documents don't get a scroll info layer from ScrollFrameHelper::BuildDisplayList, so we always need to call RecordFrameMetrics from nsDisplayList::PaintForFrame.
2014-03-03 19:57:28 -05:00
Ehsan Akhgari
9470e77473
Backed out changeset f32948046d7b (bug 978626) because this is not a clobber problem (on a CLOSED TREE)
2014-03-03 18:24:40 -05:00
Ehsan Akhgari
780631919e
Fix the merge conflict of bug 958596 and bug 978776
2014-03-03 18:24:04 -05:00
Ehsan Akhgari
c9aa332116
Update the CLOBBER file for bug 978626, landed on a CLOSED TREE
2014-03-03 17:56:12 -05:00
B2G Bumper Bot
eeba1e308c
Bumping manifests a=b2g-bump
2014-03-03 14:51:12 -08:00
Ryan VanderMeulen
02dbe5998e
Backed out changeset 7e424486f60e (bug 950417) for adding new attack surface.
2014-03-03 17:48:12 -05:00
B2G Bumper Bot
205e7912bc
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/ac8b988b122a
Author: John Ford <john@johnford.info>
Desc: Revert "Merge pull request #14453 from arroway/bug-945111"
https://bugzilla.mozilla.org/show_bug.cgi?id=945111#c27
This reverts commit c17ce6040081294f8b6b3ed52decd6788da20dce, reversing
changes made to ba2cd3f149cb2e39b8d0449b4e862b036884a248.
2014-03-03 14:40:16 -08:00
Glenn Randers-Pehrson
0c9b5c22a6
Bug 974825 - Fix hang in libpng16 with zero-length IDAT. r=jmuizelaar
2014-03-03 17:27:25 -05:00
Jed Davis
5bbca3ba90
Bug 974540 - Fix nsMemoryReporterManager child count for Nuwa. r=khuey
2014-03-03 17:27:03 -05:00
B2G Bumper Bot
cc045bb56a
Bumping manifests a=b2g-bump
2014-03-03 14:26:28 -08:00
Ryan VanderMeulen
ee46e14cf6
Merge m-c to inbound.
2014-03-03 17:23:35 -05:00
Ryan VanderMeulen
c9889fa5b4
Merge m-c to fx-team.
2014-03-03 17:23:01 -05:00
B2G Bumper Bot
db851fb7b5
Bumping manifests a=b2g-bump
2014-03-03 14:22:48 -08:00
B2G Bumper Bot
43307d3dfd
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/d5f9a04fc524
Author: Brian Hackett <bhackett1024@gmail.com>
Desc: Bug 978562 - Remove redundant assignment to {TypedArray}.length, r=gsvelto.
2014-03-03 14:22:40 -08:00
Heather Arthur
82c6c4bbe1
Bug 978653 - Wait longer to fire 'style-applied' event after updating a style sheet in StyleSheetActor. r=pbrosset
2014-03-03 17:17:04 -05:00
Ryan VanderMeulen
dc8cd62bf8
Merge fx-team to m-c.
2014-03-03 17:13:50 -05:00
Ryan VanderMeulen
ed45530108
Merge inbound to m-c.
2014-03-03 17:00:34 -05:00
Jan Keromnes
81b4d76c3a
Bug 978058 - Make Firefox OS' devtools track frames instead of app manifests. r=vingtetun
2014-03-03 14:50:56 -05:00
Alexandre Poirot
3e0502a4d9
Bug 944451 - Land simulator addon into mozilla-central. r=vingtetun, r=gps, r=paul
2014-03-03 14:50:40 -05:00
Erik Vold
7454781fb7
Bug 972925 - Uplift Add-on SDK to Firefox
2014-03-03 11:22:07 -08:00
Brian Nicholson
aab33aab84
Bug 978494 - Fix URL in Reader:Removed. r=lucsar
2014-03-03 10:35:23 -08:00
B2G Bumper Bot
2a9ec88ad9
Bumping manifests a=b2g-bump
2014-03-03 10:31:29 -08:00
B2G Bumper Bot
75e76f6d33
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/c195232a409e
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #16738 from julienw/976454-no-provider-error
Bug 976454 - [Sora][Message][MMS]The prompt message is wrong when re-ent...
========
https://hg.mozilla.org/integration/gaia-central/rev/95ab69aa24b6
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 976454 - [Sora][Message][MMS]The prompt message is wrong when re-enter message r=schung
When invoking an activity, we show the "no provider" message only when we
receive this specific error.
2014-03-03 10:30:21 -08:00
B2G Bumper Bot
64798f202a
Bumping manifests a=b2g-bump
2014-03-03 09:56:15 -08:00
Brian Grinstead
b59720019f
Bug 971418 - DevTools dark theme: use higher contrast text for main body content;r=harth
2014-03-03 11:55:34 -06:00
B2G Bumper Bot
25b87562c7
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/a1c1856c9b08
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #16760 from KevinGrandon/bug_978433_disable_failing_test
Bug 977337 - Fix intermittent SIM tests
========
https://hg.mozilla.org/integration/gaia-central/rev/6367d9a0b5ac
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 977337 - Fix intermittent SIM tests r=rik
2014-03-03 09:50:24 -08:00
B2G Bumper Bot
33edca5163
Bumping manifests a=b2g-bump
2014-03-03 09:31:12 -08:00
B2G Bumper Bot
c4b1a63c85
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/39ec2452c51c
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #16369 from ferjm/fxa-refresh-auth-2
Bug 968294 - Refresh authentication UI. r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/beb29ab46bb4
Author: Fernando Jiménez <ferjmoreno@gmail.com>
Desc: Bug 968294 - Refresh authentication UI. r=alive
2014-03-03 09:25:24 -08:00
Gijs Kruitbosch
ea03a43c5e
Bug 978251 - nullcheck target in Australis' panel click detection code, r=jaws
...
--HG--
extra : rebase_source : 4bd6b3121fe298961f0354054508debf75d62e86
2014-03-03 12:19:08 -05:00
Gijs Kruitbosch
c7e2310efd
Bug 972140 - fix tabbrowser-tabs min-height for Australis so it doesn't get squashed when the non-abs-pos bits have 0 width, r=mconley
...
--HG--
extra : rebase_source : a233b0be8a28a3fbb9cd49608655be9e7495be8f
2014-03-03 12:18:54 -05:00
Ed Morley
5ff4c55018
Backed out changeset 1eebddd614eb (bug 962103) for causing bug 947550
...
--HG--
extra : rebase_source : 809b725149264001d341469ebae420aa19911af4
2014-03-03 17:01:01 +00:00
Jared Wein
7768877eb4
Backout bug 960198 since it regressed Australis styling changes. Not backing out the string changes so strings will be present on Aurora30. rs=Gijs
...
--HG--
extra : rebase_source : 7f7e723f386a187cd1eba7116cc7b29c0a065b55
2014-03-03 12:00:10 -05:00
Ed Morley
eed32cf09f
Merge mozilla-central and b2g-inbound
2014-03-03 16:59:32 +00:00
Ed Morley
600a53b971
Merge mozilla-central and inbound
2014-03-03 16:59:25 +00:00
Ed Morley
554b2aaf5b
Backed out changeset 508848ad378a (bug 939562) for causing bug 978450
2014-03-03 16:54:26 +00:00
Marco Bonardo
966a71e9dc
Bug 969408 - Remove old Deprecated methods from PlacesUtils. r=mano
2014-03-03 17:51:44 +01:00
Marco Bonardo
3241538a41
Bug 968177 - Apply the shared backups code to bookmarks.html export. r=mano
2014-03-03 17:51:42 +01:00