From 3b5a0521bb84f32dd5309bb14c593a5a485d8482 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 7 Nov 2013 03:00:25 -0800 Subject: [PATCH 01/21] Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/ff441a0d4a18 Author: Fabien Cazenave Desc: Merge pull request #13215 from soumyakanti/solution_bug_930165 Bug 930165 - Fix translation of Fixed dialling numbers, r=kaze ======== https://hg.mozilla.org/integration/gaia-central/rev/79f530abd5ab Author: Soumya Kanti Chakraborty Desc: Bug 930165 - Fix translation of Fixed dialling numbers across the locales ======== https://hg.mozilla.org/integration/gaia-central/rev/a10480e71313 Author: Fabien Cazenave Desc: Merge pull request #13122 from pivanov/bug-917860 Bug 917860 - [System] Use Full Line Highlights in notifications, r=kaze ======== https://hg.mozilla.org/integration/gaia-central/rev/afe33eb9b8ce Author: Pavel Ivanov Desc: Bug 917860 - [System] Use Full Line Highlights in notifications --- 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 398bdddfad1..61b6cf575a7 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "207a81a6816b8627674a956b521772de2ac6b572", + "revision": "ff441a0d4a1834ce864ff8cc124ad13af2d08212", "repo_path": "/integration/gaia-central" } From fbcde6c03cff8a527a61443f1de6e38eb51ca30e Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 7 Nov 2013 03:10:25 -0800 Subject: [PATCH 02/21] Bumping gaia.json for 4 gaia-central 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/555f1a2b8526 Author: Fernando Rodríguez Sela Desc: Merge pull request #13341 from frsela/STK/Bug932712 Bug 932712 - [STK] There is a grey line on top of the menu, r=kaze ======== https://hg.mozilla.org/integration/gaia-central/rev/7e9020cd182f Author: Fernando Rodriguez Sela Desc: Bug 932712 - [STK] There is a grey line on top of the menu ======== https://hg.mozilla.org/integration/gaia-central/rev/44ecb2d47e87 Author: Fabien Cazenave Desc: Merge pull request #13214 from soumyakanti/solution Bug 931640 - Fix translation of Reset PIN2 Code across the locales, r=kaze ======== https://hg.mozilla.org/integration/gaia-central/rev/740cfdf543e2 Author: Soumya Kanti Chakraborty Desc: Bug 931640 - Fix translation of Reset PIN2 Code across the locales --- 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 61b6cf575a7..1607811c91a 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "ff441a0d4a1834ce864ff8cc124ad13af2d08212", + "revision": "555f1a2b85262e510dc6d1796a70d1d6c822687d", "repo_path": "/integration/gaia-central" } From 4e8100e2f94060a2ca3e0ef4f835660f7cff32f0 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 7 Nov 2013 03:35:25 -0800 Subject: [PATCH 03/21] Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/750af680e476 Author: Gabriele Svelto Desc: Bug 922569 - Fix DTMF tone length when in long mode r=etienne --- 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 1607811c91a..c7fb250be06 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "555f1a2b85262e510dc6d1796a70d1d6c822687d", + "revision": "750af680e476ae19d425c34eb8e550e01bd2b8bf", "repo_path": "/integration/gaia-central" } From e76f8e624bccf02faace981b53838966083793b4 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 7 Nov 2013 04:10:25 -0800 Subject: [PATCH 04/21] Bumping gaia.json for 2 gaia-central 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/098aa4a51430 Author: Fernando Rodríguez Sela Desc: Merge pull request #13025 from frsela/STK/Bug928580 Bug 928580 - STK: No terminal response sent for DTMF for no alphaId case, r=timdream ======== https://hg.mozilla.org/integration/gaia-central/rev/577c2fab4db9 Author: Fernando Rodriguez Sela Desc: Bug 928580 - STK: No terminal response sent for DTMF for no alphaId case --- 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 c7fb250be06..e437f29205f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "750af680e476ae19d425c34eb8e550e01bd2b8bf", + "revision": "098aa4a51430eccd84bff899e06607ea25d43585", "repo_path": "/integration/gaia-central" } From 8b079a2f97ac7dca522f97bd9c391d6516819987 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 7 Nov 2013 05:20:24 -0800 Subject: [PATCH 05/21] Bumping gaia.json for 2 gaia-central 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/75fc326793d1 Author: Fernando Rodríguez Sela Desc: Merge pull request #13056 from frsela/STK/Bug928581 Bug 928581 - STK: Tone plays forever when missing alphaId, r=kaze ======== https://hg.mozilla.org/integration/gaia-central/rev/7058492c407d Author: Fernando Rodriguez Sela Desc: Bug 928581 - STK: Tone plays forever when missing alphaId --- 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 e437f29205f..de37b07523c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "098aa4a51430eccd84bff899e06607ea25d43585", + "revision": "75fc326793d1b83af5972e6bc639d937f5bf4c4b", "repo_path": "/integration/gaia-central" } From 8af33ec9f0e28bdd453ef270692a5ffeaa4472ba Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 7 Nov 2013 05:30:24 -0800 Subject: [PATCH 06/21] Bumping gaia.json for 4 gaia-central 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/172a3533ef8f Author: Fernando Rodríguez Sela Desc: Merge pull request #12965 from frsela/STK/Bug928582 Bug 928582 - STK: No terminal response sent for PLAY_TONE and tone plays forever when missing DURATION, r=kaze ======== https://hg.mozilla.org/integration/gaia-central/rev/c2d1a1498b0c Author: Fernando Rodríguez Sela Desc: Bug 928582 - STK: No terminal response sent for PLAY_TONE and tone plays forever when missing DURATION ======== https://hg.mozilla.org/integration/gaia-central/rev/6377f47a454e Author: Fernando Rodríguez Sela Desc: Merge pull request #13343 from frsela/STK/Bug920983 Bug 920983 - [Buri][STK] After entering second layer menu and press backkey, or after enabling or canceling one service, it won't go back to first layer of the menu but to Settings., r=kaze ======== https://hg.mozilla.org/integration/gaia-central/rev/131d9a5bb828 Author: Fernando Rodriguez Sela Desc: Bug 920983 - [Buri][STK] After entering second layer menu and press back key, or after enabling or canceling one service, it won't go back to first layer of the menu but to Settings. --- 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 de37b07523c..3e906eb53e4 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "75fc326793d1b83af5972e6bc639d937f5bf4c4b", + "revision": "172a3533ef8fe66bca29f4cb2086d5a750c759a6", "repo_path": "/integration/gaia-central" } From eaf6a1be7e39489689158ca016c8c8378fb04bc8 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 7 Nov 2013 05:45:24 -0800 Subject: [PATCH 07/21] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/11436e5bd29b Author: Francisco Borja Salguero Castellano Desc: Merge pull request #13470 from borjasalguero/bug_mimetype_ringtone Bug 935411 - [Single Variant] The device does not ring when receiving a ... ======== https://hg.mozilla.org/integration/gaia-central/rev/38284870d692 Author: borjasalguero Desc: Bug 935411 - [Single Variant] The device does not ring when receiving a call after being configured with single variant r=albert --- 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 3e906eb53e4..9bdf00f8364 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "172a3533ef8fe66bca29f4cb2086d5a750c759a6", + "revision": "11436e5bd29bff4383dfdc89a2ca1028c905f1bc", "repo_path": "/integration/gaia-central" } From 9b7d9146a9e8dbaa24a921440c797096fdc99cb8 Mon Sep 17 00:00:00 2001 From: Kevin Grandon Date: Tue, 15 Oct 2013 12:57:27 -0700 Subject: [PATCH 08/21] Bug 921637 - Move activities so gaia can consume them in any environment. r=sicking --- browser/confvars.sh | 2 ++ browser/installer/package-manifest.in | 13 +++++++++++++ configure.in | 8 ++++++++ 3 files changed, 23 insertions(+) diff --git a/browser/confvars.sh b/browser/confvars.sh index 1f2a0dcad12..de7436f12d1 100755 --- a/browser/confvars.sh +++ b/browser/confvars.sh @@ -61,5 +61,7 @@ fi MOZ_WEBGL_CONFORMANT=1 # Enable navigator.mozPay MOZ_PAY=1 +# Enable activities. These are used for FxOS developers currently. +MOZ_ACTIVITIES=1 MOZ_JSDOWNLOADS=1 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index c6249313dde..75195c7e30b 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -521,6 +521,19 @@ @BINPATH@/components/TCPSocketParentIntermediary.js @BINPATH@/components/TCPSocket.manifest +#ifdef MOZ_ACTIVITIES +@BINPATH@/components/SystemMessageInternal.js +@BINPATH@/components/SystemMessageManager.js +@BINPATH@/components/SystemMessageManager.manifest + +@BINPATH@/components/Activities.manifest +@BINPATH@/components/ActivityOptions.js +@BINPATH@/components/ActivityProxy.js +@BINPATH@/components/ActivityRequestHandler.js +@BINPATH@/components/ActivityWrapper.js +@BINPATH@/components/ActivityMessageConfigurator.js +#endif + @BINPATH@/components/Payment.js @BINPATH@/components/PaymentFlowInfo.js @BINPATH@/components/PaymentRequestInfo.js diff --git a/configure.in b/configure.in index f135c6475bb..d9b50607a63 100644 --- a/configure.in +++ b/configure.in @@ -7360,6 +7360,14 @@ if test -n "$MOZ_PAY"; then fi AC_SUBST(MOZ_PAY) +dnl ======================================================== +dnl = Enable Browser Support for Activities +dnl ======================================================== +if test -n "$MOZ_ACTIVITIES"; then + AC_DEFINE(MOZ_ACTIVITIES) +fi +AC_SUBST(MOZ_ACTIVITIES) + dnl ======================================================== dnl = Enable Support for AudioChannelManager API dnl ======================================================== From 08571f6defdda512c833249e2bac029c3142f772 Mon Sep 17 00:00:00 2001 From: Yuan Xulei Date: Thu, 7 Nov 2013 09:02:25 -0500 Subject: [PATCH 09/21] Bug 932151 - Include forms.js in both desktop and b2g build. r=fabrice --HG-- rename : b2g/chrome/content/forms.js => dom/inputmethod/forms.js --- b2g/chrome/jar.mn | 1 - dom/browser-element/BrowserElementChild.js | 7 ++- dom/inputmethod/Keyboard.jsm | 44 ++++++++++--------- .../content => dom/inputmethod}/forms.js | 0 dom/inputmethod/jar.mn | 6 +++ dom/ipc/preload.js | 8 +++- 6 files changed, 43 insertions(+), 23 deletions(-) rename {b2g/chrome/content => dom/inputmethod}/forms.js (100%) create mode 100644 dom/inputmethod/jar.mn diff --git a/b2g/chrome/jar.mn b/b2g/chrome/jar.mn index 1514f481cc9..c8c344be72d 100644 --- a/b2g/chrome/jar.mn +++ b/b2g/chrome/jar.mn @@ -10,7 +10,6 @@ chrome.jar: content/arrow.svg (content/arrow.svg) * content/dbg-browser-actors.js (content/dbg-browser-actors.js) - content/forms.js (content/forms.js) * content/settings.js (content/settings.js) * content/shell.html (content/shell.html) * content/shell.js (content/shell.js) diff --git a/dom/browser-element/BrowserElementChild.js b/dom/browser-element/BrowserElementChild.js index 3020e8aa99d..e855a9a493d 100644 --- a/dom/browser-element/BrowserElementChild.js +++ b/dom/browser-element/BrowserElementChild.js @@ -24,9 +24,14 @@ docShell.setFullscreenAllowed(infos.fullscreenAllowed); if (!('BrowserElementIsPreloaded' in this)) { + try { + if (Services.prefs.getBoolPref("dom.mozInputMethod.enabled")) { + Services.scriptloader.loadSubScript("chrome://global/content/forms.js", global); + } + } catch (e) { + } // Those are produc-specific files that's sometimes unavailable. try { - Services.scriptloader.loadSubScript("chrome://browser/content/forms.js"); Services.scriptloader.loadSubScript("chrome://browser/content/ErrorPage.js"); } catch (e) { } diff --git a/dom/inputmethod/Keyboard.jsm b/dom/inputmethod/Keyboard.jsm index f99acde1543..98f5cab3dbc 100644 --- a/dom/inputmethod/Keyboard.jsm +++ b/dom/inputmethod/Keyboard.jsm @@ -9,7 +9,7 @@ this.EXPORTED_SYMBOLS = ['Keyboard']; const Cu = Components.utils; const Cc = Components.classes; const Ci = Components.interfaces; -const kFormsFrameScript = 'chrome://browser/content/forms.js'; +const kFormsFrameScript = 'chrome://global/content/forms.js'; Cu.import('resource://gre/modules/Services.jsm'); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); @@ -64,27 +64,31 @@ this.Keyboard = { ppmm.broadcastAsyncMessage('Keyboard:FocusChange', { 'type': 'blur' }); } } else { - mm.addMessageListener('Forms:Input', this); - mm.addMessageListener('Forms:SelectionChange', this); - mm.addMessageListener('Forms:GetText:Result:OK', this); - mm.addMessageListener('Forms:GetText:Result:Error', this); - mm.addMessageListener('Forms:SetSelectionRange:Result:OK', this); - mm.addMessageListener('Forms:ReplaceSurroundingText:Result:OK', this); - mm.addMessageListener('Forms:SendKey:Result:OK', this); - mm.addMessageListener('Forms:SequenceError', this); - mm.addMessageListener('Forms:GetContext:Result:OK', this); - mm.addMessageListener('Forms:SetComposition:Result:OK', this); - mm.addMessageListener('Forms:EndComposition:Result:OK', this); + this.initFormsFrameScript(mm); + } + }, - // When not running apps OOP, we need to load forms.js here since this - // won't happen from dom/ipc/preload.js - try { - if (Services.prefs.getBoolPref("dom.ipc.tabs.disabled") === true) { - mm.loadFrameScript(kFormsFrameScript, true); - } - } catch (e) { - dump('Error loading ' + kFormsFrameScript + ' as frame script: ' + e + '\n'); + initFormsFrameScript: function(mm) { + mm.addMessageListener('Forms:Input', this); + mm.addMessageListener('Forms:SelectionChange', this); + mm.addMessageListener('Forms:GetText:Result:OK', this); + mm.addMessageListener('Forms:GetText:Result:Error', this); + mm.addMessageListener('Forms:SetSelectionRange:Result:OK', this); + mm.addMessageListener('Forms:ReplaceSurroundingText:Result:OK', this); + mm.addMessageListener('Forms:SendKey:Result:OK', this); + mm.addMessageListener('Forms:SequenceError', this); + mm.addMessageListener('Forms:GetContext:Result:OK', this); + mm.addMessageListener('Forms:SetComposition:Result:OK', this); + mm.addMessageListener('Forms:EndComposition:Result:OK', this); + + // When not running apps OOP, we need to load forms.js here since this + // won't happen from dom/ipc/preload.js + try { + if (Services.prefs.getBoolPref("dom.ipc.tabs.disabled") === true) { + mm.loadFrameScript(kFormsFrameScript, true); } + } catch (e) { + dump('Error loading ' + kFormsFrameScript + ' as frame script: ' + e + '\n'); } }, diff --git a/b2g/chrome/content/forms.js b/dom/inputmethod/forms.js similarity index 100% rename from b2g/chrome/content/forms.js rename to dom/inputmethod/forms.js diff --git a/dom/inputmethod/jar.mn b/dom/inputmethod/jar.mn new file mode 100644 index 00000000000..e5a38a6d510 --- /dev/null +++ b/dom/inputmethod/jar.mn @@ -0,0 +1,6 @@ +# 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/. + +toolkit.jar: + content/global/forms.js (forms.js) diff --git a/dom/ipc/preload.js b/dom/ipc/preload.js index ace0263c6ee..b54faf76ca6 100644 --- a/dom/ipc/preload.js +++ b/dom/ipc/preload.js @@ -87,9 +87,15 @@ const BrowserElementIsPreloaded = true; } catch(e) { } + try { + if (Services.prefs.getBoolPref("dom.mozInputMethod.enabled")) { + Services.scriptloader.loadSubScript("chrome://global/content/forms.js", global); + } + } catch (e) { + } + // Those are produc-specific files that's sometimes unavailable. try { - Services.scriptloader.loadSubScript("chrome://browser/content/forms.js", global); Services.scriptloader.loadSubScript("chrome://browser/content/ErrorPage.js", global); } catch (e) { } From 469a7fce02e88dc57dbf79297a7ddfaf7c076c0c Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 7 Nov 2013 06:20:24 -0800 Subject: [PATCH 10/21] Bumping gaia.json for 5 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/1e5d4d5346c7 Author: Trif Andrei-Alin Desc: Merge pull request #12976 from viorelaioia/bug_927131 Bug 927131 - Add an automated test to verify that you can import contacts from Gmail ======== https://hg.mozilla.org/integration/gaia-central/rev/6aad2e2719fa Author: Viorela Ioia Desc: Bug 927131 - Add an automated test to verify that you can import contacts from Gmail ======== https://hg.mozilla.org/integration/gaia-central/rev/0b4541c4a3df Author: Zac Desc: Merge pull request #13294 from bebef1987/UI-tests Bug 927870 - Neaten up UI Tests app's app object ======== https://hg.mozilla.org/integration/gaia-central/rev/eca8e33717fc Author: Bebe Desc: Bug 927870 - Neaten up UI Tests app's app object ======== https://hg.mozilla.org/integration/gaia-central/rev/366b1aa665ca Author: Ben Kelly Desc: Bug 924565 - Use Applications.installedApps in gaiatest. r=dhunt --- 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 9bdf00f8364..3a43b3b1423 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "11436e5bd29bff4383dfdc89a2ca1028c905f1bc", + "revision": "1e5d4d5346c7c79821a77a63b0a22db642f32795", "repo_path": "/integration/gaia-central" } From a17c383ec11a8e6dc94a897029a84581c770db59 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 7 Nov 2013 06:30:25 -0800 Subject: [PATCH 11/21] Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/b872f0d2ae22 Author: Zac Desc: Merge pull request #13428 from AndreiH/bug935433 Bug 935433 - Merge test_clock_all_items_present_new_alarm assertions int... ======== https://hg.mozilla.org/integration/gaia-central/rev/f125dfaab5e7 Author: Andrei Hutusoru Desc: Bug 935433 - Merge test_clock_all_items_present_new_alarm assertions into existing tests ======== https://hg.mozilla.org/integration/gaia-central/rev/6ccca5242af4 Author: Zac Desc: Merge pull request #13432 from AndreiH/bug934480 Bug 934480 - Write a test for Messages app matching with contacts ======== https://hg.mozilla.org/integration/gaia-central/rev/3e19937c82c8 Author: Andrei Hutusoru Desc: Bug 934480 - Write a test for Messages app matching with contacts --- 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 3a43b3b1423..25f9ed0de34 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "1e5d4d5346c7c79821a77a63b0a22db642f32795", + "revision": "b872f0d2ae229298efeec105eaba62923e5756dd", "repo_path": "/integration/gaia-central" } From c0c41acc556ee943c8c16c3a4b3aba07607ff37a Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 7 Nov 2013 07:05:31 -0800 Subject: [PATCH 12/21] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/d6c6223196a9 Author: evelynhung Desc: Merge pull request #13229 from bcbcarl/bug860424 Bug 860424 - Show first 8 characters only, r=evelyn ======== https://hg.mozilla.org/integration/gaia-central/rev/22116b9a7011 Author: Carl X. Su Desc: Bug 860424 - Show first 8 characters only Signed-off-by: Carl X. Su --- 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 25f9ed0de34..9de4fefb26b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "b872f0d2ae229298efeec105eaba62923e5756dd", + "revision": "d6c6223196a97a8d3d0aa4d5f666e6abb6d98e90", "repo_path": "/integration/gaia-central" } From 21a11338756c942ede63fa530bbb43c38685f5c3 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 7 Nov 2013 07:20:24 -0800 Subject: [PATCH 13/21] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/de70a6ceb83b Author: Arthur Chen Desc: Merge pull request #13284 from crh0716/928851_1 Bug 928851 - Adopt new API of enabling/disabing RIL radio r=evelyn,alive ======== https://hg.mozilla.org/integration/gaia-central/rev/f735c1cbaf15 Author: Arthur Chen Desc: Bug 928851 - Adopt new API of enabling/disabing RIL radio --- 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 9de4fefb26b..f95aaae38aa 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "d6c6223196a97a8d3d0aa4d5f666e6abb6d98e90", + "revision": "de70a6ceb83b607529908c4d58a860c599ab5082", "repo_path": "/integration/gaia-central" } From ab0be3dc53da0cd76cb3b0ed814f66ef2e8f2c3b Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 7 Nov 2013 07:30:25 -0800 Subject: [PATCH 14/21] Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/aae41b7d327b Author: Sebastiaan de Haan Desc: Bug 935964 - Bump gaiatest to 0.19. r=dhunt --- 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 f95aaae38aa..956b4eaea09 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "de70a6ceb83b607529908c4d58a860c599ab5082", + "revision": "aae41b7d327b39a735b84dae680e615f7ac6281f", "repo_path": "/integration/gaia-central" } From ea874a6ce6082de301f1c1ab34d0c9081aeee0f9 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 7 Nov 2013 07:45:24 -0800 Subject: [PATCH 15/21] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/7e8c5de7d35c Author: Jose Antonio Olivera Ortega Desc: Merge pull request #13467 from jaoo/934901 Bug 934901 - [WAP push][CP] All APN settings will be removed from data and message settings after storing a CP message with non-support APPID. r=gsvelto ======== https://hg.mozilla.org/integration/gaia-central/rev/cb2cb3eed3d2 Author: Jose Antonio Olivera Ortega Desc: Bug 934901 - [WAP push][CP] All APN settings will be removed from data and message settings after storing a CP message with non-support APPID --- 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 956b4eaea09..e6196e8b77f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "aae41b7d327b39a735b84dae680e615f7ac6281f", + "revision": "7e8c5de7d35c95d8e496f1f297a8204067b23fab", "repo_path": "/integration/gaia-central" } From 1e72e54cc5f87451b5ea3f1344aac49d1a098d50 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 7 Nov 2013 07:55:24 -0800 Subject: [PATCH 16/21] Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/371be876c8e8 Author: Jose Antonio Olivera Ortega Desc: Merge pull request #13468 from jaoo/934869 Bug 934869 - [WAP push][CP] Stored MMS and Browser APN will not be displayed in data/message settings unless close Settings first. r=kaze ======== https://hg.mozilla.org/integration/gaia-central/rev/027fcb175bb6 Author: Jose Antonio Olivera Ortega Desc: Bug 934869 - [WAP push][CP] Stored MMS and Browser APN will not be displayed in data/message settings unless close Settings first. ======== https://hg.mozilla.org/integration/gaia-central/rev/dfcfc11c22cd Author: Timothy Guan-tin Chien Desc: Merge pull request #13456 from timdream/keyboard-no-text-transform Bug 931578 - Don't use text-transform for keyboard keys, r=rudyl ======== https://hg.mozilla.org/integration/gaia-central/rev/428876d21679 Author: Timothy Guan-tin Chien Desc: Bug 931578 - Don't use text-transform for keyboard keys --- 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 e6196e8b77f..c496f30517d 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "7e8c5de7d35c95d8e496f1f297a8204067b23fab", + "revision": "371be876c8e88648a470d6e93352145d1d1e1ad3", "repo_path": "/integration/gaia-central" } From 76b60d87692a1851f384e2126e6832f846a64ded Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 7 Nov 2013 08:55:32 -0800 Subject: [PATCH 17/21] Bumping gaia.json for 2 gaia-central 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/45d75251805a Author: Fabrice Desré Desc: Merge pull request #13475 from fabricedesre/skip-lockscreen-desktop Bug 891882 - skip lockscreen test on deskop until the stars align r=me ======== https://hg.mozilla.org/integration/gaia-central/rev/b6f934d365c7 Author: Fabrice Desré Desc: Bug 891882 - skip lockscreen test on deskop until the stars align r=me --- 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 c496f30517d..930dec673e2 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "371be876c8e88648a470d6e93352145d1d1e1ad3", + "revision": "45d75251805a77eb5ae6b0c9a517c4e556d75d83", "repo_path": "/integration/gaia-central" } From 979ffcb992aa905aca04c5b47e3d9d2c5bf00780 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 7 Nov 2013 09:15:30 -0800 Subject: [PATCH 18/21] Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/4de872072386 Author: David Flanagan Desc: Merge pull request #13358 from davidflanagan/bug932556 Bug 932556: increase default max image size for camera and gallery to a full 5 megapixels r=yurenju ======== https://hg.mozilla.org/integration/gaia-central/rev/4d5cfea8a61b Author: David Flanagan Desc: Bug 932556: increase default max image size for camera and gallery to a full 5 megapixels ======== https://hg.mozilla.org/integration/gaia-central/rev/63f0c46c4b6b Author: Cristian Rodriguez Desc: Merge pull request #13401 from crdlc/bug-935087 [Download Manager] Download list view skeleton ======== https://hg.mozilla.org/integration/gaia-central/rev/82b96a351386 Author: crdlc Desc: [Download Manager] Download list view skeleton --- 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 930dec673e2..f9b7fa0b375 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "45d75251805a77eb5ae6b0c9a517c4e556d75d83", + "revision": "4de872072386e3d5074f0a5acd94ebf15d4aa20c", "repo_path": "/integration/gaia-central" } From 183ea1633aebaaf9abe3553f4269f6e991f77ad3 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 7 Nov 2013 09:40:24 -0800 Subject: [PATCH 19/21] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/2c53b2d94fe9 Author: Amir Nissim Desc: Merge pull request #13120 from EverythingMe/929437-queryIndex-no-tags Bug 929437 - [e.me][bug] Unrelated installed apps appear in Collections ... ======== https://hg.mozilla.org/integration/gaia-central/rev/4be043bfa51a Author: Amir Nissim Desc: Bug 929437 - [e.me][bug] Unrelated installed apps appear in Collections [r=ranbena] --- 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 f9b7fa0b375..16ed8841ede 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "4de872072386e3d5074f0a5acd94ebf15d4aa20c", + "revision": "2c53b2d94fe904fe1f15c9a7d125dee7d1480685", "repo_path": "/integration/gaia-central" } From ac8121139ba89905b196d935ef3730c0957c0578 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 7 Nov 2013 09:50:24 -0800 Subject: [PATCH 20/21] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/2a0c0531f4c6 Author: Arnau Desc: Merge pull request #13383 from rnowm/934458 Bug 934458 - [Messaging] 'Messaging options' label does not appear completely ======== https://hg.mozilla.org/integration/gaia-central/rev/5bae6440820d Author: rnowm Desc: Bug 934458 - [Messaging] 'Messaging options' label does not appear completely --- 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 16ed8841ede..265448c768c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "2c53b2d94fe904fe1f15c9a7d125dee7d1480685", + "revision": "2a0c0531f4c6e3f55d7534cb6a9408efceb4cb8f", "repo_path": "/integration/gaia-central" } From 001e6faad100ba901b919fb0cb4848d17c31fa20 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 7 Nov 2013 10:15:25 -0800 Subject: [PATCH 21/21] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/ab0d6e1927a4 Author: Cristian Rodriguez Desc: Merge pull request #13399 from crdlc/bug-935077 Bug 935070 - [Download Manager] New shared component DownloadUI ======== https://hg.mozilla.org/integration/gaia-central/rev/8f978d90a82f Author: crdlc Desc: Bug 935070 - [Download Manager] New shared component DownloadUI --- 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 265448c768c..e81250eb92b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "2a0c0531f4c6e3f55d7534cb6a9408efceb4cb8f", + "revision": "ab0d6e1927a4fbce5d171555044557c1b7ba25c3", "repo_path": "/integration/gaia-central" }