434300 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
bfa6580a77 merge mozilla-inbound to mozilla-central a=merge 2015-08-07 13:13:06 +02:00
Carsten "Tomcat" Book
a4253a9b50 merge fx-team to mozilla-central a=merge 2015-08-07 11:52:29 +02:00
Drew Willcoxon
63591bbd24 Bug 959567 - Change urlbar search suggestions from opt-out to opt-in, add opt-in prompt to urlbar popup. r=mak 2015-08-06 20:13:00 -07:00
B2G Bumper Bot
02fa5e14e3 Bumping manifests a=b2g-bump 2015-08-06 18:57:01 -07:00
B2G Bumper Bot
e249f1b936 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/8ab354e8ef85
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #30714 from vladikoff/patch-1

Fixes client.js documentation typo, r=gasolin

========

https://hg.mozilla.org/integration/gaia-central/rev/293915e2abfc
Author: Vlad Filippov <vlad.filippov@gmail.com>
Desc: Fixes client.js documentation typo
2015-08-06 18:55:24 -07:00
Ekanan Ketunuti
67a0b7a8c8 Bug 1192054 - Add subsumption to the en-US dictionary. r=ehsan 2015-08-07 08:43:44 +07:00
Wes Kocher
58cc8b2448 Merge m-c to fx-team, a=merge 2015-08-06 18:43:00 -07:00
Wes Kocher
714afb992e Merge m-c to b2ginbound, a=merge 2015-08-06 18:42:35 -07:00
Wes Kocher
4f23694eb2 Backed out changeset fdf5862a8c00 (bug 1176451) a=backout 2015-08-06 18:38:22 -07:00
Wes Kocher
6ddcd066e5 Merge m-c to b2ginbound, a=merge 2015-08-06 18:11:50 -07:00
Wes Kocher
3fc4028393 Merge b2ginbound to central, a=merge 2015-08-06 18:09:39 -07:00
Reuben Morais
ddb9852252 Bug 967258 - Skip test_contacts_basics2.html on XP. r=RyanVM 2015-08-06 21:56:16 -03:00
B2G Bumper Bot
ad668b24ae Bumping manifests a=b2g-bump 2015-08-06 17:28:38 -07:00
B2G Bumper Bot
13d7394422 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5fb8448e0ab6
Author: Zibi Braniecki <zbigniew.braniecki@gmail.com>
Desc: Merge pull request #31275 from zbraniecki/1187668-settings-l10n-downloads

Bug 1187668 - update settings/downloads l10n api uses. r=evelyn, gasolin

========

https://hg.mozilla.org/integration/gaia-central/rev/93dc979fb6ed
Author: Zibi Braniecki <gandalf@mozilla.com>
Desc: Bug 1187668 - update settings/downloads l10n api uses
2015-08-06 17:27:00 -07:00
Nicholas Nethercote
b84f026b64 Backout bff74cecc67c, ffe0edb2aae7, b60b7c267cef, 6da154b43265, bcf6fd3ab9bb (bug 1182961 parts 1--5) for possible intermittent failures and performance problems.
a=bustage

--HG--
extra : source : d7734e7adeb21c316cae38b88b83c411488e0563
extra : amend_source : 258c4320bbb4714c8ad592387eea9c43f931de0d
2015-08-06 16:30:47 -07:00
Nicholas Nethercote
d606681e8a Backout 04a196339ca4 (bug 1181443, part 3) so that bug 1182961's patches can be backed out.
--HG--
extra : source : 11f2aec8187f0463c3f89f5e28698a90d1618acd
2015-08-06 16:28:13 -07:00
Brian Grinstead
bfd11788ac Backed out changeset 657bc9b41d71 (bug 1175702)
--HG--
extra : source : 0fb83409ff34131af0c1cb49f1b27e1fafa7f79a
2015-08-06 17:00:31 -07:00
Brian Grinstead
b7bda2e9ff Backed out changeset dc33bb49347d (bug 1175702)
--HG--
extra : source : 6e9c284ce3f8d9a67942939a46d64246af20f012
2015-08-06 17:00:16 -07:00
Brian Grinstead
35f4f92f8a Backed out changeset 7216b345380e (bug 1175702)
--HG--
extra : source : 38ee781d437c8e442be901c0644392b5eecbc2c6
2015-08-06 16:59:56 -07:00
B2G Bumper Bot
8d28aacc83 Bumping manifests a=b2g-bump 2015-08-06 16:08:42 -07:00
B2G Bumper Bot
fb760c0a9c Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/aae585f701d7
Author: Ghislain 'Aus' Lacroix <aus@noiseport.org>
Desc: Merge pull request #31274 from nullaus/bug1188585

