From 78268fd9d9a9b388cc73154b2d3e0db1fe78da95 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 12:50:34 -0700 Subject: [PATCH 01/37] Bumping gaia.json for 9 gaia revision(s) a=gaia-bump Truncated some number of revisions since the previous bump. ======== https://hg.mozilla.org/integration/gaia-central/rev/c4b36f3b2032 Author: Marcus Cavanaugh Desc: Merge pull request #19339 from mcav/timer-fix Bug 1009977 - [B2G][Clock] The seconds portion of the timer inconsistent... ======== https://hg.mozilla.org/integration/gaia-central/rev/f563ec43c369 Author: Marcus Cavanaugh Desc: Bug 1009977 - [B2G][Clock] The seconds portion of the timer inconsistently has a different starting point. ======== https://hg.mozilla.org/integration/gaia-central/rev/ec70cf1e8fb5 Author: Jan Keromnes Desc: Merge pull request #19255 from jankeromnes/devtools Bug 1010407 - Move Developer HUD to new devtools system app module. r=21 ======== https://hg.mozilla.org/integration/gaia-central/rev/ad73aadfe495 Author: Jan Keromnes Desc: Bug 1010407 - Move Developer HUD to new devtools system app module. r=21 ======== https://hg.mozilla.org/integration/gaia-central/rev/6a458530cc97 Author: Diego Marcos Desc: Merge pull request #19393 from dmarcos/bug1012779 Bug 1012779 - [Camera] Enable touch to focus by default ======== https://hg.mozilla.org/integration/gaia-central/rev/de1226a3376a Author: Diego Marcos Desc: Bug 1012779 - [Camera] Enable touch to focus by default ======== https://hg.mozilla.org/integration/gaia-central/rev/5a50c68795d2 Author: Zibi Braniecki Desc: Merge pull request #19258 from zbraniecki/1009134-remove-dataset-l10n 1009134 - Transition away from using dataset.placeholder to localize placeholder. r=felash ======== https://hg.mozilla.org/integration/gaia-central/rev/b2f9747bd7b6 Author: Zbigniew Braniecki Desc: Bug 1009134 - Transition away from using dataset.placeholder to localize placeholder ======== https://hg.mozilla.org/integration/gaia-central/rev/ec30fca3abdb Author: crdlc Desc: Bug 1010742 - Improve performance in dragdrop r=kgrandon --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 8e5c7f155fca..e713da7b0c98 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "3440b8cab407aef69dd7be247efd40447b5da577", + "revision": "c4b36f3b2032adcb8ff2947ffe0ce42b01955f04", "repo_path": "/integration/gaia-central" } From 60777274613b1821b3106ebce4bdc7af196a58fa Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 12:53:08 -0700 Subject: [PATCH 02/37] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index c0b6419bfe3b..50ea68144ca7 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 3d3fc1201a04..4834a59e21d8 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index a0991ebe9043..5b1eab8fa5c9 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index c0b6419bfe3b..50ea68144ca7 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 3db8e5e84cc7..fb0d8b84a358 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 21fd42c2e30c..38514e3d25b4 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 501402dda5c0..e1bad251bc4f 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index f8abdac3bb10..733851640f3d 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index b6a57c0a9141..b003c8213716 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index eefd1923dcdd..b93a1b18ef6e 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 52d9d1343c1b..158715aa11c2 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 254f34455984ec0e8b07c1b85b24c6c775fba271 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 14:00:57 -0700 Subject: [PATCH 03/37] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/3dcbc519550e Author: Sam Foster Desc: Merge pull request #18377 from sfoster/task-manager Bug 935260 - Refactor cards view to be instantiable, enable new task-manager look/feel and behavior behind HAIDA=1 build flag. r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/fc78414d5183 Author: Sam Foster Desc: Bug 935260 - Rework cards view as TaskManager and Card/TaskCard classes. r=alive * Implement and use transform method on AppWindow * Implement unapplyStyle, move settings change observer to registerEvents * Use rocketbar.enabled setting to toggle isRocketbar property; unit test same * More unit tests for isRocketbar behavior, testing setActive, hide * allowManualClosing property to allowSwipeToClose, get rid of unused inTimeCapture, lastInTimeCapture * Move opacity, transition, scale constants to card prototype. Use card.applyStyle to avoid touching the element.style directly. Fix pointer-events so current card should always be clickable. Fix adjacent card positioning so they occupy the 25% at the edge * Adding unit tests for AppWindow apply/unapplyStyle, enter/leaveTaskManager and transform methods * Add unit tests for card.destroy and taskManager.closeApp * Adjust swipe_to_previous_app in cards_view ui-tests to start swipe from center * Avoid side-effects when returning early from taskManager.show() (bug 999658) --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index e713da7b0c98..30c6c8267f3e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "c4b36f3b2032adcb8ff2947ffe0ce42b01955f04", + "revision": "3dcbc519550e3a180e5f8beb9a98698ea178b3d2", "repo_path": "/integration/gaia-central" } From d3b8972d2a97608310d23eddd4740a189e2a5f09 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 14:06:32 -0700 Subject: [PATCH 04/37] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 50ea68144ca7..062d6fe8d173 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 4834a59e21d8..4f60f3eeb327 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 5b1eab8fa5c9..7f0b45679ec8 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 50ea68144ca7..062d6fe8d173 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index fb0d8b84a358..c55a14d2883e 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 38514e3d25b4..5a757a096a40 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index e1bad251bc4f..712d608969db 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 733851640f3d..1d4a1e348f33 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index b003c8213716..8d714a19cc1e 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index b93a1b18ef6e..f2c24f2af20b 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 158715aa11c2..79a197dd44fe 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From bba4478d30c925a42f0dea742099a0b5a0a69be8 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 15:10:46 -0700 Subject: [PATCH 05/37] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/3e01eab0c383 Author: Douglas Sherk Desc: Merge pull request #17957 from DouglasSherk/991865-voicemail-silent-fail Bug 991865 - [System][Dialer] Display an error message when calling voicemail fails due to no number set. r=rik ======== https://hg.mozilla.org/integration/gaia-central/rev/858cd1ede9f3 Author: DouglasSherk Desc: Bug 991865 - [System][Dialer] Display an error message when calling voicemail fails due to no number set. r=rik --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 30c6c8267f3e..50d73aeacdb7 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "3dcbc519550e3a180e5f8beb9a98698ea178b3d2", + "revision": "3e01eab0c38397180bb2dda3e5c6a5428024e19b", "repo_path": "/integration/gaia-central" } From d78ffb2440bbd880645ae2ff967412586684e45e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 15:16:36 -0700 Subject: [PATCH 06/37] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 062d6fe8d173..2f347a6f279b 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 4f60f3eeb327..253953161ed4 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 7f0b45679ec8..8cad8478020a 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 062d6fe8d173..2f347a6f279b 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index c55a14d2883e..f36d7aca96df 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 5a757a096a40..d4c6fc64e25a 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 712d608969db..17dffc0568af 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 1d4a1e348f33..396871cb2fdc 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 8d714a19cc1e..1fd5f0acaaf6 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index f2c24f2af20b..a5fcc3939399 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 79a197dd44fe..ce805ca9645c 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From e2f16e96e0a57cb1fae671122de7a6dc02fca54e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 15:51:58 -0700 Subject: [PATCH 07/37] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/88dffe73a460 Author: Justin D'Arcangelo Desc: Merge pull request #19388 from justindarc/bug1006281 Bug 1006281 - [tarako]Camera app can't use internal storage when interna... ======== https://hg.mozilla.org/integration/gaia-central/rev/dfe437311159 Author: Justin D'Arcangelo Desc: Bug 1006281 - [tarako]Camera app can't use internal storage when internal storage size is less than 5MB. --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 50d73aeacdb7..4766550e1625 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "3e01eab0c38397180bb2dda3e5c6a5428024e19b", + "revision": "88dffe73a4609f9b7d453bc72f0edea586c88cbc", "repo_path": "/integration/gaia-central" } From 7103ea1735a7d28920b50115e79d8c87bd88b58d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 15:56:13 -0700 Subject: [PATCH 08/37] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 2f347a6f279b..1621a3d33560 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 253953161ed4..1a79bc4cf17d 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 8cad8478020a..56ac7628105b 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 2f347a6f279b..1621a3d33560 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index f36d7aca96df..75dde48403ee 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index d4c6fc64e25a..4ccdd344bce9 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 17dffc0568af..c13d7e8b0221 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 396871cb2fdc..74c25a1c4328 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 1fd5f0acaaf6..7fe726ee9e13 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index a5fcc3939399..95e9d2fcd089 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index ce805ca9645c..c1f066c56ef7 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 2c564c707faceccb9351d513caedc59ed7353976 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 16:30:51 -0700 Subject: [PATCH 09/37] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/1e0008939bf4 Author: evanxd Desc: Merge pull request #19359 from evanxd/bug-1007546 Bug 1007546 - [Calendar] Add/Edit Event 2.0 Visual Refresh ======== https://hg.mozilla.org/integration/gaia-central/rev/a6e704307932 Author: Evan Xd Desc: Bug 1007546 - Visual refresh for Add/Edit event view ======== https://hg.mozilla.org/integration/gaia-central/rev/3bbb91d22493 Author: Hubert Figuière Desc: Merge pull request #19347 from hfiguiere/bug971771 Bug 971771 - Remove camera from blacklist now. r=eperelman ======== https://hg.mozilla.org/integration/gaia-central/rev/f74b31f0f6e2 Author: Hubert Figuière Desc: Bug 971771 - Remove camera from blacklist now. --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 4766550e1625..625a10dd9bed 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "88dffe73a4609f9b7d453bc72f0edea586c88cbc", + "revision": "1e0008939bf43d1dfc3b5220ed559c163f0fecc1", "repo_path": "/integration/gaia-central" } From f2691bfc55eaf6084d8595cb086c49916d85bc61 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 16:37:31 -0700 Subject: [PATCH 10/37] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 1621a3d33560..930ab3c6d9b7 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 1a79bc4cf17d..af3c94911894 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 56ac7628105b..b978a1d805f2 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 1621a3d33560..930ab3c6d9b7 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 75dde48403ee..a54f4ef88f62 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 4ccdd344bce9..c376ad9c81de 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index c13d7e8b0221..1194a1598fac 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 74c25a1c4328..45e9a7b1727e 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 7fe726ee9e13..be9a7a37cc85 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 95e9d2fcd089..a5595cce596d 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index c1f066c56ef7..110c56d14330 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From da6d4149e1270f83e85b18803a7c94784a8880ec Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 17:25:54 -0700 Subject: [PATCH 11/37] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/63e80c1710e0 Author: Zibi Braniecki Desc: Merge pull request #18877 from zbraniecki/999132-mozl10n-in-camera Bug 999132 - Improve and document the use of mozL10n API in camera app. r=wilsonpage ======== https://hg.mozilla.org/integration/gaia-central/rev/e1bc178e18d7 Author: Zbigniew Braniecki Desc: Bug 999132 - Improve and document the use of mozL10n API in camera app. r=wilsonpage --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 625a10dd9bed..b6fc15876177 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "1e0008939bf43d1dfc3b5220ed559c163f0fecc1", + "revision": "63e80c1710e0ad7c04644829e6196d6f6e925576", "repo_path": "/integration/gaia-central" } From 85e0fd132c3be7757a1e2b94f35fa5a7c874e222 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 17:31:23 -0700 Subject: [PATCH 12/37] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 930ab3c6d9b7..e13c61a93bbc 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index af3c94911894..f89364faac6f 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index b978a1d805f2..45df0caccba8 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 930ab3c6d9b7..e13c61a93bbc 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index a54f4ef88f62..ffcc58be1cf6 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index c376ad9c81de..9b8455291808 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 1194a1598fac..39a00de2ae59 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 45e9a7b1727e..13d558cdf20a 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index be9a7a37cc85..8965ea34be50 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index a5595cce596d..cc0cae3ea918 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 110c56d14330..5ee7aad37f10 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 4f1e39c91a48f6d733924196fd2623d79c5a7393 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 18:36:03 -0700 Subject: [PATCH 13/37] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/4b0bc53d5c37 Author: Jared Hirsch Desc: Merge pull request #19086 from 6a68/bug-994725-fxa-panel-too-tall Bug 994725 - FxA panel too tall in FTE ======== https://hg.mozilla.org/integration/gaia-central/rev/735af29c750b Author: Jared Hirsch Desc: Bug 994725 - When SystemDialog instances are displayed, correctly update the height. r=alive Also remove some unnecessary FxA-specific CSS. --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index b6fc15876177..4e14d0cbc05e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "63e80c1710e0ad7c04644829e6196d6f6e925576", + "revision": "4b0bc53d5c37cba553ce820538c5e76d64c9e251", "repo_path": "/integration/gaia-central" } From c30a5c366367a3775207531aaca7bb74f24e0dcd Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 18:41:35 -0700 Subject: [PATCH 14/37] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index e13c61a93bbc..e637d0863c5d 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index f89364faac6f..1f4c109d95db 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 45df0caccba8..2715f46cb102 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index e13c61a93bbc..e637d0863c5d 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index ffcc58be1cf6..345abedf9628 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 9b8455291808..4dffe4140588 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 39a00de2ae59..1d225c08fe80 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 13d558cdf20a..82843279ec02 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 8965ea34be50..6ae0226b6d0a 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index cc0cae3ea918..7ef3435c88a9 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 5ee7aad37f10..ff620ccc0309 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 983afd2e317e226abe14f017629f2b19d8d5a5fe Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 19:41:09 -0700 Subject: [PATCH 15/37] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/d54dbabfeeab Author: Rex KM Lee Desc: Merge pull request #19098 from rexboy7/1002345-hsWidget Bug 1002345 - [homescreen-stingray] initital widget frame support. r=johnhu, tzu-lin ======== https://hg.mozilla.org/integration/gaia-central/rev/6310b8b1b4aa Author: Rex Lee Desc: Bug 1002345 - [homescreen-stingray] initital widget manager/factory/window support --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 4e14d0cbc05e..c4ff6bd34cb3 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "4b0bc53d5c37cba553ce820538c5e76d64c9e251", + "revision": "d54dbabfeeabeaf9e65f3065d9c3a7f9d3a670e8", "repo_path": "/integration/gaia-central" } From eeede0009e068b7b63444cc2c20c982432adefbe Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 19:46:37 -0700 Subject: [PATCH 16/37] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index e637d0863c5d..42ec84856b07 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 1f4c109d95db..1536ba9545f8 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 2715f46cb102..fa9b0cafdbdd 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index e637d0863c5d..42ec84856b07 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 345abedf9628..3f466f224aeb 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 4dffe4140588..aa1e36fc7eac 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 1d225c08fe80..d3a728602b77 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 82843279ec02..196fd650197c 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 6ae0226b6d0a..93f117439aae 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 7ef3435c88a9..06d1eeb20606 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index ff620ccc0309..03e3559a1aea 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 4d8b0f6155df9c33fb7468842fa859bd8261e6c0 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 19:56:10 -0700 Subject: [PATCH 17/37] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/2304824ac517 Author: Yoshi Huang Desc: Merge pull request #19293 from kamituel/Bug_1005896_pairing_ui_tests Bug 1005896: Pairing UI unit tests. r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/dafee6165507 Author: Kamil Leszczuk Desc: Bug 1005896: Pairing UI unit tests. --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index c4ff6bd34cb3..e3f57427bef1 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "d54dbabfeeabeaf9e65f3065d9c3a7f9d3a670e8", + "revision": "2304824ac517230a7e38b506aabe095ff89ab64c", "repo_path": "/integration/gaia-central" } From 0d7f7f5c55204f21b5bddb97f73cb5a368794145 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 20:01:34 -0700 Subject: [PATCH 18/37] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 42ec84856b07..17a2ffdc7db1 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 1536ba9545f8..4af948e4a8de 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index fa9b0cafdbdd..a6b107fe6b8e 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 42ec84856b07..17a2ffdc7db1 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 3f466f224aeb..374caa3b8607 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index aa1e36fc7eac..e318a26b07a6 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index d3a728602b77..f2c0b07f5e8c 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 196fd650197c..30c79d1049b9 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 93f117439aae..a70b31af4f0c 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 06d1eeb20606..3426d176cba0 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 03e3559a1aea..c7f2f5147a63 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 2014032767dfb887f64363f9b8307ae582e2d6d7 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 20:21:14 -0700 Subject: [PATCH 19/37] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/7b8eadddd407 Author: evelynhung Desc: Merge pull request #19327 from hfiguiere/bug1011168 Fixes test breakage for the settings wifi panel rendering test. r=evelyn ======== https://hg.mozilla.org/integration/gaia-central/rev/095eac0289bb Author: Hubert Figuière Desc: Bug 1011575 - Fix the settings-panel-wifi-visible perf event. ======== https://hg.mozilla.org/integration/gaia-central/rev/a2651537e453 Author: Hubert Figuière Desc: Bug 1011168 - Wait for the wifi item to be enabled before tapping it. r= --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index e3f57427bef1..8d2591e6952b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "2304824ac517230a7e38b506aabe095ff89ab64c", + "revision": "7b8eadddd4070e79b47d015af422634d64ff1d15", "repo_path": "/integration/gaia-central" } From 403a074ccb3ffdc329feee69bf5bfb0d4984092a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 20:26:32 -0700 Subject: [PATCH 20/37] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 17a2ffdc7db1..26ad7deb4923 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 4af948e4a8de..ab5e2980652e 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index a6b107fe6b8e..aa48ef02d595 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 17a2ffdc7db1..26ad7deb4923 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 374caa3b8607..552c367e90a0 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index e318a26b07a6..cfd344da7110 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index f2c0b07f5e8c..9bf991bbc683 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 30c79d1049b9..aac4e1e224b6 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index a70b31af4f0c..b894ee826a60 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 3426d176cba0..d791d9923aa2 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index c7f2f5147a63..52efa4469952 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From beec84676e581bb404e897c7c3e84f966a273a77 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 20:36:05 -0700 Subject: [PATCH 21/37] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/75527514ec03 Author: evelynhung Desc: Merge pull request #19157 from crh0716/1007562 Bug 1007562 - Fix javascript errors, r=evelyn ======== https://hg.mozilla.org/integration/gaia-central/rev/c5db0466d142 Author: Arthur Chen Desc: Bug 1007562 - Fix javascript errors --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 8d2591e6952b..478eb53397f8 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "7b8eadddd4070e79b47d015af422634d64ff1d15", + "revision": "75527514ec03f8fb210bb4edf6663af1bdc1420b", "repo_path": "/integration/gaia-central" } From 3490f67de0366eb8e1ba982437810c043b3251c9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 20:38:08 -0700 Subject: [PATCH 22/37] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 26ad7deb4923..5d0df927ff0f 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index ab5e2980652e..9eb5d84fc063 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index aa48ef02d595..2a9e993ba79e 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 26ad7deb4923..5d0df927ff0f 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 552c367e90a0..5857c8ed8c0a 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index cfd344da7110..58f1c5f2ed33 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 9bf991bbc683..b994de56aa9a 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index aac4e1e224b6..e643e2e71bab 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index b894ee826a60..f7f7833065dd 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index d791d9923aa2..df6679b3f7ab 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 52efa4469952..380a9ea23f1f 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 306b236509572b5d903982bf1f661a8e86459db4 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 21:30:50 -0700 Subject: [PATCH 23/37] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/b04eea7a2d68 Author: evelynhung Desc: Merge pull request #19331 from hfiguiere/bug837669 Bug 837669 - ready test-perf in setting, r=evelyn ======== https://hg.mozilla.org/integration/gaia-central/rev/cf36659fd504 Author: Hubert Figuière Desc: Bug 837669 - Part 2: startup-path-done performance event for settings ======== https://hg.mozilla.org/integration/gaia-central/rev/cc4e2389a368 Author: Hubert Figuière Desc: Bug 837669 - Part 1: Rename the "start" perf event for the wifi list test. --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 478eb53397f8..0f84044cbd93 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "75527514ec03f8fb210bb4edf6663af1bdc1420b", + "revision": "b04eea7a2d682c1e51f908423ba9e24d17c6f8c9", "repo_path": "/integration/gaia-central" } From 2b01474b33c07927a8b5b6392a89eff076ebd56b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 21:36:19 -0700 Subject: [PATCH 24/37] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 5d0df927ff0f..eacff8f1a6c1 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 9eb5d84fc063..c427008f4fc6 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 2a9e993ba79e..e50bdf529697 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 5d0df927ff0f..eacff8f1a6c1 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 5857c8ed8c0a..d102afc979fd 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 58f1c5f2ed33..e87cfb014dd9 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index b994de56aa9a..d1102e39f81c 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index e643e2e71bab..3a534ca6a98e 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index f7f7833065dd..31fdf020c90e 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index df6679b3f7ab..03bff287834e 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 380a9ea23f1f..8c242bf055d0 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 41559c5cb52b69ef7fd7c8c8e25ecf6b62d1c6c6 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 21:45:47 -0700 Subject: [PATCH 25/37] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/2a5d923fff5d Author: Kevin Grandon Desc: Merge pull request #19358 from KevinGrandon/bug_1011118_ftu_gaia_switch_component Bug 1011118 - [FTU] Implement gaia-switch component ======== https://hg.mozilla.org/integration/gaia-central/rev/b18de006bbbf Author: Kevin Grandon Desc: Bug 1011118 - [FTU] Implement gaia-switch component r=arcturus --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 0f84044cbd93..ffd9e813eea8 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "b04eea7a2d682c1e51f908423ba9e24d17c6f8c9", + "revision": "2a5d923fff5d70a982ae6173c88ec3402cd03bb0", "repo_path": "/integration/gaia-central" } From 045874c316cbf94075654042ac8dec8325faba83 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 21:51:19 -0700 Subject: [PATCH 26/37] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index eacff8f1a6c1..0e4fc15d55dd 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index c427008f4fc6..f5a16fe86ced 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index e50bdf529697..ca5cf4164bba 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index eacff8f1a6c1..0e4fc15d55dd 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index d102afc979fd..8b0408d361e5 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index e87cfb014dd9..a67a69f4f0d9 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index d1102e39f81c..168f7e43a4fa 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 3a534ca6a98e..853f84dab6ef 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 31fdf020c90e..01081ef5ebaa 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 03bff287834e..4a7bba7b5407 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 8c242bf055d0..67ac5759c5fd 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From bbfc8e9bbb2c97043293124e8ff3e2b1612a71c8 Mon Sep 17 00:00:00 2001 From: Jessica Jong Date: Sun, 18 May 2014 20:45:00 +0800 Subject: [PATCH 27/37] Bug 979134 (follow-up): convert test_mobile_data_connection.js to Promise. r=vicamo --- .../marionette/test_mobile_data_connection.js | 442 ++++-------------- 1 file changed, 101 insertions(+), 341 deletions(-) diff --git a/dom/mobileconnection/tests/marionette/test_mobile_data_connection.js b/dom/mobileconnection/tests/marionette/test_mobile_data_connection.js index 26834430b3b8..2fd57e4920a1 100644 --- a/dom/mobileconnection/tests/marionette/test_mobile_data_connection.js +++ b/dom/mobileconnection/tests/marionette/test_mobile_data_connection.js @@ -2,350 +2,110 @@ * http://creativecommons.org/publicdomain/zero/1.0/ */ MARIONETTE_TIMEOUT = 60000; +MARIONETTE_HEAD_JS = "head.js"; -const DATA_KEY = "ril.data.enabled"; -const DATA_ROAMING_KEY = "ril.data.roaming_enabled"; -const APN_KEY = "ril.data.apnSettings"; - -SpecialPowers.setBoolPref("dom.mozSettings.enabled", true); -SpecialPowers.addPermission("mobileconnection", true, document); -SpecialPowers.addPermission("settings-read", true, document); -SpecialPowers.addPermission("settings-write", true, document); - -let settings = window.navigator.mozSettings; -let connection = window.navigator.mozMobileConnections[0]; -ok(connection instanceof MozMobileConnection, - "connection is instanceof " + connection.constructor); - - -let pendingEmulatorCmdCount = 0; -function sendCmdToEmulator(cmd, callback) { - ++pendingEmulatorCmdCount; - - runEmulatorCmd(cmd, function(result) { - --pendingEmulatorCmdCount; - - is(result[0], "OK", "Emulator response"); - - if (callback) { - callback(); - } - }); -} - -let tasks = { - // List of test fuctions. Each of them should call |tasks.next()| when - // completed or |tasks.finish()| to jump to the last one. - _tasks: [], - _nextTaskIndex: 0, - - push: function(func) { - this._tasks.push(func); - }, - - next: function() { - let index = this._nextTaskIndex++; - let task = this._tasks[index]; - try { - task(); - } catch (ex) { - ok(false, "test task[" + index + "] throws: " + ex); - // Run last task as clean up if possible. - if (index != this._tasks.length - 1) { - this.finish(); - } - } - }, - - finish: function() { - this._tasks[this._tasks.length - 1](); - }, - - run: function() { - this.next(); - } -}; - -function setSetting(key, value, callback) { - let setLock = settings.createLock(); - let obj = {}; - obj[key] = value; - - let setReq = setLock.set(obj); - setReq.addEventListener("success", function onSetSuccess() { - ok(true, "set '" + key + "' to " + obj[key]); - if (callback) { - callback(); - } - }); - setReq.addEventListener("error", function onSetError() { - ok(false, "cannot set '" + key + "'"); - tasks.finish(); - }); -} - -function getSetting(key, callback) { - let getLock = settings.createLock(); - - let getReq = getLock.get(key); - getReq.addEventListener("success", function onGetSuccess() { - ok(true, "get " + key + " setting okay"); - let value = getReq.result[key]; - callback(value); - }); - getReq.addEventListener("error", function onGetError() { - ok(false, "cannot get '" + key + "'"); - tasks.finish(); - }); -} - -function setEmulatorAPN(callback) { - let apn = - [ - [ - {"carrier":"T-Mobile US", - "apn":"epc.tmobile.com", - "mmsc":"http://mms.msg.eng.t-mobile.com/mms/wapenc", - "types":["default","supl","mms"]} - ] - ]; - setSetting(APN_KEY, apn, callback); -} - -function setEmulatorRoaming(roaming, callback) { - log("Setting emulator roaming state: " + roaming + "."); - - // Set voice registration state first and then data registration state. - let cmd = "gsm voice " + (roaming ? "roaming" : "home"); - sendCmdToEmulator(cmd, function() { - - connection.addEventListener("voicechange", function onvoicechange() { - connection.removeEventListener("voicechange", onvoicechange); - log("mobileConnection.voice.roaming is now '" - + connection.voice.roaming + "'."); - is(connection.voice.roaming, roaming, "voice.roaming"); - - let cmd = "gsm data " + (roaming ? "roaming" : "home"); - sendCmdToEmulator(cmd, function() { - - connection.addEventListener("datachange", function ondatachange() { - connection.removeEventListener("datachange", ondatachange); - log("mobileConnection.data.roaming is now '" - + connection.data.roaming + "'."); - is(connection.data.roaming, roaming, "data.roaming"); - if (callback) { - callback(); - } - }); - }); - }); - }); -} - -function setEmulatorHome(callback) { - let voiceRegistration = false; - let dataRegistration = false; - - if (connection.voice.state != "registered") { - sendCmdToEmulator("gsm voice home", function() { - connection.addEventListener("voicechange", function onvoicechange() { - connection.removeEventListener("voicechange", onvoicechange); - log("mobileConnection.voice.state is now '" - + connection.voice.state + "'."); - is(connection.voice.state, "registered", "voice.state"); - voiceRegistration = true; - }); - }); - } else { - voiceRegistration = true; - } - - if (connection.data.state != "registered") { - sendCmdToEmulator("gsm data home", function() { - connection.addEventListener("datachange", function ondatachange() { - connection.removeEventListener("datachange", ondatachange); - log("mobileConnection.data.state is now '" - + connection.data.state + "'."); - is(connection.data.state, "registered", "data.state"); - dataRegistration = true; - }); - }); - } else { - dataRegistration = true; - } - - waitFor(callback, function() { - return (voiceRegistration && dataRegistration); - }); -} - - -tasks.push(function verifyInitialState() { - log("Verifying initial state."); - - // Want to start test with mobileConnection.data.state 'registered', - // This is the default state; if it is not currently this value then set it. - setEmulatorHome(function() { - // Want to start test with data off, - // This is the default state; if it is not currently this value then set it. - getSetting(DATA_KEY, function(result) { - let value = result; - log("Starting data enabled: " + value); - if (value) { - setSetting(DATA_KEY, false); - - connection.addEventListener("datachange", function ondatachange() { - connection.removeEventListener("datachange", ondatachange); - log("mobileConnection.data.connected is now '" - + connection.data.connected + "'."); - is(connection.data.connected, false, "data.connected"); - setEmulatorAPN(function() { - tasks.next(); - }); - }); - } else { - setEmulatorAPN(function() { - tasks.next(); - }); - } - }); - }); -}); - -tasks.push(function testEnableData() { - log("Turn data on."); - - connection.addEventListener("datachange", function ondatachange() { - connection.removeEventListener("datachange", ondatachange); - log("mobileConnection.data.connected is now '" - + connection.data.connected + "'."); - is(connection.data.connected, true, "data.connected"); - tasks.next(); - }); - - setSetting(DATA_KEY, true); -}); - -tasks.push(function testUnregisterDataWhileDataEnabled() { - log("Set data registration unregistered while data enabled."); - - // When data registration is unregistered, all data calls - // will be automatically deactivated. - sendCmdToEmulator("gsm data unregistered", function() { - connection.addEventListener("datachange", function ondatachange() { - log("mobileConnection.data.state is now '" - + connection.data.state + "'."); - if (connection.data.state == "notSearching") { - connection.removeEventListener("datachange", ondatachange); - log("mobileConnection.data.connected is now '" - + connection.data.connected + "'."); - is(connection.data.connected, false, "data.connected"); - tasks.next(); - } - }); - }); -}); - -tasks.push(function testRegisterDataWhileDataEnabled() { - log("Set data registration home while data enabled."); - - // When data registration is registered, data call will be - // (re)activated by gecko if ril.data.enabled is set to true. - sendCmdToEmulator("gsm data home", function() { - connection.addEventListener("datachange", function ondatachange() { - connection.removeEventListener("datachange", ondatachange); - log("mobileConnection.data.state is now '" - + connection.data.state + "'."); - is(connection.data.state, "registered", "data.state"); - - connection.addEventListener("datachange", function ondatachange() { - connection.removeEventListener("datachange", ondatachange); - log("mobileConnection.data.connected is now '" - + connection.data.connected + "'."); - is(connection.data.connected, true, "data.connected"); - tasks.next(); - }); - }); - }); -}); - -tasks.push(function testDisableDataRoamingWhileRoaming() { - log("Disable data roaming while roaming."); - - setSetting(DATA_ROAMING_KEY, false); - - // Wait for roaming state to change, then data connection should - // be disconnected due to data roaming set to off. - setEmulatorRoaming(true, function() { - connection.addEventListener("datachange", function ondatachange() { - connection.removeEventListener("datachange", ondatachange); - log("mobileConnection.data.connected is now '" - + connection.data.connected + "'."); - is(connection.data.connected, false, "data.connected"); - tasks.next(); - }); - }); -}); - -tasks.push(function testEnableDataRoamingWhileRoaming() { - log("Enable data roaming while roaming."); - - // Data should be re-connected as we enabled data roaming. - connection.addEventListener("datachange", function ondatachange() { - connection.removeEventListener("datachange", ondatachange); - log("mobileConnection.data.connected is now '" - + connection.data.connected + "'."); - is(connection.data.connected, true, "data.connected"); - tasks.next(); - }); - - setSetting(DATA_ROAMING_KEY, true); -}); - -tasks.push(function testDisableDataRoamingWhileNotRoaming() { - log("Disable data roaming while not roaming."); - - // Wait for roaming state to change then set data roaming back - // to off. - setEmulatorRoaming(false, function() { - setSetting(DATA_ROAMING_KEY, false); - - // No change event will be received cause data connection state - // remains the same. - window.setTimeout(function() { - is(connection.data.connected, true, "data.connected"); - tasks.next(); - }, 1000); - }); -}); - -tasks.push(function testDisableData() { - log("Turn data off."); - - connection.addEventListener("datachange", function ondatachange() { - connection.removeEventListener("datachange", ondatachange); - log("mobileConnection.data.connected is now '" - + connection.data.connected + "'."); - is(connection.data.connected, false, "data.connected"); - tasks.next(); - }); - - setSetting(DATA_KEY, false); -}); - -// WARNING: All tasks should be pushed before this!!! -tasks.push(function cleanUp() { - if (pendingEmulatorCmdCount) { - window.setTimeout(cleanUp, 100); +function checkOrWaitForDataState(connected) { + if (mobileConnection.data.connected == connected) { + log("data.connected is now " + mobileConnection.data.connected); return; } - SpecialPowers.removePermission("mobileconnection", document); - SpecialPowers.removePermission("settings-write", document); - SpecialPowers.removePermission("settings-read", document); - SpecialPowers.clearUserPref("dom.mozSettings.enabled"); - finish(); -}); + return waitForManagerEvent("datachange") + .then(() => checkOrWaitForDataState(connected)); +} -tasks.run(); +function verifyInitialState() { + log("Verifying initial state."); + // Data should be off and registration home before starting any test. + return Promise.resolve() + .then(function() { + is(mobileConnection.voice.state, "registered", "voice.state"); + is(mobileConnection.data.state, "registered", "data.state"); + is(mobileConnection.voice.roaming, false, "voice.roaming"); + is(mobileConnection.data.roaming, false, "data.roaming"); + }) + .then(getDataEnabled) + .then(function(aResult) { + is(aResult, false, "Data must be off.") + }); +} + +function testEnableData() { + log("Turn data on."); + + return setDataEnabledAndWait(true); +} + +function testUnregisterDataWhileDataEnabled() { + log("Set data registration unregistered while data enabled."); + + // When data registration is unregistered, all data calls will be + // automatically deactivated. + return setEmulatorVoiceDataStateAndWait("data", "unregistered") + .then(() => checkOrWaitForDataState(false)); +} + +function testRegisterDataWhileDataEnabled() { + log("Set data registration home while data enabled."); + + // When data registration is registered, data call will be (re)activated by + // gecko if ril.data.enabled is set to true. + return setEmulatorVoiceDataStateAndWait("data", "home") + .then(() => checkOrWaitForDataState(true)); +} + +function testDisableDataRoamingWhileRoaming() { + log("Disable data roaming while roaming."); + + // After setting emulator state to roaming, data connection should be + // disconnected due to data roaming setting set to off. + return setEmulatorRoamingAndWait(true) + .then(() => checkOrWaitForDataState(false)); +} + +function testEnableDataRoamingWhileRoaming() { + log("Enable data roaming while roaming."); + + // Data should be re-connected as we enabled data roaming. + return setDataRoamingEnabled(true) + .then(() => checkOrWaitForDataState(true)); +} + +function testDisableData() { + log("Turn data off."); + + return setDataEnabledAndWait(false); +} + +startTestCommon(function() { + + let origApnSettings; + return verifyInitialState() + .then(() => getDataApnSettings()) + .then(value => { + origApnSettings = value; + }) + .then(() => { + let apnSettings = [[{ "carrier": "T-Mobile US", + "apn": "epc.tmobile.com", + "mmsc": "http://mms.msg.eng.t-mobile.com/mms/wapenc", + "types": ["default","supl","mms"] }]]; + return setDataApnSettings(apnSettings); + }) + .then(() => testEnableData()) + .then(() => testUnregisterDataWhileDataEnabled()) + .then(() => testRegisterDataWhileDataEnabled()) + .then(() => testDisableDataRoamingWhileRoaming()) + .then(() => testEnableDataRoamingWhileRoaming()) + .then(() => testDisableData()) + // Restore test environment. + .then(() => { + if (origApnSettings) { + return setDataApnSettings(origApnSettings); + } + }) + .then(() => setEmulatorRoamingAndWait(false)) + .then(() => setDataRoamingEnabled(false)); + +}, ["settings-read", "settings-write"]); \ No newline at end of file From f5f569b6b9464b1d9dd9fbf09707bb319bff5258 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 23:16:52 -0700 Subject: [PATCH 28/37] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/6f92062fa8e1 Author: John Hu Desc: Merge pull request #19361 from huchengtw-moz/Stingray/Bug_1002343-save-load-result Bug 1002343 - [Stingray] persistent module of widget editor, r=lchang, r=garychen ======== https://hg.mozilla.org/integration/gaia-central/rev/ac5c39dc8821 Author: John Hu Desc: Bug 1002343 - [Stingray] persistent module of widget editor ======== https://hg.mozilla.org/integration/gaia-central/rev/ab585fd6a223 Author: Yuren Ju Desc: Merge pull request #19371 from yurenju/json Bug 1012596 - Dump more information if get error from |utils.getJSON()| r=@timdream ======== https://hg.mozilla.org/integration/gaia-central/rev/c28b5260c4a1 Author: Yuren Ju Desc: Bug 1012596 - Dump more information if get error from |utils.getJSON()| --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index ffd9e813eea8..912bb450efbd 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "2a5d923fff5d70a982ae6173c88ec3402cd03bb0", + "revision": "6f92062fa8e1b3e2d9b0daf835d0aed1813ccac0", "repo_path": "/integration/gaia-central" } From 59260534a18ba88cb09816e7195897a3b84a0b16 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 May 2014 23:26:17 -0700 Subject: [PATCH 29/37] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 0e4fc15d55dd..50a1de92e46f 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index f5a16fe86ced..e85fa13a3e47 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index ca5cf4164bba..55a29480ca6a 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 0e4fc15d55dd..50a1de92e46f 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 8b0408d361e5..67ee43d1b98c 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index a67a69f4f0d9..0cc4a4a58698 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 168f7e43a4fa..5c22724f844e 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 853f84dab6ef..c49ce9b45481 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 01081ef5ebaa..d204a3b11221 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 4a7bba7b5407..0ee827c7a1ee 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 67ac5759c5fd..429d7d496530 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From e257ebafde8ece8b7616fe6e99ceaad6153d58dd Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 20 May 2014 00:00:44 -0700 Subject: [PATCH 30/37] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/2e9089cee3c4 Author: Luke Chang Desc: Merge pull request #19367 from luke-chang/1012556_stingray_cant_launch_app Bug 1012556 - [Stingray] Can't launch apps from App List, r=johnhu ======== https://hg.mozilla.org/integration/gaia-central/rev/4275f51da53a Author: Luke Chang Desc: Bug 1012556 - [Stingray] Can't launch apps from App List --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 912bb450efbd..45e9bb1ba2db 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "6f92062fa8e1b3e2d9b0daf835d0aed1813ccac0", + "revision": "2e9089cee3c472528189567e6761afc33f29da67", "repo_path": "/integration/gaia-central" } From d8d00f941a3aca030ddf9e430aed16d6edca875e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 20 May 2014 00:06:21 -0700 Subject: [PATCH 31/37] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 50a1de92e46f..3b275402a4db 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index e85fa13a3e47..1d7283ba8db1 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 55a29480ca6a..c5a868552646 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 50a1de92e46f..3b275402a4db 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 67ee43d1b98c..0773078b4e71 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 0cc4a4a58698..083f2b3a6f96 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 5c22724f844e..0c6e90cd71e3 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index c49ce9b45481..e158c14b0be8 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index d204a3b11221..467634787827 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 0ee827c7a1ee..2b1f8ea495d0 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 429d7d496530..e193a0ee2351 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 158d286afec057ca41d892d6a627a5cf292e1c63 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 20 May 2014 01:05:51 -0700 Subject: [PATCH 32/37] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/179d869e88e6 Author: gasolin Desc: Merge pull request #19364 from gasolin/issue-996515 Bug 996515 - [NFC] Screen shot does not have move back animation when vi..., r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/3d456fcaa1f6 Author: gasolin Desc: Bug 996515 - [NFC] Screen shot does not have move back animation when video is failed to share add test and fix lint --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 45e9bb1ba2db..712933751996 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "2e9089cee3c472528189567e6761afc33f29da67", + "revision": "179d869e88e6b262a01c45aa2a9f2f3e8c997284", "repo_path": "/integration/gaia-central" } From e14452376916ebffbacaf8994df6a5997c47e819 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 20 May 2014 01:16:28 -0700 Subject: [PATCH 33/37] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 3b275402a4db..d3600c9b8eae 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 1d7283ba8db1..43e4ea052868 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index c5a868552646..1cbc890160be 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 3b275402a4db..d3600c9b8eae 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 0773078b4e71..84d505837141 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 083f2b3a6f96..eba34b13c1b3 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 0c6e90cd71e3..ed15d64ea3c3 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index e158c14b0be8..2a5fc9a77526 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 467634787827..ee9eb08f2360 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 2b1f8ea495d0..171d828642b1 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index e193a0ee2351..008a1c3d3074 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 3911b1420b91f12d60497c6548ecf550f11e88c7 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 20 May 2014 01:20:59 -0700 Subject: [PATCH 34/37] Bumping gaia.json for 6 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/f537334a5312 Author: Carsten Book Desc: Merge pull request #19195 from airpingu/bug-1009482-enable-test_inter_app_comm Bug 1009482 - Enable test_inter_app_comm.py on the try server. r=ferjm ======== https://hg.mozilla.org/integration/gaia-central/rev/e8485ce8cf00 Author: Gene Lian Desc: Bug 1009482 - Enable test_inter_app_comm.py on the try server. r=ferjm ======== https://hg.mozilla.org/integration/gaia-central/rev/1fd40447acbe Author: Kevin Grandon Desc: Merge pull request #19302 from KevinGrandon/bug_1011351_gaia_textinput_component Bug 1011351 - Create gaia-textinput web component ======== https://hg.mozilla.org/integration/gaia-central/rev/9811e08c9389 Author: Kevin Grandon Desc: Bug 1011351 - Create gaia-textinput web component r=wilsonpage ======== https://hg.mozilla.org/integration/gaia-central/rev/3d686c2a470a Author: Carmen Jiménez Desc: Merge pull request #19073 from mcjimenez/bug923452 Bug 923452 - SV: Maximum length of SMS to convert to MMS customization by SIM ======== https://hg.mozilla.org/integration/gaia-central/rev/88b18f0f953d Author: Carmen Jimenez Cabezas Desc: Bug 923452 - SV: Maximum length of SMS to convert to MMS customization by SIM --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 712933751996..473f2e9c6c3f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "179d869e88e6b262a01c45aa2a9f2f3e8c997284", + "revision": "f537334a53122b972583e6d821db7800352325da", "repo_path": "/integration/gaia-central" } From 294845a1f5c68591a725614d2af238b3480a44a0 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 20 May 2014 01:26:33 -0700 Subject: [PATCH 35/37] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index d3600c9b8eae..226d8c079ca3 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 43e4ea052868..20b2dabb8d3c 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 1cbc890160be..2c68d93ac197 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index d3600c9b8eae..226d8c079ca3 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 84d505837141..f2ad9defa6b8 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index eba34b13c1b3..5fbf45e9fb96 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index ed15d64ea3c3..9f4c7de5d791 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 2a5fc9a77526..f1d5f0fa146b 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index ee9eb08f2360..67f951888fad 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 171d828642b1..b138cb78afe5 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 008a1c3d3074..ba1bf5adad46 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 0aec1fe8e73f5a9ecf893ed8f71639ce4ef5a54c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 20 May 2014 01:46:01 -0700 Subject: [PATCH 36/37] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/6b51afcf6d39 Author: Zac Desc: Merge pull request #19205 from bebef1987/test3 Bug 996252 - Intermittent TEST-UNEXPECTED-FAIL | test_settings_change ======== https://hg.mozilla.org/integration/gaia-central/rev/f44fddb1a034 Author: Bebe Desc: Bug 996252 - Intermittent TEST-UNEXPECTED-FAIL | test_settings_change_language.py test_settings_change_language --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 473f2e9c6c3f..33a924b9990c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "f537334a53122b972583e6d821db7800352325da", + "revision": "6b51afcf6d39fc4b30dc0d9b5d9f5739b2a6fd60", "repo_path": "/integration/gaia-central" } From f0a6a56f789b38bd254e644a924dca38a3859592 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 20 May 2014 01:51:29 -0700 Subject: [PATCH 37/37] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 226d8c079ca3..adae62efdb67 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 20b2dabb8d3c..0e31668ca9ab 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 2c68d93ac197..34975c5d1ab4 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 226d8c079ca3..adae62efdb67 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index f2ad9defa6b8..ce857a7faef7 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 5fbf45e9fb96..34a939ed09ec 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 9f4c7de5d791..575ac5e6630e 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index f1d5f0fa146b..582be8047210 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 67f951888fad..c05f4c186ee4 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index b138cb78afe5..7b793b7f25e8 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index ba1bf5adad46..e3d693746fe4 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - +