From 12e41a3742424feeebbe914328591219d1318543 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 27 Apr 2014 20:50:42 -0700 Subject: [PATCH 01/51] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/b2b3191dbb2f Author: Ryan VanderMeulen Desc: Merge pull request #18716 from TheoChevalier/typography-fix Bug 1001972 - [l10n][en-US] Typography consistency for 2.0 ======== https://hg.mozilla.org/integration/gaia-central/rev/bd7dc4435c80 Author: TheoChevalier Desc: Bug 1001972 - [l10n][en-US] Typography consistency for 2.0 ======== https://hg.mozilla.org/integration/gaia-central/rev/f66ab36b2649 Author: Ryan VanderMeulen Desc: Merge pull request #18677 from arky/General_L10N Bug 1000859 - Add Xhosa xh locale ======== https://hg.mozilla.org/integration/gaia-central/rev/16e2428b3376 Author: Arky Desc: Bug 1000859 - Add Xhosa xh locale --- 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 3959c4710bdc..8b618f4cb236 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "dd1090309fea415972091d81b2c5fe5420759eeb", + "revision": "b2b3191dbb2f7e3dd678325f5a79bae0957716bb", "repo_path": "/integration/gaia-central" } From a798e92b4054b5dbd09de9e93173b5fada6aa828 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 27 Apr 2014 20:56:13 -0700 Subject: [PATCH 02/51] 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 9659026f8ebd..d29ba9fd8cf8 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 dc3640daac01..55758f7f3a25 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 8516f30bf669..a6512ebdd55e 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 9659026f8ebd..d29ba9fd8cf8 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 167513b32a59..223d2f526cfd 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 bc19694adc95..83cee2b67aae 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 b71f0347f69e..e45258c358b6 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 7217309417d7..e0c1496ea248 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 ff9bd39ff99e..280b3598409c 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 ed0f28ad0f74..dbdcefb4ec15 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 01d4eeb7fe6b..497643ceb19f 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 2653dcb6915bb052e0ae014b7aee117318b4fe4a Mon Sep 17 00:00:00 2001 From: Hsin-Yi Tsai Date: Thu, 24 Apr 2014 14:13:14 +0800 Subject: [PATCH 03/51] Bug 1000670 - part 1 - [B2G] [RIL] expose clirstatuschange event to gaia. r=gene, r=smaug --- .../interfaces/nsIDOMMobileConnection.idl | 8 ++++++- dom/webidl/MozClirModeEvent.webidl | 22 +++++++++++++++++++ dom/webidl/moz.build | 1 + 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 dom/webidl/MozClirModeEvent.webidl diff --git a/dom/mobileconnection/interfaces/nsIDOMMobileConnection.idl b/dom/mobileconnection/interfaces/nsIDOMMobileConnection.idl index c3e7b629f816..b060796fbe88 100644 --- a/dom/mobileconnection/interfaces/nsIDOMMobileConnection.idl +++ b/dom/mobileconnection/interfaces/nsIDOMMobileConnection.idl @@ -12,7 +12,7 @@ interface nsIDOMMozMobileCellInfo; interface nsIDOMMozMobileCFInfo; interface nsIVariant; -[scriptable, builtinclass, uuid(389ad352-4e43-4c1a-85e9-bae745554326)] +[scriptable, builtinclass, uuid(e891c732-216b-40b2-bda5-5a9d62e08779)] interface nsIDOMMozMobileConnection : nsIDOMEventTarget { const long ICC_SERVICE_CLASS_VOICE = (1 << 0); @@ -471,6 +471,12 @@ interface nsIDOMMozMobileConnection : nsIDOMEventTarget * changes. */ [implicit_jscontext] attribute jsval onradiostatechange; + + /** + * The 'onclirmodechange' event is notified whenever the mode of the calling + * line id restriction (CLIR) changes. + */ + [implicit_jscontext] attribute jsval onclirmodechange; }; [scriptable, uuid(49706beb-a160-40b7-b745-50f62e389a2c)] diff --git a/dom/webidl/MozClirModeEvent.webidl b/dom/webidl/MozClirModeEvent.webidl new file mode 100644 index 000000000000..3cda9eea4a85 --- /dev/null +++ b/dom/webidl/MozClirModeEvent.webidl @@ -0,0 +1,22 @@ +/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +[Pref="dom.mobileconnection.enabled", + Constructor(DOMString type, optional MozClirModeEventInit eventInitDict)] +interface MozClirModeEvent : Event +{ + /** + * Indicates the mode of the calling line id restriction (CLIR). + * + * @see nsIDOMMozMobileConnection.CLIR_* values. + */ + readonly attribute unsigned long mode; +}; + +dictionary MozClirModeEventInit : EventInit +{ + unsigned long mode = 0; +}; diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build index a082106c6d43..f55e1ada6011 100644 --- a/dom/webidl/moz.build +++ b/dom/webidl/moz.build @@ -600,6 +600,7 @@ GENERATED_EVENTS_WEBIDL_FILES = [ 'ErrorEvent.webidl', 'IccChangeEvent.webidl', 'MediaStreamEvent.webidl', + 'MozClirModeEvent.webidl', 'MozContactChangeEvent.webidl', 'MozEmergencyCbModeEvent.webidl', 'MozInterAppMessageEvent.webidl', From e48e0987fbef5ad0dbbdbaf4b37910250c77ab6d Mon Sep 17 00:00:00 2001 From: Hsin-Yi Tsai Date: Thu, 24 Apr 2014 14:33:29 +0800 Subject: [PATCH 04/51] Bug 1000670 - part 2 - add internal api: notifyClirModeChanged. r=vicamo --- .../interfaces/nsIMobileConnectionProvider.idl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dom/mobileconnection/interfaces/nsIMobileConnectionProvider.idl b/dom/mobileconnection/interfaces/nsIMobileConnectionProvider.idl index f074657d1195..46a5e95afa16 100644 --- a/dom/mobileconnection/interfaces/nsIMobileConnectionProvider.idl +++ b/dom/mobileconnection/interfaces/nsIMobileConnectionProvider.idl @@ -11,7 +11,7 @@ interface nsIDOMMozMobileNetworkInfo; interface nsIDOMWindow; interface nsIVariant; -[scriptable, uuid(5013f5cc-24f9-45dc-ba03-f5dc031a3a6b)] +[scriptable, uuid(64eb8c1a-34b6-4ff8-ba47-23a5f9bea68c)] interface nsIMobileConnectionListener : nsISupports { void notifyVoiceChanged(); @@ -30,6 +30,7 @@ interface nsIMobileConnectionListener : nsISupports void notifyOtaStatusChanged(in DOMString status); void notifyIccChanged(); void notifyRadioStateChanged(); + void notifyClirModeChanged(in unsigned long mode); }; /** From a38ebd258c91b4a7ae45d9d7b8652b60818011de Mon Sep 17 00:00:00 2001 From: Hsin-Yi Tsai Date: Thu, 24 Apr 2014 14:37:49 +0800 Subject: [PATCH 05/51] Bug 1000670 - part 3 - DOM: create and dispatch clirmodechange event. r=smaug --- content/base/src/nsGkAtomList.h | 1 + .../test/test_all_synthetic_events.html | 4 ++++ dom/mobileconnection/src/MobileConnection.cpp | 20 +++++++++++++++++++ .../mochitest/general/test_interfaces.html | 2 ++ 4 files changed, 27 insertions(+) diff --git a/content/base/src/nsGkAtomList.h b/content/base/src/nsGkAtomList.h index 3b633f53d181..61c05906eb99 100644 --- a/content/base/src/nsGkAtomList.h +++ b/content/base/src/nsGkAtomList.h @@ -676,6 +676,7 @@ GK_ATOM(onchargingchange, "onchargingchange") GK_ATOM(onchargingtimechange, "onchargingtimechange") GK_ATOM(onchecking, "onchecking") GK_ATOM(onclick, "onclick") +GK_ATOM(onclirmodechange, "onclirmodechange") GK_ATOM(onclose, "onclose") GK_ATOM(oncommand, "oncommand") GK_ATOM(oncommandupdate, "oncommandupdate") diff --git a/dom/events/test/test_all_synthetic_events.html b/dom/events/test/test_all_synthetic_events.html index 64d8608b6e24..c017edb2d4bd 100644 --- a/dom/events/test/test_all_synthetic_events.html +++ b/dom/events/test/test_all_synthetic_events.html @@ -229,6 +229,10 @@ const kEventConstructors = { return new MozCellBroadcastEvent(aName, aProps); }, }, + MozClirModeEvent: { create: function (aName, aProps) { + return new MozClirModeEvent(aName, aProps); + }, + }, MozContactChangeEvent: { create: function (aName, aProps) { return new MozContactChangeEvent(aName, aProps); }, diff --git a/dom/mobileconnection/src/MobileConnection.cpp b/dom/mobileconnection/src/MobileConnection.cpp index 9acb9309e001..bbac80799c17 100644 --- a/dom/mobileconnection/src/MobileConnection.cpp +++ b/dom/mobileconnection/src/MobileConnection.cpp @@ -7,6 +7,7 @@ #include "GeneratedEvents.h" #include "mozilla/dom/CFStateChangeEvent.h" #include "mozilla/dom/DataErrorEvent.h" +#include "mozilla/dom/MozClirModeEvent.h" #include "mozilla/dom/MozEmergencyCbModeEvent.h" #include "mozilla/dom/MozOtaStatusEvent.h" #include "mozilla/dom/USSDReceivedEvent.h" @@ -79,6 +80,7 @@ NS_IMPL_EVENT_HANDLER(MobileConnection, emergencycbmodechange) NS_IMPL_EVENT_HANDLER(MobileConnection, otastatuschange) NS_IMPL_EVENT_HANDLER(MobileConnection, iccchange) NS_IMPL_EVENT_HANDLER(MobileConnection, radiostatechange) +NS_IMPL_EVENT_HANDLER(MobileConnection, clirmodechange) MobileConnection::MobileConnection(uint32_t aClientId) : mClientId(aClientId) @@ -733,3 +735,21 @@ MobileConnection::NotifyRadioStateChanged() return DispatchTrustedEvent(NS_LITERAL_STRING("radiostatechange")); } + +NS_IMETHODIMP +MobileConnection::NotifyClirModeChanged(uint32_t aMode) +{ + if (!CheckPermission("mobileconnection")) { + return NS_OK; + } + + MozClirModeEventInit init; + init.mBubbles = false; + init.mCancelable = false; + init.mMode = aMode; + + nsRefPtr event = + MozClirModeEvent::Constructor(this, NS_LITERAL_STRING("clirmodechange"), init); + + return DispatchTrustedEvent(event); +} diff --git a/dom/tests/mochitest/general/test_interfaces.html b/dom/tests/mochitest/general/test_interfaces.html index f835788c9c44..f9ba81b15f99 100644 --- a/dom/tests/mochitest/general/test_interfaces.html +++ b/dom/tests/mochitest/general/test_interfaces.html @@ -619,6 +619,8 @@ var interfaceNamesInGlobalScope = {name: "MozCellBroadcast", b2g: true, pref: "dom.cellbroadcast.enabled"}, // IMPORTANT: Do not change this list without review from a DOM peer! {name: "MozCellBroadcastEvent", b2g: true, pref: "dom.cellbroadcast.enabled"}, +// IMPORTANT: Do not change this list without review from a DOM peer! + {name: "MozClirModeEvent", b2g: true, pref: "dom.mobileconnection.enabled"}, // IMPORTANT: Do not change this list without review from a DOM peer! "mozContact", // IMPORTANT: Do not change this list without review from a DOM peer! From d417f48d5c815e36928a67d906bf71e1d9a2b001 Mon Sep 17 00:00:00 2001 From: Hsin-Yi Tsai Date: Thu, 24 Apr 2014 14:46:27 +0800 Subject: [PATCH 06/51] Bug 1000670 - part 4 - ril: _sendClirModeChanged. r=vicamo --- dom/system/gonk/RILContentHelper.js | 9 ++++++++- dom/system/gonk/RadioInterfaceLayer.js | 7 +++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dom/system/gonk/RILContentHelper.js b/dom/system/gonk/RILContentHelper.js index c5cdbc172d64..eb8493976d6e 100644 --- a/dom/system/gonk/RILContentHelper.js +++ b/dom/system/gonk/RILContentHelper.js @@ -108,7 +108,8 @@ const RIL_IPC_MSG_NAMES = [ "RIL:SetVoicePrivacyMode", "RIL:GetVoicePrivacyMode", "RIL:OtaStatusChanged", - "RIL:MatchMvno" + "RIL:MatchMvno", + "RIL:ClirModeChanged" ]; XPCOMUtils.defineLazyServiceGetter(this, "cpmm", @@ -1891,6 +1892,12 @@ RILContentHelper.prototype = { this.handleSimpleRequest(data.requestId, data.errorMsg, data.enabled); break; + case "RIL:ClirModeChanged": + this._deliverEvent(clientId, + "_mobileConnectionListeners", + "notifyClirModeChanged", + [data]); + break; } }, diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js index b9e5e74018c0..1b17440b068e 100644 --- a/dom/system/gonk/RadioInterfaceLayer.js +++ b/dom/system/gonk/RadioInterfaceLayer.js @@ -3489,6 +3489,11 @@ RadioInterface.prototype = { this.clientId, message); }, + _sendClirModeChanged: function(message) { + gMessageManager.sendMobileConnectionMessage("RIL:ClirModeChanged", + this.clientId, message); + }, + _updateCallingLineIdRestrictionPref: function(mode) { try { Services.prefs.setIntPref(kPrefClirModePreference, mode); @@ -3505,6 +3510,7 @@ RadioInterface.prototype = { if (response.isSetCallForward) { this._sendCfStateChanged(response); } else if (response.isSetCLIR && response.success) { + this._sendClirModeChanged(response.clirMode); this._updateCallingLineIdRestrictionPref(response.clirMode); } @@ -3535,6 +3541,7 @@ RadioInterface.prototype = { } this.workerMessenger.send("setCLIR", message, (function(response) { if (response.success) { + this._sendClirModeChanged(response.clirMode); this._updateCallingLineIdRestrictionPref(response.clirMode); } target.sendAsyncMessage("RIL:SetCallingLineIdRestriction", { From f3458d42080537d0a8b0bd77f7158ba9f3ddc45b Mon Sep 17 00:00:00 2001 From: Hsin-Yi Tsai Date: Thu, 24 Apr 2014 14:53:03 +0800 Subject: [PATCH 07/51] Bug 1000670 - part 5 - BT - impl NotifyClirModeChanged. r=echou --- dom/bluetooth/BluetoothRilListener.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dom/bluetooth/BluetoothRilListener.cpp b/dom/bluetooth/BluetoothRilListener.cpp index b4032bc6f2ff..3adcff842fad 100644 --- a/dom/bluetooth/BluetoothRilListener.cpp +++ b/dom/bluetooth/BluetoothRilListener.cpp @@ -148,6 +148,12 @@ MobileConnectionListener::NotifyRadioStateChanged() return NS_OK; } +NS_IMETHODIMP +MobileConnectionListener::NotifyClirModeChanged(uint32_t aMode) +{ + return NS_OK; +} + bool MobileConnectionListener::Listen(bool aStart) { From 4a2f1ff79a92112103d87229232c7d0d77d7dddb Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 27 Apr 2014 21:30:43 -0700 Subject: [PATCH 08/51] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/516e28f1bccf Author: Alive.Kuo Desc: Merge pull request #18636 from alivedise/bugzilla/997290_v1.5/cardview-malfunction Bug 997290 - Dismiss keyboard on cardview is opening, r=etienne ======== https://hg.mozilla.org/integration/gaia-central/rev/080710a0298e Author: Alive Kuo Desc: Bug 997290 - Dismiss keyboard on cardview is opening --- 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 8b618f4cb236..14d00a3817f2 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "b2b3191dbb2f7e3dd678325f5a79bae0957716bb", + "revision": "516e28f1bccfc762de5124e2c6aaf6b5b5f29e1f", "repo_path": "/integration/gaia-central" } From 799c9b605800820ddaca939e5f8378acb4758927 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 27 Apr 2014 21:36:12 -0700 Subject: [PATCH 09/51] 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 d29ba9fd8cf8..89c6f160ed8a 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 55758f7f3a25..133d7fcd9345 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 a6512ebdd55e..76055853604c 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 d29ba9fd8cf8..89c6f160ed8a 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 223d2f526cfd..f9eb19840e35 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 83cee2b67aae..8e30ff4d07e8 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 e45258c358b6..d4cb9c1c0940 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 e0c1496ea248..fb080d8a4b1f 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 280b3598409c..fae43d225c7a 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 dbdcefb4ec15..6cf0be225264 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 497643ceb19f..14f74e51afd6 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From a09e9c39a9c70100b2ad0f20dfe6da9471bfacb9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 27 Apr 2014 22:10:41 -0700 Subject: [PATCH 10/51] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/bb58a26fcdd0 Author: gasolin Desc: Merge pull request #18553 from gasolin/issue-973445 Bug 973445 - [settings] refactor Sound panel with AMD pattern, r=arthur ======== https://hg.mozilla.org/integration/gaia-central/rev/e98d8f7c9fc2 Author: gasolin Desc: Bug 973445 - [settings] refactor Sound panel with AMD pattern - add tone 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 14d00a3817f2..001b8e87349c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "516e28f1bccfc762de5124e2c6aaf6b5b5f29e1f", + "revision": "bb58a26fcdd0c4cff3a97bbc3e68b0fde3520e53", "repo_path": "/integration/gaia-central" } From eb67939a84200366130ba9b92690a9f776c4507f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 27 Apr 2014 22:16:18 -0700 Subject: [PATCH 11/51] 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 89c6f160ed8a..2e9d63f54de3 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 133d7fcd9345..607fee733a21 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 76055853604c..d75b7ccbda33 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 89c6f160ed8a..2e9d63f54de3 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 f9eb19840e35..a26edc307bc6 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 8e30ff4d07e8..9aa8803d55d9 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 d4cb9c1c0940..3b6dc4b396ff 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 fb080d8a4b1f..4c1277bce0cd 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 fae43d225c7a..dd74febb998a 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 6cf0be225264..799230e7fac9 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 14f74e51afd6..46f6e8517446 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From d4a558c981e6e6403922b8802a8bce8360e4f094 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 00:50:56 -0700 Subject: [PATCH 12/51] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/4896fa8ee0e8 Author: gasolin Desc: Merge pull request #18724 from gasolin/issue-997595 Bug 997595 - [NFC] Long press home button still can work while NFC is pa..., r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/e222857b8523 Author: gasolin Desc: Bug 997595 - [NFC] Long press home button still can work while NFC is pairing --- 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 001b8e87349c..3026a912ec09 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "bb58a26fcdd0c4cff3a97bbc3e68b0fde3520e53", + "revision": "4896fa8ee0e81bab58c5fea961d9b161031da3c0", "repo_path": "/integration/gaia-central" } From 392377592229dd2e60f497a66d474b6d35525a6b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 00:52:56 -0700 Subject: [PATCH 13/51] 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 2e9d63f54de3..e92f1ac5bf77 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 607fee733a21..a88f173bc103 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 d75b7ccbda33..e315d492a9a0 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 2e9d63f54de3..e92f1ac5bf77 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 a26edc307bc6..91946823ff10 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 9aa8803d55d9..58495913e7d6 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 3b6dc4b396ff..4573653c5450 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 4c1277bce0cd..5f8acc3d6011 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 dd74febb998a..a3686693424b 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 799230e7fac9..87bcd642fbc7 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 46f6e8517446..3ab921942f24 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 7cad4c0e425c57acdcac60eb0fa1558215ea1697 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 01:55:53 -0700 Subject: [PATCH 14/51] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/86b7e4dd1484 Author: Zac Desc: Bug 996252 - Change bug to enable on device, disabled on travis --- 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 3026a912ec09..77446786b70b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "4896fa8ee0e81bab58c5fea961d9b161031da3c0", + "revision": "86b7e4dd1484c316c8aad19d9765daa0fde9ba2c", "repo_path": "/integration/gaia-central" } From 4cac66d9f092c7cbed7b30907ff92b0e5b1f50ca Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 02:01:17 -0700 Subject: [PATCH 15/51] 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 e92f1ac5bf77..1a5a8948f282 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 a88f173bc103..64b69ba95fd7 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 e315d492a9a0..b8ec10109f31 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 e92f1ac5bf77..1a5a8948f282 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 91946823ff10..34e7f56e287f 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 58495913e7d6..3916926285d4 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 4573653c5450..b9317e5a129d 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 5f8acc3d6011..8fe4099a0b77 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 a3686693424b..3a5f1b73503e 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 87bcd642fbc7..5e5f034862dc 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 3ab921942f24..93778cf63f3a 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From c66a7f256202bf178ed49d47ed617db1e6ff741d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 02:10:44 -0700 Subject: [PATCH 16/51] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/06ee4e4f4005 Author: Zac Desc: Revert "Bug 968744 - Update test_receive_active_sync_email to check for incoming notification" This reverts commit a9b1de0372de40835f42fb1d027f521ab8edfacb. --- 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 77446786b70b..54c268a0af63 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "86b7e4dd1484c316c8aad19d9765daa0fde9ba2c", + "revision": "06ee4e4f400537a86bf21ac8db474dd1f56c1d26", "repo_path": "/integration/gaia-central" } From e7cff5ac3a0dd846e9f47fa248b19c81de1216e9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 02:16:21 -0700 Subject: [PATCH 17/51] 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 1a5a8948f282..02345f1d25e3 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 64b69ba95fd7..dda2e4cfe0a2 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 b8ec10109f31..82a218b013fd 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 1a5a8948f282..02345f1d25e3 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 34e7f56e287f..f1f33bfe2088 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 3916926285d4..1461c304b858 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 b9317e5a129d..fb12501e2c9f 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 8fe4099a0b77..0876e7ea7bdc 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 3a5f1b73503e..4fa7c8795294 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 5e5f034862dc..99d17583c23b 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 93778cf63f3a..aabab62b8200 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From cae3ce10c8b0ac6cf84364bc7489ed8a5fc43d28 Mon Sep 17 00:00:00 2001 From: Yoshi Huang Date: Fri, 25 Apr 2014 19:22:09 +0800 Subject: [PATCH 18/51] Bug 987596 - B2G NFC: Marionette tests for onpeerready. r=dimi From bfece1daa040d5e7e4ff965adea343831b2484c4 Mon Sep 17 00:00:00 2001 --- dom/nfc/tests/marionette/head.js | 5 +- dom/nfc/tests/marionette/manifest.ini | 1 + dom/nfc/tests/marionette/test_nfc_enabled.js | 1 - .../marionette/test_nfc_manager_tech_discovered.js | 5 +- dom/nfc/tests/marionette/test_nfc_peer.js | 64 ++++++++++++++++++++++ 5 files changed, 70 insertions(+), 6 deletions(-) create mode 100644 dom/nfc/tests/marionette/test_nfc_peer.js --- dom/nfc/tests/marionette/head.js | 5 +- dom/nfc/tests/marionette/manifest.ini | 1 + dom/nfc/tests/marionette/test_nfc_enabled.js | 1 - .../test_nfc_manager_tech_discovered.js | 5 +- dom/nfc/tests/marionette/test_nfc_peer.js | 64 +++++++++++++++++++ 5 files changed, 70 insertions(+), 6 deletions(-) create mode 100644 dom/nfc/tests/marionette/test_nfc_peer.js diff --git a/dom/nfc/tests/marionette/head.js b/dom/nfc/tests/marionette/head.js index fbe34275ba74..d7a69624c984 100644 --- a/dom/nfc/tests/marionette/head.js +++ b/dom/nfc/tests/marionette/head.js @@ -3,6 +3,10 @@ let pendingEmulatorCmdCount = 0; +let Promise = + SpecialPowers.Cu.import("resource://gre/modules/Promise.jsm").Promise; +let nfc = window.navigator.mozNfc; + SpecialPowers.addPermission("nfc-manager", true, document); /** @@ -35,7 +39,6 @@ let emulator = (function() { function toggleNFC(enabled, callback) { isnot(callback, null); - let nfc = window.navigator.mozNfc; let req; if (enabled) { req = nfc.startPoll(); diff --git a/dom/nfc/tests/marionette/manifest.ini b/dom/nfc/tests/marionette/manifest.ini index 66e4aeefdd57..1d52b2ede9ab 100644 --- a/dom/nfc/tests/marionette/manifest.ini +++ b/dom/nfc/tests/marionette/manifest.ini @@ -6,3 +6,4 @@ qemu=true [test_ndef.js] [test_nfc_enabled.js] [test_nfc_manager_tech_discovered.js] +[test_nfc_peer.js] diff --git a/dom/nfc/tests/marionette/test_nfc_enabled.js b/dom/nfc/tests/marionette/test_nfc_enabled.js index ee49beb8dfa7..a3ec741fb647 100644 --- a/dom/nfc/tests/marionette/test_nfc_enabled.js +++ b/dom/nfc/tests/marionette/test_nfc_enabled.js @@ -4,7 +4,6 @@ MARIONETTE_TIMEOUT = 30000; MARIONETTE_HEAD_JS = 'head.js'; -let nfc = window.navigator.mozNfc; function testEnableNFC() { log('Running \'testEnableNFC\''); let req = nfc.startPoll(); diff --git a/dom/nfc/tests/marionette/test_nfc_manager_tech_discovered.js b/dom/nfc/tests/marionette/test_nfc_manager_tech_discovered.js index 9a15c760ee01..23ba3d77d1f3 100644 --- a/dom/nfc/tests/marionette/test_nfc_manager_tech_discovered.js +++ b/dom/nfc/tests/marionette/test_nfc_manager_tech_discovered.js @@ -4,9 +4,6 @@ MARIONETTE_TIMEOUT = 30000; MARIONETTE_HEAD_JS = 'head.js'; -let Promise = - SpecialPowers.Cu.import("resource://gre/modules/Promise.jsm").Promise; - // See nfc-nci.h. const NCI_LAST_NOTIFICATION = 0; const NCI_LIMIT_NOTIFICATION = 1; @@ -24,7 +21,7 @@ function activateRE(re) { let cmd = 'nfc ntf rf_intf_activated ' + re; emulator.run(cmd, function(result) { - is(result.pop(), 'OK', 'check activation of RE0'); + is(result.pop(), 'OK', 'check activation of RE' + re); deferred.resolve(); }); diff --git a/dom/nfc/tests/marionette/test_nfc_peer.js b/dom/nfc/tests/marionette/test_nfc_peer.js new file mode 100644 index 000000000000..c05c9ad78096 --- /dev/null +++ b/dom/nfc/tests/marionette/test_nfc_peer.js @@ -0,0 +1,64 @@ +/* Any copyright is dedicated to the Public Domain. + http://creativecommons.org/publicdomain/zero/1.0/ */ + +MARIONETTE_TIMEOUT = 30000; +MARIONETTE_HEAD_JS = 'head.js'; + +let MANIFEST_URL = "app://system.gaiamobile.org/manifest.webapp"; + +function peerReadyCb(evt) { + log("peerReadyCb called"); + let peer = nfc.getNFCPeer(evt.detail); + ok(peer instanceof MozNFCPeer, "Should get a NFCPeer object."); + + // reset callback and NFC Hardware. + nfc.onpeerready = null; + toggleNFC(false, runNextTest); +} + +function handleTechnologyDiscoveredRE0(msg) { + log("Received \'nfc-manager-tech-discovered\'"); + is(msg.type, "techDiscovered", "check for correct message type"); + is(msg.techList[0], "P2P", "check for correct tech type"); + + nfc.onpeerready = peerReadyCb; + + let request = nfc.checkP2PRegistration(MANIFEST_URL); + request.onsuccess = function (evt) { + nfc.notifyUserAcceptedP2P(MANIFEST_URL); + } + + request.onerror = function () { + ok(false, "checkP2PRegistration failed."); + toggleNFC(false, runNextTest); + } +} + +function activateRE(re) { + let deferred = Promise.defer(); + let cmd = "nfc ntf rf_intf_activated " + re; + + emulator.run(cmd, function(result) { + is(result.pop(), "OK", "check activation of RE" + re); + deferred.resolve(); + }); + + return deferred.promise; +} + +function testPeerReady() { + window.navigator.mozSetMessageHandler( + "nfc-manager-tech-discovered", handleTechnologyDiscoveredRE0); + + toggleNFC(true, function() { + activateRE(0); + }); +} + +let tests = [ + testPeerReady +]; + +SpecialPowers.pushPermissions( + [{"type": "nfc-manager", "allow": true, context: document}, + {"type": "nfc-write", "allow": true, context: document}], runTests); From 720d3605b02b74dc66727c0240b27b993ea8519a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 02:57:57 -0700 Subject: [PATCH 19/51] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/61480b16c77e Author: Cristian Rodriguez Desc: Merge pull request #18639 from crdlc/bug-1000454 Bug 1000454 - [B2G][1.4][Gaia]: The timestamp for a file downloaded a we... ======== https://hg.mozilla.org/integration/gaia-central/rev/2ab8ec333ce1 Author: crdlc Desc: Bug 1000454 - [B2G][1.4][Gaia]: The timestamp for a file downloaded a week ago is missing on all languages --- 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 54c268a0af63..b9cc4a3cdf85 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "06ee4e4f400537a86bf21ac8db474dd1f56c1d26", + "revision": "61480b16c77ed7e8d01d2ef114adef754a4ea75c", "repo_path": "/integration/gaia-central" } From 13bb3b19053674c8bb365ec0fa456a258892b13c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 02:58:08 -0700 Subject: [PATCH 20/51] 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 02345f1d25e3..d14d6708c180 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 dda2e4cfe0a2..821b01a35a70 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 82a218b013fd..792d3638e7c6 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 02345f1d25e3..d14d6708c180 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 f1f33bfe2088..470b95ee4f31 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 1461c304b858..35d6ccc6fea8 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 fb12501e2c9f..9898e232fb37 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 0876e7ea7bdc..d0e587fffd15 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 4fa7c8795294..91ba835eb274 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 99d17583c23b..f9f597b84be6 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 aabab62b8200..891a15abf690 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 4d7500a4ac73aeeee373e678da2fad748e8c1d21 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 03:02:49 -0700 Subject: [PATCH 21/51] Bumping manifests a=b2g-bump --- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 821b01a35a70..25febc6c03bc 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -131,6 +131,6 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index f9f597b84be6..eed572a240a3 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -127,7 +127,7 @@ - + From 693922b63043d4040667a9395fa59a23b7764191 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 03:20:57 -0700 Subject: [PATCH 22/51] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/2cbef3a6df79 Author: Zac Desc: Revert "Bug 943897 - Code timeout into contacts_settings.tap_import_from_sim()" This reverts commit d17ff0ce155fabec56117be7f0f865feea929703. --- 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 b9cc4a3cdf85..5f90cab46792 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "61480b16c77ed7e8d01d2ef114adef754a4ea75c", + "revision": "2cbef3a6df79a9ec7a273c332bb62496a7e9ce28", "repo_path": "/integration/gaia-central" } From 07289b51bbe19f9b0cf37d31e4279ef950fa13e9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 03:26:19 -0700 Subject: [PATCH 23/51] 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 d14d6708c180..e9092881a8fc 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 25febc6c03bc..72e78f0b3ed5 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 792d3638e7c6..f870cc96fde0 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 d14d6708c180..e9092881a8fc 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 470b95ee4f31..9116ff1cdd5f 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 35d6ccc6fea8..b20dc62d562e 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 9898e232fb37..1c4dbc955e5c 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 d0e587fffd15..c5587686d21e 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 91ba835eb274..a95406727c10 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 eed572a240a3..5bea7fe1bf79 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 891a15abf690..f078ac673bea 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 3e9d67cb8d01dc0e6de3984a6d7ba7033fb9c46c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 04:00:55 -0700 Subject: [PATCH 24/51] 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/41346d08ce22 Author: Michał Budzyński Desc: Merge pull request #18689 from michalbe/b6527-nfc Bug #996527 - Contacts sharing fixed ======== https://hg.mozilla.org/integration/gaia-central/rev/e2114665153b Author: Michal Budzynski Desc: [BUG 996527] Contacts sharing with NFC fixed [BUG 996527] Contacts sharing with NFC fixed [BUG 996527] Contacts sharing with NFC fixed [BUG 996527] Contacts sharing with NFC fixed [BUG 996527] LazyLoading overlay elements while importing [BUG 996527] Opening contacts list instead of details after import [Bug 996527] Typo fix [Bug 996527] Open contacts detail when importing just one contact [Bug 996527] Fixing 2 more tests [Bug 996527] Typo fix & console.log [Bug 996527] VCard parsing tests repaired [GAIA] - Changed location of the files fixed [GAIA] - Removing console logs & fixing for linter [GAIA] - Final patch prepared [GAIA] - Removing unneeded code [GAIA] - Final lint fixes ======== https://hg.mozilla.org/integration/gaia-central/rev/7f478e350b13 Author: Pavel Ivanov Desc: Merge pull request #18717 from pivanov/bug-981928 Bug 981928 - Update headers with new font only ======== https://hg.mozilla.org/integration/gaia-central/rev/ab3915f41a72 Author: Pavel Ivanov Desc: Bug 981928 - Update headers with new font only --- 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 5f90cab46792..4c6b5b2ebca2 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "2cbef3a6df79a9ec7a273c332bb62496a7e9ce28", + "revision": "41346d08ce224ac612e905d469be95c48587713c", "repo_path": "/integration/gaia-central" } From f7b04da5a2cd3da2b4eb5c55c71a5690a39f01af Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 04:06:18 -0700 Subject: [PATCH 25/51] 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 e9092881a8fc..9598d4187331 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 72e78f0b3ed5..841bbd912fb3 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 f870cc96fde0..6107c17aa96d 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 e9092881a8fc..9598d4187331 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 9116ff1cdd5f..d84577039e5a 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 b20dc62d562e..114dc88ae5de 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 1c4dbc955e5c..6fb59e01734e 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 c5587686d21e..afad57b3f0a5 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 a95406727c10..0a640717a8b3 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 5bea7fe1bf79..86cee3bbefd6 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 f078ac673bea..812a94215194 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 71090e35d83cf754b43b1aa214006c40ef2e9a63 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 04:10:42 -0700 Subject: [PATCH 26/51] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/aca065d0bc5c Author: Arthur Chen Desc: Revert "Bug 973445 - [settings] refactor Sound panel with AMD pattern" This reverts commit d1822016dd04f2d34cd16e30170dba0e970bae91. --- 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 4c6b5b2ebca2..46bf79266913 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "41346d08ce224ac612e905d469be95c48587713c", + "revision": "aca065d0bc5c1243de6a294b517dd6556f4cec08", "repo_path": "/integration/gaia-central" } From f8f28ac49caf1e8989ff7264afae9e502d9efd53 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 04:12:55 -0700 Subject: [PATCH 27/51] 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 9598d4187331..210010e1ddd9 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 841bbd912fb3..d06705268a2c 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 6107c17aa96d..9b53adec76d5 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 9598d4187331..210010e1ddd9 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 d84577039e5a..5ad0e960c74f 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 114dc88ae5de..63d87cce9d71 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 6fb59e01734e..1de849bf882b 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 afad57b3f0a5..06d8e0ce6c86 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 0a640717a8b3..49de9af8e96f 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 86cee3bbefd6..bf96e8a55820 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 812a94215194..d9d508bdf2d0 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 42a1c12718735bcd7e7fa99dd3323a61c80fc2e5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 04:25:49 -0700 Subject: [PATCH 28/51] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/2783ae9769c1 Author: Borja Salguero Desc: Merge pull request #16663 from borjasalguero/ftu_tutorial Bug 976535 - FTE Tutorial refactor r=fcampo, ejchen ======== https://hg.mozilla.org/integration/gaia-central/rev/70a95f1ea1fb Author: borjasalguero Desc: Bug 976535 - [FTE] Refactor tutorial r=fcampo, ejchen --- 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 46bf79266913..f10488ab3690 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "aca065d0bc5c1243de6a294b517dd6556f4cec08", + "revision": "2783ae9769c1c7ef84b26c51983391f4bfda973c", "repo_path": "/integration/gaia-central" } From 4052a0bb4366006a4c815fe8ef7902922e234234 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 04:27:56 -0700 Subject: [PATCH 29/51] 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 210010e1ddd9..4f43f816d18f 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 d06705268a2c..bd25a33650cc 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 9b53adec76d5..c41e1581cf5a 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 210010e1ddd9..4f43f816d18f 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 5ad0e960c74f..3b428f571d42 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 63d87cce9d71..e4f9179a2bb2 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 1de849bf882b..7f2c5d41b3b1 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 06d8e0ce6c86..3fc572c4e025 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 49de9af8e96f..9ab1c85b884c 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 bf96e8a55820..243263d97065 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 d9d508bdf2d0..1b8af6b4144d 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 1b38c1117dcb69414e9989979fe5798c954f9a24 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 05:05:41 -0700 Subject: [PATCH 30/51] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/64ba8e221101 Author: Jose M. Cantera Desc: Merge pull request #18733 from jmcanterafonseca/fix_regressions_ftu Bug 1001488 - [B2G][Contacts] Unable to import SIM card contacts in Cont... ======== https://hg.mozilla.org/integration/gaia-central/rev/ef65529248e2 Author: Jose M. Cantera Desc: Bug 1001488 - [B2G][Contacts] Unable to import SIM card contacts in Contacts app or FTU --- 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 f10488ab3690..64c0e8a49a26 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "2783ae9769c1c7ef84b26c51983391f4bfda973c", + "revision": "64ba8e221101fddf919daeca272a7a36f277657b", "repo_path": "/integration/gaia-central" } From b247cbcaae7b2e757be973cc215ff487eb9fafef Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 05:11:36 -0700 Subject: [PATCH 31/51] 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 4f43f816d18f..f27374007cc2 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 bd25a33650cc..b3631dddfe22 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 c41e1581cf5a..9e8d226c25c1 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 4f43f816d18f..f27374007cc2 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 3b428f571d42..039eedd1af78 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 e4f9179a2bb2..0c0abc493dc2 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 7f2c5d41b3b1..2ef3bf42532f 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 3fc572c4e025..a10efc008880 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 9ab1c85b884c..365cebeb6c98 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 243263d97065..9afb0359a9bc 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 1b8af6b4144d..04ca34bab068 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From c0946886b3eea2bb59d49e8464f8d966aa7b0f23 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 05:46:01 -0700 Subject: [PATCH 32/51] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/93cee70be62a Author: Zac Desc: Revert "Bug 1002342 - Update test_setup_and_send_imap_email.py to check for incoming notification" This reverts commit f9bae4e2b852ac1e7a9d7a0f8d7e2624238575e9. ======== https://hg.mozilla.org/integration/gaia-central/rev/bec4ead124de Author: Florin Strugariu Desc: Merge pull request #18726 from askeing/bug_1002342 Bug 1002342 - Update test_setup_and_send_imap_email.py to check for inco... ======== https://hg.mozilla.org/integration/gaia-central/rev/cf7390d66666 Author: askeing Desc: Bug 1002342 - Update test_setup_and_send_imap_email.py to check for incoming notification --- 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 64c0e8a49a26..07c04d79fdce 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "64ba8e221101fddf919daeca272a7a36f277657b", + "revision": "93cee70be62a9f5ab879de8fe1d74f5d919667ae", "repo_path": "/integration/gaia-central" } From cee5f0a601da8541533c876d3bbdaf3498117a86 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 05:51:25 -0700 Subject: [PATCH 33/51] 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 f27374007cc2..7a554f986f69 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 b3631dddfe22..e03a2f21d31a 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 9e8d226c25c1..d40451ccdbbb 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 f27374007cc2..7a554f986f69 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 039eedd1af78..2f74d7fcd9e1 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 0c0abc493dc2..806600904b98 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 2ef3bf42532f..994e5d7f62da 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 a10efc008880..6deabfa8c0a2 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 365cebeb6c98..7d5902e1e21e 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 9afb0359a9bc..b82e57d6c260 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 04ca34bab068..f9624cc21682 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 1f0d92c02207ddc7bae3480a760f39d23b6f7d5a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 06:00:51 -0700 Subject: [PATCH 34/51] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/ee24e7b95fbd Author: Ben Tian Desc: Merge pull request #18674 from bentian/bug-997578 Bug 997578 - Answer incoming call after hanging up active call, r=etienne, a=1.4+ ======== https://hg.mozilla.org/integration/gaia-central/rev/5b8cc0be2994 Author: Ben Tian Desc: Bug 997578 - Answer incoming call after hanging up active call, a=1.4+ ======== https://hg.mozilla.org/integration/gaia-central/rev/43ec83565718 Author: Etienne Segonzac Desc: Merge pull request #18542 from etiennesegonzac/bug-992081-edge-overlay Bug 992081 - Adding an indentification overlay while swiping sheets r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/1f9d7d72475d Author: Etienne Segonzac Desc: Bug 992081 - Adding an indentification overlay while swiping sheets and hardening the edge gesture. --- 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 07c04d79fdce..5aa2b98b7b66 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "93cee70be62a9f5ab879de8fe1d74f5d919667ae", + "revision": "ee24e7b95fbddf848f9f34becfe878025b6fd8af", "repo_path": "/integration/gaia-central" } From 146c01beddee352ba597c7a1c304de565536f44e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 06:06:18 -0700 Subject: [PATCH 35/51] 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 7a554f986f69..59e419ca932e 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 e03a2f21d31a..5107b6b08d1a 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 d40451ccdbbb..b5667bacb7fe 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 7a554f986f69..59e419ca932e 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 2f74d7fcd9e1..3a06d8b43c35 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 806600904b98..a27c5dcab857 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 994e5d7f62da..10af057fb57d 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 6deabfa8c0a2..1db8ec901d4e 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 7d5902e1e21e..257d1d22b358 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 b82e57d6c260..09d4a28b8b2e 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 f9624cc21682..e632bb629cc4 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 39aab45e2a2a009acb2db3bc1d05d6239e02ce77 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 06:40:49 -0700 Subject: [PATCH 36/51] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/0d2050d7a2bd Author: Anthony Ricaud Desc: Revert "Merge pull request #18505 from zbraniecki/999195-cleanup-mozl10n-emergency-call" - Missing new tests - Not reviewed by a peer This reverts commit b64555b9ed961923b923239e96f87d6ba83cf951, reversing changes made to 18fd4d436797ede7503cd753a22b5a9804282042. ======== https://hg.mozilla.org/integration/gaia-central/rev/809fa3e59c03 Author: Arnau Desc: Merge pull request #18572 from rnowm/963021 Bug 963021 - [Messages][Refresh] Add CSS tweaks for SMS based on new List component from BB r=borja ======== https://hg.mozilla.org/integration/gaia-central/rev/802ac370ee4f Author: rnowm Desc: Bug 963021 - [Messages][Refresh] Add CSS tweaks for SMS based on new List component from BB --- 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 5aa2b98b7b66..e912848434ac 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "ee24e7b95fbddf848f9f34becfe878025b6fd8af", + "revision": "0d2050d7a2bd59813b94609d080669d2ed233501", "repo_path": "/integration/gaia-central" } From 23bf48a27ed14f6532426ff9a13b01dc518ce045 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 06:46:21 -0700 Subject: [PATCH 37/51] 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 59e419ca932e..cc4d792f7e46 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 5107b6b08d1a..baca2a51d08e 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 b5667bacb7fe..647bd6cd3b90 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 59e419ca932e..cc4d792f7e46 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 3a06d8b43c35..33f6b4cae0ac 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 a27c5dcab857..d884173d498d 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 10af057fb57d..8f2e0850e544 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 1db8ec901d4e..1a1322c3fd16 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 257d1d22b358..45255665b178 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 09d4a28b8b2e..28538175ca99 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 e632bb629cc4..d5ce950606ef 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 03979c8ef53d0aec3aeeb3d9432c6a11fbe630be Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 08:31:03 -0700 Subject: [PATCH 38/51] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e86435253b1f Author: Arnau Desc: Merge pull request #17888 from rnowm/991006 Bug 963019 - [Building Blocks] [Refresh] Update styles of 'List' component r=joan ======== https://hg.mozilla.org/integration/gaia-central/rev/341c3d874808 Author: rnowm Desc: Bug 963019 - [Building Blocks] [Refresh] Update styles of 'List' component --- 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 e912848434ac..a8121ace5c5d 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "0d2050d7a2bd59813b94609d080669d2ed233501", + "revision": "e86435253b1f6476b8bcc4fd4ff3229469a2c622", "repo_path": "/integration/gaia-central" } From fc67a9f9018c964f14f208260f31371712ff1cb5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 08:36:21 -0700 Subject: [PATCH 39/51] 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 cc4d792f7e46..6d256f0b385f 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 baca2a51d08e..0b0270c73822 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 647bd6cd3b90..bfd9a31acb58 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 cc4d792f7e46..6d256f0b385f 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 33f6b4cae0ac..ac599abcb46f 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 d884173d498d..e91ac915ead0 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 8f2e0850e544..4ba81a1a4ada 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 1a1322c3fd16..8620ea86748c 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 45255665b178..c06a523cf271 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 28538175ca99..67747e8262ef 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 d5ce950606ef..325b6ea6efbf 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 0d815cc6c9d307eba5df874c4957b2fc6c9e0d06 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 08:40:57 -0700 Subject: [PATCH 40/51] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/202b338d057c Author: Ben Francis Desc: Merge pull request #18085 from rnowm/987791 Bug 987791 - [Browser] is not using action menu [BB] r=benfrancis ======== https://hg.mozilla.org/integration/gaia-central/rev/b8833f4524a8 Author: rnowm Desc: Bug 987791 - [Browser] is not using action menu [BB] ======== https://hg.mozilla.org/integration/gaia-central/rev/573937ba1dfa Author: Arnau Desc: Merge pull request #17756 from rnowm/987061 Bug 987061 - [Dialer] Switch Tab bar to the new proposal r=rik ======== https://hg.mozilla.org/integration/gaia-central/rev/30de5a49fc06 Author: rnowm Desc: Bug 987061 - [Dialer] Switch Tab bar to the new proposal --- 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 a8121ace5c5d..4dc55af8952a 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "e86435253b1f6476b8bcc4fd4ff3229469a2c622", + "revision": "202b338d057c509b579e1289045c8cd4051af6b9", "repo_path": "/integration/gaia-central" } From c37a6c7dbfe4f1906bfe85241b6aa3bd7f6c69d9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 08:46:24 -0700 Subject: [PATCH 41/51] 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 6d256f0b385f..2196be845d2d 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 0b0270c73822..354ffa4e2071 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 bfd9a31acb58..859c3a91d0d0 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 6d256f0b385f..2196be845d2d 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 ac599abcb46f..0d0c678a4d8d 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 e91ac915ead0..4c6030a10f9a 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 4ba81a1a4ada..6d1c67d0a8d7 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 8620ea86748c..a36550c933ec 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 c06a523cf271..f1c35e3678f1 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 67747e8262ef..fdbd15aa9e16 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 325b6ea6efbf..d4232538377c 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 00f281aaebc3b5d0866681e8c7b222df55a9bd7b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 09:20:42 -0700 Subject: [PATCH 42/51] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/6ae2e8171573 Author: Julien Wajsberg Desc: Merge pull request #18646 from julienw/999553-reenable-most-disabled-unit-tests-disable-render-test Bug 999553 - Reenable most disabled unit tests on TBPL r=jgriffin ======== https://hg.mozilla.org/integration/gaia-central/rev/6350b731227b Author: Julien Wajsberg Desc: Bug 999553 - Reenable most disabled unit tests on TBPL r=jgriffin --- 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 4dc55af8952a..9b3bb344eab4 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "202b338d057c509b579e1289045c8cd4051af6b9", + "revision": "6ae2e81715735d3cb1d974e5451b76e90cc697c5", "repo_path": "/integration/gaia-central" } From 50c1a4bf3c07c611e79b06217ef224ac59e53251 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 09:26:11 -0700 Subject: [PATCH 43/51] 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 2196be845d2d..d7a2a6bb4bc6 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 354ffa4e2071..7d1bd86fef2c 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 859c3a91d0d0..450250650960 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 2196be845d2d..d7a2a6bb4bc6 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 0d0c678a4d8d..8490eedc28fb 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 4c6030a10f9a..e6273c73c13d 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 6d1c67d0a8d7..8f3fe3e41e5a 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 a36550c933ec..c5315dc89701 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 f1c35e3678f1..1876ee8b6541 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 fdbd15aa9e16..43f6377fdf6a 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 d4232538377c..99b7161acf67 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 1bc518221d2ee8870d6f7163e75396b2c29587bb Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 09:35:47 -0700 Subject: [PATCH 44/51] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/0b5ae2b554bc Author: Bob Silverberg Desc: Merge pull request #18651 from bobsilverberg/b2g_start_v1.3 Bug 1000334 - Adjust b2g_start to work for v1.3 as well ======== https://hg.mozilla.org/integration/gaia-central/rev/be191de20706 Author: Bob Silverberg Desc: Bug 1000334 - Adjust b2g_start to work for v1.3 as well --- 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 9b3bb344eab4..278e4f4798e3 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "6ae2e81715735d3cb1d974e5451b76e90cc697c5", + "revision": "0b5ae2b554bcc93ab5bb106237e3e89ec421c825", "repo_path": "/integration/gaia-central" } From d881945748b89f29ae951a7c43bad8e3841a071b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 09:41:20 -0700 Subject: [PATCH 45/51] 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 d7a2a6bb4bc6..b32443c1eb45 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 7d1bd86fef2c..c05ed8ef4329 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 450250650960..89875c81464b 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 d7a2a6bb4bc6..b32443c1eb45 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 8490eedc28fb..8c482542c12e 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 e6273c73c13d..502e3df3cefa 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 8f3fe3e41e5a..6cf7333be3a0 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 c5315dc89701..79f351eff3cb 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 1876ee8b6541..9b48eaf780bf 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 43f6377fdf6a..83d057155ae0 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 99b7161acf67..021ddb7c1425 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 74f00776ca5cad520b19f3a984abf8618a92ddeb Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 09:50:42 -0700 Subject: [PATCH 46/51] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/9b67bad6fa29 Author: Florin Strugariu Desc: Merge pull request #18747 from zacc/bug_1002465 Bug 1002465 - test_browser_play_you_tube.py - wait for the elements to b... ======== https://hg.mozilla.org/integration/gaia-central/rev/17d568aee703 Author: Zac Desc: Bug 1002465 - test_browser_play_you_tube.py - wait for the elements to be displayed rather than present ======== https://hg.mozilla.org/integration/gaia-central/rev/ae592f432406 Author: Kevin Grandon Desc: Merge pull request #18720 from KevinGrandon/bug_1002247_system2_app_authentication_dialog Bug 1002247 - [System2] AppAuthenticationDialog fixes r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/a0409f14c138 Author: Kevin Grandon Desc: Bug 1002247 - [System2] AppAuthenticationDialog fixes r=alive --- 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 278e4f4798e3..66f7d4d638b7 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "0b5ae2b554bcc93ab5bb106237e3e89ec421c825", + "revision": "9b67bad6fa290b5fc460342a23dbeadfe9f2860d", "repo_path": "/integration/gaia-central" } From 71f39678f2071eee6180e367f43634315a4d0d82 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 09:56:34 -0700 Subject: [PATCH 47/51] 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 b32443c1eb45..9db221dd5bde 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 c05ed8ef4329..21582ca9af09 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 89875c81464b..5cd1a99feea0 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 b32443c1eb45..9db221dd5bde 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 8c482542c12e..9d77a796fbb4 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 502e3df3cefa..b0af95427a8d 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 6cf7333be3a0..77a2f032143a 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 79f351eff3cb..41e6dad3898f 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 9b48eaf780bf..b98c59de6373 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 83d057155ae0..df2a2e8b4fbe 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 021ddb7c1425..eb533f92cdb1 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 26535ed34da5f47f426c685396eed82f8b218b60 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 10:00:42 -0700 Subject: [PATCH 48/51] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/57cb6d635bad Author: Borja Salguero Desc: Merge pull request #16572 from borjasalguero/composer_flex Bug 949457 - Make Compose into a flex layout r=julienw ======== https://hg.mozilla.org/integration/gaia-central/rev/d5824ae76962 Author: borjasalguero Desc: Bug 949457 - Make Compose into a flex layout r=julienw --- 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 66f7d4d638b7..4a85edf9da95 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "9b67bad6fa290b5fc460342a23dbeadfe9f2860d", + "revision": "57cb6d635bad22cfab52e55c9987cfd8370fc8cd", "repo_path": "/integration/gaia-central" } From e92011dd20e9af2774b8dc4bb78c71b3f47d8ff6 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 10:06:37 -0700 Subject: [PATCH 49/51] 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 9db221dd5bde..d8dcd5f4b767 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 21582ca9af09..f20f3c54c88e 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 5cd1a99feea0..28ef4a43dd16 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 9db221dd5bde..d8dcd5f4b767 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 9d77a796fbb4..2162b975f5f0 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 b0af95427a8d..7cc7e458ee2c 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 77a2f032143a..eddd434d27bd 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 41e6dad3898f..69363a337a4d 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 b98c59de6373..9931950c9828 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 df2a2e8b4fbe..4aa4bbf738c3 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 eb533f92cdb1..3cb355a688d9 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 06c557dfde85e7930e83a1be5b11f183d43eb39e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 12:20:52 -0700 Subject: [PATCH 50/51] 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/e15140483023 Author: Ghislain 'Aus' Lacroix Desc: Merge pull request #18698 from nullaus/bug999511 bug 999511 ======== https://hg.mozilla.org/integration/gaia-central/rev/a138fd9f4470 Author: Ghislain 'Aus' Lacroix Desc: bug 999511 * Do not use gecko provided title if it contains the origin of the URL of the application. r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/99f2208b05c3 Author: Staś Małolepszy Desc: Merge pull request #18746 from stasm/1001453-wappush-once Bug 1001453 - Clean up bootstrap mozL10n API use in Wappush. r=gsvelto ======== https://hg.mozilla.org/integration/gaia-central/rev/e7da444b4ea9 Author: Staś Małolepszy Desc: Bug 1001453 - Clean up bootstrap mozL10n API use in Wappush. r=gsvelto --- 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 4a85edf9da95..f8bd68a518dc 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "57cb6d635bad22cfab52e55c9987cfd8370fc8cd", + "revision": "e151404830232e385c41d5fce72277c0e719419a", "repo_path": "/integration/gaia-central" } From 3aa574f99aed7d621e1d99bf42f7b8d99e0be091 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 28 Apr 2014 12:26:17 -0700 Subject: [PATCH 51/51] 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 d8dcd5f4b767..2693380d9275 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 f20f3c54c88e..1be8d43aca12 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 28ef4a43dd16..cc1ee0df4d27 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 d8dcd5f4b767..2693380d9275 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 2162b975f5f0..273e23a9095a 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 7cc7e458ee2c..4490dfe244f5 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 eddd434d27bd..68056a320e77 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 69363a337a4d..9466a8d513e0 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 9931950c9828..8be2e3894c9b 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 4aa4bbf738c3..21c8794dffda 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 3cb355a688d9..25e6d662cf6b 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - +