Commit Graph

147503 Commits

Author SHA1 Message Date
Ryan VanderMeulen
871fb32207 Merge b2g-inbound to m-c. 2013-09-17 22:46:32 -04:00
Marco Castelluccio
909a441d97 Bug 917310 - Apps install path is broken on b2g desktop for windows and mac r=fabrice 2013-09-17 17:36:36 -07:00
Ryan VanderMeulen
5be5179c2d Merge m-c to fx-team on a CLOSED TREE. 2013-09-17 20:27:03 -04:00
Ryan VanderMeulen
77a8785c0c Backed out changeset d63424e06b3e (bug 916446) for B2G mochitest-1 failures. 2013-09-17 20:25:48 -04:00
Gaia Pushbot
0309ea7d5b Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/94340fb19f68
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12283 from lightsofapollo/reallyhide-keyboard-tests

per bug 917523 disable test on tbpl

========

https://hg.mozilla.org/integration/gaia-central/rev/d817d867b7ae
Author: James Lal <james@lightsofapollo.com>
Desc: per bug 917523 disable test on tbpl
2013-09-17 17:10:24 -07:00
Gaia Pushbot
1f9d0fdc59 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/99a07b8780aa
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #12095 from eeejay/bug-914882

Bug 914882 - Style clipped settings panels as invisible. r=kaze

========

https://hg.mozilla.org/integration/gaia-central/rev/7d4f34845e97
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 914882 - Style clipped settings panels as invisible.
2013-09-17 16:15:26 -07:00
Gaia Pushbot
f032f4ad00 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/b5d66bc31278
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #12281 from eeejay/bug-916231

Bug 916231 - Add screen reader toggle to developer options. r=kaze

========

https://hg.mozilla.org/integration/gaia-central/rev/706499ea0abd
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 916231 - Add screen reader toggle to developer options.
2013-09-17 15:50:25 -07:00
Gaia Pushbot
8a8bc6c735 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/2abf97674c6a
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12279 from lightsofapollo/disable-modify-event-view

disable modify_event_test a=test-only

========

https://hg.mozilla.org/integration/gaia-central/rev/b12465654e88
Author: James Lal <james@lightsofapollo.com>
Desc: disable modify_event_test a=test-only
2013-09-17 14:50:22 -07:00
Gaia Pushbot
440374fcd3 Bumping gaia.json for 4 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/49950f830ee6
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12259 from lightsofapollo/gaia-ui-tests-travis

Bug 916305 - Gaia ui tests travis

========

https://hg.mozilla.org/integration/gaia-central/rev/13c2ca7c1f26
Author: James Lal <james@lightsofapollo.com>
Desc: xfail test_clock_turn_on_off_alarm.py

========

https://hg.mozilla.org/integration/gaia-central/rev/3a93cb8a84ef
Author: James Lal <james@lightsofapollo.com>
Desc: xfail test_settings_change_keyboard_language.py

========

https://hg.mozilla.org/integration/gaia-central/rev/a2031a207635
Author: James Lal <james@lightsofapollo.com>
Desc: Bug 916305 - Gaia ui test travis setup
2013-09-17 14:40:24 -07:00
Gaia Pushbot
93eb55d7da Bumping gaia.json for 1 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/36097dafad3c
Author: John Ford <john@johnford.info>
Desc: Revert "Merge pull request #12234 from EragonJ/bug-914317"

https://bugzilla.mozilla.org/show_bug.cgi?id=914317#c13

This reverts commit bda5c4a902793934467b689a118a2c68f745706e, reversing
changes made to bc85e07011c2c40986693657fa7647ee5c9f8eea.
2013-09-17 14:15:23 -07:00
Ryan VanderMeulen
8babb6cb0e Merge m-c to inbound on a CLOSED TREE. 2013-09-17 16:55:23 -04:00
Ryan VanderMeulen
19805ff01e Merge m-c to b2g-inbound. 2013-09-17 16:51:34 -04:00
Gaia Pushbot
160664d665 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/d61ac2e84b83
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #12276 from gaye/waitForAlert

Use MarionetteHelper#waitForAlert in share_url_test.js r=lightsofapollo a=test-only

========