Bug 1188585 - Increase maxBuffer for utils for GBI tests. a=test-only

========

https://hg.mozilla.org/integration/gaia-central/rev/023063a74266
Author: Ghislain 'Aus' Lacroix <aus@mozilla.com>
Desc: Bug 1188585 - Increase maxBuffer for utils for GBI tests. a=test-only
2015-08-06 16:07:03 -07:00
B2G Bumper Bot
a7579e6163 Bumping manifests a=b2g-bump 2015-08-06 15:27:04 -07:00
B2G Bumper Bot
8e7f92e19a Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ab36b7edaadc
Author: Wes Kocher <kwierso@gmail.com>
Desc: Revert "Merge pull request #31203 from zbraniecki/1187668-settings-l10n-downloads" for download_formatter_test.js failures

This reverts commit f33da62d93ef341a5dbd7e60bfe160495df3dc1d, reversing
changes made to 682419bda6501c3d84ef116c9c51530eee99dbf6.
2015-08-06 15:25:25 -07:00
B2G Bumper Bot
d10e90d711 Bumping manifests a=b2g-bump 2015-08-06 13:47:51 -07:00
B2G Bumper Bot
e821cb04d6 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/0fde69e039cb
Author: Zibi Braniecki <zbigniew.braniecki@gmail.com>
Desc: Merge pull request #31203 from zbraniecki/1187668-settings-l10n-downloads

Bug 1187668 - update settings/downloads l10n api uses. r=evelyn, gasolin

========

https://hg.mozilla.org/integration/gaia-central/rev/4d4ca8432b6f
Author: Zibi Braniecki <gandalf@mozilla.com>
Desc: Bug 1187668 - update settings/downloads l10n api uses.
2015-08-06 13:46:54 -07:00
Ryan VanderMeulen
6b37d9c465 Merge m-c to fx-team. a=merge 2015-08-06 15:53:46 -04:00
Ryan VanderMeulen
568c3a360e Merge b2g-inbound to m-c. a=merge 2015-08-06 15:37:49 -04:00
Ryan VanderMeulen
bac91f37d2 Merge inbound to m-c. a=merge 2015-08-06 15:22:37 -04:00
Ryan VanderMeulen
5c8a1e60a2 Backed out changeset 2f16fb18314a (bug 1181908) for suspicion of causing bug 1191492 and other topcrashes. a=me 2015-08-06 13:28:32 -04:00
Kit Cambridge
b8b774517b Back out changeset 0e68d7a16ed8 (bug 1189543) for mochitest-push timeouts.
--HG--
extra : commitid : Jgv1qFFc8Z6
2015-08-06 10:12:59 -07:00
Jonathan Kew
17045bb405 Backout changesets 1639af64e372, 74ecf0f57a56, 94831690f525, 27eab13d3cf2 (bug 1183431) for Android-specific failure in reftest 1183431-orthogonal-modes-5a.html. 2015-08-06 17:32:20 +01:00
Ryan VanderMeulen
23397eecde Backed out changeset 58f71d9d0de7 (bug 1191579) for various webapp/webide test failures across different suites. 2015-08-06 12:25:54 -04:00
Kyle Machulis
e7cd019de0 Bug 1186582 - AskPermission should check for prompt exceptions; r=fabrice 2015-08-06 08:53:23 -07:00
B2G Bumper Bot
e4d863d08f Bumping manifests a=b2g-bump 2015-08-06 08:52:14 -07:00
B2G Bumper Bot
a554d37bc3 Bumping gaia.json for 5 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/16423131f4a9
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #31063 from KevinGrandon/bug_1186279_ringtones_switches

