From a01f623506d4549cbfb2bed95dab305df2a5eea4 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Fri, 27 Sep 2013 15:00:23 -0700 Subject: [PATCH] Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e836e146aa9b Author: Julien Wajsberg Desc: Merge pull request #12515 from julienw/913994-conversation-not-shown-after-sending-sometimes Bug 913994 - [Messages] When sending SMS to a number included in a SMS, ... ======== https://hg.mozilla.org/integration/gaia-central/rev/3313fb5d45f2 Author: Julien Wajsberg Desc: Bug 913994 - [Messages] When sending SMS to a number included in a SMS, we should load the thread after clicking on send r=gnarf The problem was simple: we were not resetting inThread when handling the #new hash. ======== https://hg.mozilla.org/integration/gaia-central/rev/b6b5d914d230 Author: Julien Wajsberg Desc: Merge pull request #12514 from julienw/919962-dont-show-sms-conversion-banner-after-send Bug 919962 - [MMS] Converting to text layout when sending a MMS r=gnarf ======== https://hg.mozilla.org/integration/gaia-central/rev/3bb63873c053 Author: Julien Wajsberg Desc: Bug 919962 - [MMS] Converting to text layout when sending a MMS r=gnarf We now display the banner in an asynchronous way therefore the previous way to hide the banner synchronously didn't work. This patch changes the logic then: instead of hiding the banner after displaying it, it now prevents the banner from being displayed at all. --- 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 7c97f44a13bb..5097267c9145 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "5c4111c396efb712947b8880a7f4ac5f01574aa7", + "revision": "e836e146aa9bdc2b4141dfa86662eed46d735fb2", "repo_path": "/integration/gaia-central" }