https://hg.mozilla.org/integration/gaia-central/rev/958033f9d148
Author: gaye <gaye@mozilla.com>
Desc: Use MarionetteHelper#waitForAlert in share_url_test.js r=lightsofapollo
2013-09-17 13:50:23 -07:00
Ryan VanderMeulen
a185ae5d5b Merge b2g-inbound to m-c. 2013-09-17 16:50:17 -04:00
Wes Kocher
2a660a631c Backed out changeset 2d9b7fe69276 (bug 906620) for debug OSX mochitest leaks on a CLOSED TREE 2013-09-17 13:40:10 -07:00
Nicholas Nethercote
cc1558fe8d Bug 917489 - Fix an observer leak in about:memory. r=mccr8. 2013-09-17 13:13:25 -07:00
Peter Chang
f4049067a4 Bug 915077 - Change the debug log level of HWC, r=nrc 2013-09-18 10:10:35 +08:00
Ryan VanderMeulen
449cad53d5 Backed out changeset 9fa8dd98a23c (bug 911325) for Android Armv6 xpcshell orange.
CLOSED TREE
2013-09-17 21:56:51 -04:00
Gaia Pushbot
cf46f24c4e Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/ca3cef257ae1
Author: Fabien Cazenave <fabien@cazenave.cc>
Desc: Merge pull request #12274 from flodolo/bug917198_master

Bug 917198 - inconsistent use of "OK" and "KB" across Gaia apps and settings, r=kaze

========

https://hg.mozilla.org/integration/gaia-central/rev/76e3a2829ed1
Author: Francesco Lodolo <flod@lodolo.net>
Desc: Bug 917198 - en-US: inconsistent use of "OK" and "KB" across Gaia apps and settings
2013-09-17 12:50:25 -07:00
Gaia Pushbot
18b44328e9 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/a54cc0c1ff0d
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12255 from lightsofapollo/travis-parallel

Bug 917044 - Run gjslint, unit tests and integration tests in parallel

========