Bug 1186279 - Convert ringtones switches to use web components

========

https://hg.mozilla.org/integration/gaia-central/rev/face06c73022
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1186279 - Use gaia theme label-color variable for component labels

========

https://hg.mozilla.org/integration/gaia-central/rev/cf78c443c53a
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1186279 - Convert ringtones switches to use web components

========

https://hg.mozilla.org/integration/gaia-central/rev/fefde1214d3e
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #31261 from albertopq/1179643-intermitent-chrome

Bug 1179643 - Intermitent appChrome ui test failure

========

https://hg.mozilla.org/integration/gaia-central/rev/6c4f65d41c27
Author: albertopq <albert.pastor@gmail.com>
Desc: Bug 1179643 - Intermitent appChrome ui test failure
2015-08-06 08:50:37 -07:00
Jonathan Kew
157a3efa31 Bug 1183431 followup - Crashtest no longer asserts, so mark it appropriately on the CLOSED TREE. 2015-08-06 16:36:50 +01:00
B2G Bumper Bot
432809bf04 Bumping manifests a=b2g-bump 2015-08-06 08:33:32 -07:00
Jonathan Kew
7de20f7353 Bug 1183431 followup - Add the test files that I failed to "hg add" when updating the reftest patch, because it's going to burn the CLOSED TREE. 2015-08-06 16:25:07 +01:00
Jonathan Kew
aae5ae1f7f Bug 1183431 - Ensure hypothetical box has a writing mode with the same block direction as the absolute containing block. r=dholbert 2015-08-06 15:44:50 +01:00
Jonathan Kew
120ac081be Bug 1183431 - Tests for hypothetical box computation (to determine static position of abspos element) where orthogonal writing modes are involved. r=dholbert 2015-08-06 15:44:48 +01:00
Fabrice Desré
2e9751583b Bug 1191579 - Remove useless getAll() implementation in Webapps.jsm 2015-08-06 07:43:59 -07:00
Ehsan Akhgari
f22dea9a72 Bug 1190040 - Part 2: Teach the audio channel service how to not notify audio-playback, and do that when a media element has no audio track; r=padenot 2015-08-06 10:26:27 -04:00
Ehsan Akhgari
41ec611711 Bug 1190040 - Part 1: Do not dispatch media-playback notifications for media elements that do not have an audio track; r=cpearce 2015-08-06 10:25:38 -04:00
Sotaro Ikeda
226e6417ae Bug 1191457 - Revert SetDispAcquireFence() calling change r=nical 2015-08-06 06:50:02 -07:00
B2G Bumper Bot
21c137db6b Bumping manifests a=b2g-bump 2015-08-06 06:48:45 -07:00
B2G Bumper Bot
d63e5aa5b7 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/82596c128346
Author: Manuel Casas <manuel.casasbarrado@gmail.com>
Desc: Merge pull request #30836 from mancas/bug1180627

Bug 1180627 - [Contacts][NGA] Remove overlay dependencies with contac…

========

https://hg.mozilla.org/integration/gaia-central/rev/8b28d63aa478
Author: Manuel Casas <manuel.casasbarrado@gmail.com>
Desc: Bug 1180627 - [Contacts][NGA] Remove overlay dependencies with contacts.js
2015-08-06 06:47:08 -07:00
Tim Taubert
c0ff1b00d2 Bug 1175702 - Fix browser_bug590206.js failures r=paolo 2015-08-06 15:35:52 +02:00
Tim Taubert
2785d75e89 Bug 1175702 - Fix browser_identity_UI.js failures r=paolo 2015-08-06 15:01:37 +02:00
B2G Bumper Bot
4b56681dc5 Bumping manifests a=b2g-bump 2015-08-06 04:53:28 -07:00
Carsten "Tomcat" Book
08c257046b merge fx-team to mozilla-central a=merge 2015-08-06 12:15:20 +02:00