https://hg.mozilla.org/integration/gaia-central/rev/2f6b3ef3d6ee
Author: James Lal <james@lightsofapollo.com>
Desc: Bug 917044 - Run gjslint, unit tests and integration tests in parallel
2013-09-17 12:20:27 -07:00
Benoit Jacob
24afddf9d1 Bug 915869 - Let the GrallocBufferActor keep an _array_ of backrefs to TextureHosts referencing it - r=nical 2013-09-17 14:48:08 -04:00
Benoit Jacob
21762ea6b2 Bug 915869 - Let the GrallocBufferActor inform its old TextureHost when it's switching to another TextureHost - r=jrmuizel 2013-09-17 14:47:27 -04:00
Alexandre Poirot
59c8663b59 Bug 917331 - Fix exception on b2g desktop about undefined AdbController object. r=fabrice 2013-09-17 14:29:38 -04:00
Alex Keybl
b16740d8c4 m-c is now FxOS 1.3 r=merge NO BUG 2013-09-17 14:26:06 -04:00
Sam Foster
404c85e0e7 Bug 916887 - waitForEvent should return the promise that is resolved after its cleanup is complete. r=mbrubeck
--HG--
extra : rebase_source : fb9bf106058495563e3fa37802b7bb320db773bf
2013-09-17 11:12:40 -07:00
Victor Porof
521bc44154 Bug 917498 - Make sure the correct source is shown after performing reloads in browser_dbg_breakpoints-disabled-reload.js. r=me
CLOSED TREE
2013-09-17 23:48:47 +03:00
Ryan VanderMeulen
a92fe99828 Backed out changeset 0da508ef253c (bug 896291) for mochitest-bc failures.
CLOSED TREE
2013-09-17 13:44:36 -04:00
Paolo Amadini
13d52e1293 Bug 906620 - Implement the taskbar indicator for downloads. r=enn 2013-09-17 19:41:15 +02:00
Paolo Amadini
34f09b2838 Bug 910236 - The Downloads Panel shows one extra download for the number in "+ X other downloads". r=enn 2013-09-17 19:37:00 +02:00
Ryan VanderMeulen
9c7e7e5258 Backed out 5 changesets (bug 894595) for causing new mochitest-bc intermittent failures.
Backed out changeset 778adbf10481 (bug 894595)
Backed out changeset 5b621d8eb5e9 (bug 894595)
Backed out changeset 91303ff403ac (bug 894595)
Backed out changeset 3caa785122bf (bug 894595)
Backed out changeset 108e2b8e177c (bug 894595)
2013-09-17 13:35:58 -04:00
Matt Brubeck
63e63308ec Bug 276757 - Find in page should match curly quotes to straight quotes [r=jst] 2013-09-17 10:24:23 -07:00
Matt Brubeck
2e6e8f6144 Bug 917059 - Fix download size display when decimal separator is ',' [r=bnicholson] 2013-09-17 10:23:57 -07:00
Gregory Szorc
b428979adc Merge mozilla-central into build-system 2013-09-17 09:16:10 -07:00
Gregory Szorc
ed166665ad Backout 312925464acb:f24d5b2801f8 (bug 911375) for breaking the build 2013-09-17 09:14:58 -07:00
Paolo Amadini
2bcfedf8ba Bug 899102 - nsExternalHelperAppService should notify when cancellation is complete. r=enn 2013-09-17 18:02:21 +02:00
Paolo Amadini
ec752bf80a Bug 916433 - The task in the "tail.js" file of the Downloads API tests is not executed. r=felipe 2013-09-17 18:02:21 +02:00
Paolo Amadini
abdc1ac517 Bug 916430 - General Downloads API review. r=enn 2013-09-17 18:02:21 +02:00
Paolo Amadini
9eda9b37b8 Bug 913110 - Add a combined summary of public and private downloads. r=enn 2013-09-17 18:02:20 +02:00
David Rajchenbach-Teller
645590ddbe Bug 916687 - Leaked directory detection, increasing test timeout. r=yoric 2013-09-17 11:39:02 -04:00
Matthew Noorenberghe
01988bfc57 Bug 888380 - Alert service notifications shouldn't disappear when hovered. r=jaws 2013-09-17 11:38:41 -04:00
Sotaro Ikeda
6b5b5f8840 Bug 916264 - Delete texture to unbound from texture. r=nical 2013-09-17 11:10:25 -04:00
Ryan VanderMeulen
5d62e49ecf Backed out changeset 41f37e48b6e7 (bug 916264) for landing with the wrong bug # in the commit message.
Landed as bug 909746.
2013-09-17 14:28:29 -04:00
Gaia Pushbot
bbd9413604 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/503c75c40029
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #12001 from KevinGrandon/bug_908953_dialer_dom

Bug 908953 - Use HTML import polyfill for dialer dom r=rik

========

https://hg.mozilla.org/integration/gaia-central/rev/c45d90bbef10
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 908953 - Use HTML import polyfill for dialer dom r=rik
2013-09-17 09:30:28 -07:00
Gaia Pushbot
009da3fc5e Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/c94420395a6b
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #12177 from steveck-chung/issue913378

Bug 913378 - Redesign of incoming call screen - Gaia implementation. r=etienne a=koi+

========

https://hg.mozilla.org/integration/gaia-central/rev/30be20b5c73e
Author: Steve Chung <schung@mozilla.com>
Desc: Bug 913378 - Redesign of incoming call screen - Gaia implementation
2013-09-17 09:15:26 -07:00
Marco Castelluccio
ff6045764d Bug 916921 - Fix checkInstalled usage in test_packaged_app_install. r=fabrice 2013-09-17 11:12:15 -04:00
Jan Jongboom
6c7bb6bd55 Bug 916740 - Expose Keyboard.jsm to shell.js. r=kchen 2013-09-17 11:11:57 -04:00
Sotaro Ikeda
dc9f316c9c Bug 909746 - Delete texture to unbound from texture. r=nical 2013-09-17 11:10:25 -04:00
Sotaro Ikeda
8187b5bda8 Bug 916220 - Fix encoder flag on ICS gonk. r=mikeh 2013-09-17 11:10:08 -04:00
Shih-Chiang Chien
26c9449ca8 Bug 905701 - Apply MediaStreamConstraint on FirefoxOS. r=jesup 2013-09-17 11:09:52 -04:00
Alex Keybl
63a42a7016 Merging in version bump NO BUG 2013-09-17 09:38:37 -04:00