From 9374a45a7b65bf5ca62b021c275b9f0e879a6780 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 2 Oct 2013 01:55:22 -0700 Subject: [PATCH 01/46] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/a659b7a265a5 Author: Greg Weng Desc: Merge pull request #12600 from snowmantw/issue921335 [LockScreen] Fix the overlay blue area of the track ======== https://hg.mozilla.org/integration/gaia-central/rev/4105af964ea7 Author: Greg Weng (snowmantw) Desc: [LockScreen] Fix the overlay blue area of the track --- 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 3a53911ec689..9aff09183852 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "ebb5c473c94911bb98acff5d46f6af209c12583e", + "revision": "a659b7a265a58e8fa340975a302e918500dda53c", "repo_path": "/integration/gaia-central" } From b6ca5f30aa886c91c6e72f8b55fa0cd609339175 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 2 Oct 2013 02:05:23 -0700 Subject: [PATCH 02/46] 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/f9bffbe55c52 Author: Germán Toro del Valle Desc: Merge pull request #11287 from frsela/STK/Bug873906_german Bug 873906 - [Buri][GCF][STK]case 27.22.4.13.2/1 SET UP CALL (second alpha identifier) failed (r=etiennesegonzac) ======== https://hg.mozilla.org/integration/gaia-central/rev/42883f0f79f6 Author: Fernando Rodríguez Sela Desc: Using mozSettings to transfer the second alpha id to the dialer ======== https://hg.mozilla.org/integration/gaia-central/rev/2640ba2bec5a Author: Greg Weng Desc: Merge pull request #12566 from snowmantw/issue921334 Bug 921334 - [LockScreen] The arrows on the handle is incorrect ======== https://hg.mozilla.org/integration/gaia-central/rev/f18aeada0708 Author: Greg Weng Desc: Bug 921334 - [LockScreen] The arrows on the handle is incorrect --- 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 9aff09183852..34acd6f1c906 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "a659b7a265a58e8fa340975a302e918500dda53c", + "revision": "f9bffbe55c521e4b6e4f16cf02bf53a6f46505ef", "repo_path": "/integration/gaia-central" } From 0a06f74d0f1ea033f54ee42ce4e98eed82d84b6d Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 2 Oct 2013 02:15:24 -0700 Subject: [PATCH 03/46] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/6525edc3e12c Author: George Desc: Merge pull request #12569 from cctuan/922462 Bug 922462 - [Flatfish] use 1.5x icon from manifest for tablet ======== https://hg.mozilla.org/integration/gaia-central/rev/377dfd3c903f Author: cctuan Desc: Bug 922462 - Define various size of icons in manifest instead of use buildscript --- 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 34acd6f1c906..a12780d8e959 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "f9bffbe55c521e4b6e4f16cf02bf53a6f46505ef", + "revision": "6525edc3e12cb8b95dd4861dd481a1fbb93d1381", "repo_path": "/integration/gaia-central" } From 83a4cb0c22b2bb366943ab7229367306cf02c8c1 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 2 Oct 2013 02:40:23 -0700 Subject: [PATCH 04/46] Bumping gaia.json for 6 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/1104d05edfea Author: Zac Desc: Merge pull request #12593 from bobsilverberg/bug921459 Bug 921459 - Enable test_settings_change_keyboard_language for desktopb2g builds, r=zac ======== https://hg.mozilla.org/integration/gaia-central/rev/9d8e1905f72e Author: Bob Silverberg Desc: Bug 921459 - Enable test_settings_change_keyboard_language for desktopb2g builds, r=zac ======== https://hg.mozilla.org/integration/gaia-central/rev/9ed00e9e30d7 Author: Cristian Rodriguez Desc: Merge pull request #12582 from crdlc/bug-922425 Bug 922425 - [B2G][Everything.me][Homescreen] User can launch multiple search result icons if they tap on the screen repeatedly while a webpage is loading ======== https://hg.mozilla.org/integration/gaia-central/rev/23bf93658a4c Author: crdlc Desc: Bug 922425 - [B2G][Everything.me][Homescreen] User can launch multiple search result icons if they tap on the screen repeatedly while a webpage is loading ======== https://hg.mozilla.org/integration/gaia-central/rev/56afec43fcc3 Author: Zac Desc: Merge pull request #12587 from bobsilverberg/bug919085 Bug 919085 - Intermittent TEST-UNEXPECTED-FAIL | test_cards_view_kill_app_with_three_apps.py, r=zac ======== https://hg.mozilla.org/integration/gaia-central/rev/b2579a63166c Author: Bob Silverberg Desc: Bug 919085 - Intermittent TEST-UNEXPECTED-FAIL | test_cards_view_kill_app_with_three_apps.py, r=zac Disable this test on TBPL until bug 915138 is addressed --- 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 a12780d8e959..fa7b5529950b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "6525edc3e12cb8b95dd4861dd481a1fbb93d1381", + "revision": "1104d05edfea18fc3613d9ea0f424f036f8fa5a4", "repo_path": "/integration/gaia-central" } From 7ef679abfc0ef465bf4a36e4010de304225d4450 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 2 Oct 2013 02:50:23 -0700 Subject: [PATCH 05/46] Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/fd42316f0b7e Author: Evyatar Amitay Desc: Merge pull request #12605 from EverythingMe/922971-api-retries [Bug 922971] Make sure retry number is finite and can be aborted [r=ranbena] ======== https://hg.mozilla.org/integration/gaia-central/rev/8b0c354c56ad Author: Evyatar Amitay Desc: [Bug 922971] Make sure retry number is finite and can be aborted [r=ranbena] ======== https://hg.mozilla.org/integration/gaia-central/rev/754f8abb6911 Author: Sam Joch Desc: Merge pull request #12352 from pivanov/bug-917826 Bug 917826 - [Clock] Use Full Line Highlights r=samjoch ======== https://hg.mozilla.org/integration/gaia-central/rev/21373f508864 Author: Pavel Ivanov Desc: Bug 917826 - [Clock] Use Full Line Highlights --- 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 fa7b5529950b..fd42e46ac22c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "1104d05edfea18fc3613d9ea0f424f036f8fa5a4", + "revision": "fd42316f0b7e1f1d2d7e3ce55c9a5aaf8889e0fe", "repo_path": "/integration/gaia-central" } From 0300072d2d3759c18cc42e594e90fbdea649cdd0 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 2 Oct 2013 03:05:25 -0700 Subject: [PATCH 06/46] Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/6cd43ff6a22f Author: Sam Joch Desc: Merge pull request #12351 from pivanov/bug-917830 Bug 917830 - [FM Radio] Use Full Line Highlights r=samjoch ======== https://hg.mozilla.org/integration/gaia-central/rev/655dab896c2b Author: Pavel Ivanov Desc: Bug 917830 - [FM Radio] Use Full Line Highlights ======== https://hg.mozilla.org/integration/gaia-central/rev/cb2b1b5c0c2d Author: gasolin Desc: Merge pull request #12606 from gasolin/issue-913895percent Bug 913895 - [Flatfish][homescreen] better tablet swipe threadshold, r=crdlc ======== https://hg.mozilla.org/integration/gaia-central/rev/fc0fac392926 Author: gasolin Desc: Bug 913895 - [Flatfish][homescreen] better tablet swipe threadshold --- 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 fd42e46ac22c..24d7b5f9e200 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "fd42316f0b7e1f1d2d7e3ce55c9a5aaf8889e0fe", + "revision": "6cd43ff6a22f58389bdfb0c69345d781e5f91955", "repo_path": "/integration/gaia-central" } From bef79705369a3226a3d53005d30547c64ae69403 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 2 Oct 2013 03:15:23 -0700 Subject: [PATCH 07/46] Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/a7b196a19c49 Author: cctuan Desc: Revert "Bug 922462 - Define various size of icons in manifest instead of use buildscript" This reverts commit 32153515a3eedad26aec89322e02934a0dc06a0f. --- 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 24d7b5f9e200..05fd50eec18b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "6cd43ff6a22f58389bdfb0c69345d781e5f91955", + "revision": "a7b196a19c49d13780e5ec33ed984093ddddc014", "repo_path": "/integration/gaia-central" } From 0d4f64f7978ce9eb8a688c2a1f72764937df32da Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 2 Oct 2013 03:25:23 -0700 Subject: [PATCH 08/46] Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/ac08ef4ff88a Author: Zac Desc: Merge pull request #12584 from bobsilverberg/bug922687 Bug 922687 - Enable test_everythingme_launch_packaged_app against Travis-TBPL desktop builds, r=zac ======== https://hg.mozilla.org/integration/gaia-central/rev/df84cce31050 Author: Bob Silverberg Desc: Bug 922687 - Enable test_everythingme_launch_packaged_app against Travis-TBPL desktop builds, r=zac ======== https://hg.mozilla.org/integration/gaia-central/rev/7393287f6d4a Author: gasolin Desc: Merge pull request #12607 from gasolin/issue-921404 Bug 921404 - [Flatfish][Lockscreen] screen clock is too small on tablet, r=timdream ======== https://hg.mozilla.org/integration/gaia-central/rev/df1c1d25e87c Author: gasolin Desc: Bug 921404 - [Flatfish][Lockscreen] screen clock is too small on tablet --- 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 05fd50eec18b..4a7453f3d993 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "a7b196a19c49d13780e5ec33ed984093ddddc014", + "revision": "ac08ef4ff88a035458742aa12bb624089575494b", "repo_path": "/integration/gaia-central" } From e1a9c1c4990e923b0f7df20f8fee8fff1add6edf Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 2 Oct 2013 04:25:23 -0700 Subject: [PATCH 09/46] 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/aeafbb7f3634 Author: Germán Toro del Valle Desc: Merge pull request #12611 from jmcanterafonseca/fix_matcher_info Bug 923029 - [Contacts] Contacts matching library returning wrong results (r=gtorodelvalle) ======== https://hg.mozilla.org/integration/gaia-central/rev/52d616252989 Author: Jose M. Cantera Desc: Bug 923029 - [Contacts] Contacts matching library returning wrong results --- 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 4a7453f3d993..1a852b6d1a88 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "ac08ef4ff88a035458742aa12bb624089575494b", + "revision": "aeafbb7f3634b088d1f9bd6a593af6d35a118286", "repo_path": "/integration/gaia-central" } From 513439ee12132464f2d80da54e646364ae6806e2 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 2 Oct 2013 06:10:23 -0700 Subject: [PATCH 10/46] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/b18d7bedcb94 Author: Zac Desc: Merge pull request #12588 from bebef1987/wifi_issue Bug 922702 - Investigate test_connect_to_wifi_via_settings_app r=zac ======== https://hg.mozilla.org/integration/gaia-central/rev/3dd859087021 Author: Bebe Desc: Bug 922702 - Investigate test_connect_to_wifi_via_settings_app --- 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 1a852b6d1a88..47a5f0f030fb 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "aeafbb7f3634b088d1f9bd6a593af6d35a118286", + "revision": "b18d7bedcb94efbf84431e8f0e13826660df4a0c", "repo_path": "/integration/gaia-central" } From a48bd0a76c189f905bfd371062cd4f44fcd15ef2 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 2 Oct 2013 07:20:23 -0700 Subject: [PATCH 11/46] 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/81b9711ad71e Author: Germán Toro del Valle Desc: Merge pull request #12612 from gtorodelvalle/contacts-bug-922711-matching-email-addresses-not-highlighted Contacts bug 922711 matching email addresses not highlighted ======== https://hg.mozilla.org/integration/gaia-central/rev/4eaa05a3866f Author: Germán Toro del Valle Desc: Bug 922711 - [Contacts] Matching contacts email addresses are not highlighted in the matching details overlay. --- 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 47a5f0f030fb..2bba2153323c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "b18d7bedcb94efbf84431e8f0e13826660df4a0c", + "revision": "81b9711ad71e80b379dab8b2e78c5c02547fa423", "repo_path": "/integration/gaia-central" } From 8018df4bf819a97c6ab25faafae2beb2ed1b9328 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 2 Oct 2013 07:35:22 -0700 Subject: [PATCH 12/46] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/72d70c2b376f Author: Andrew Sutherland Desc: Merge pull request #12517 from asutherland/autoconfig-t-online Bug 914520 - Skip t-online.de ActiveSync autodiscover by adding local autoconfig entry. rs=squb, a=blocking-b2g=leo+ ======== https://hg.mozilla.org/integration/gaia-central/rev/03c9f02ce19e Author: Andrew Sutherland Desc: Bug 914520 - Skip t-online.de ActiveSync autodiscover by adding local autoconfig entry --- 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 2bba2153323c..406c51fff9b1 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "81b9711ad71e80b379dab8b2e78c5c02547fa423", + "revision": "72d70c2b376f5cd60ebfd7e0b108af3a2d404e38", "repo_path": "/integration/gaia-central" } From 6790af7f197f80add8be8c22eabc8fa11c7b8a2a Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 2 Oct 2013 08:10:23 -0700 Subject: [PATCH 13/46] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/f4e8293a9534 Author: Zac Desc: Merge pull request #12616 from teodosia/xfail-play-youtube-video Bug 922936 - Xfail test_play_youtube_video due to bug 922334 r=zac ======== https://hg.mozilla.org/integration/gaia-central/rev/a6b88b013ebf Author: Teodosia Pop Desc: Bug 922936 - Xfail test_play_youtube_video due to bug 922334 --- 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 406c51fff9b1..4bed1cb3e325 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "72d70c2b376f5cd60ebfd7e0b108af3a2d404e38", + "revision": "f4e8293a9534b3e139b62fc6b9b6ab2c75505ff6", "repo_path": "/integration/gaia-central" } From 4a23399e485ea17c7b63a36e03c9325f6338844b Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 2 Oct 2013 08:20:23 -0700 Subject: [PATCH 14/46] Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/1d578a3ff4da Author: Zac Desc: Merge pull request #12618 from AndreiH/unxfail_marketplace_add_review Bug 923096 - Unxfail test_marketplace_add_review ======== https://hg.mozilla.org/integration/gaia-central/rev/3a3c3721e58f Author: Andrei Hutusoru Desc: Unxfail test marketplace can add review ======== https://hg.mozilla.org/integration/gaia-central/rev/a0e75f210f68 Author: Jose M. Cantera Desc: Merge pull request #12564 from gitmai/bug-880775-birthday-timezone Bug 880775 - Birthday timezone error ======== https://hg.mozilla.org/integration/gaia-central/rev/6c6a42240f81 Author: mai Desc: Bug 880775 - Birthday timezone error --- 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 4bed1cb3e325..a45a48493b11 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "f4e8293a9534b3e139b62fc6b9b6ab2c75505ff6", + "revision": "1d578a3ff4da316dfe5e312f0974c4dc441c21fd", "repo_path": "/integration/gaia-central" } From 65496e17fc5dd51fe62308e4ec3be14c82292931 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 2 Oct 2013 09:06:23 -0700 Subject: [PATCH 15/46] Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/0e6a2382d00c Author: Ed Morley Desc: Revert "Bug 917826 - [Clock] Use Full Line Highlights" for causing bug 923092 This reverts commit d2306a8583db8c739f87ddee24a71197f2d8ffef. --- 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 a45a48493b11..4bc89d920b02 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "1d578a3ff4da316dfe5e312f0974c4dc441c21fd", + "revision": "0e6a2382d00cd45cabb97f0599a97ae8fd7da62d", "repo_path": "/integration/gaia-central" } From 369f758409dd24f623d0d548e9d396daf1c8b9bf Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 2 Oct 2013 10:05:23 -0700 Subject: [PATCH 16/46] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/49e07ab5f757 Author: Ran Ben Aharon Desc: Merge pull request #12589 from EverythingMe/911180-dedup-results Bug 911180 - [e.me][feature] Dedup apps [r=evyatron,crdlc] ======== https://hg.mozilla.org/integration/gaia-central/rev/71e7d91f236d Author: Ran Ben Aharon Desc: Bug 911180 - [e.me][feature] Dedup apps [r=crdlc] --- 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 4bc89d920b02..ab43167b2fe4 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "0e6a2382d00cd45cabb97f0599a97ae8fd7da62d", + "revision": "49e07ab5f7579d226e2258740d15f6311c917a8e", "repo_path": "/integration/gaia-central" } From ebcbb152542c8a0b5b17c4f5d7290f70ca756f19 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 2 Oct 2013 10:55:23 -0700 Subject: [PATCH 17/46] 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/87d4039f587f Author: Germán Toro del Valle Desc: Merge pull request #12621 from gtorodelvalle/contacts-bug-922083-unit-tests-for-duplicate-contact-details-reloaded Contacts bug 922083 unit tests for duplicate contact details reloaded (r=jmcanterafonseca) ======== https://hg.mozilla.org/integration/gaia-central/rev/35669903b494 Author: Germán Toro del Valle Desc: Bug 922083 - [Contacts] Include unit tests to cover the presentation of the duplicate contact details overlay. --- 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 ab43167b2fe4..0d68d59a6ced 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "49e07ab5f7579d226e2258740d15f6311c917a8e", + "revision": "87d4039f587f68d79969d13d56b59bcb31f0f1f6", "repo_path": "/integration/gaia-central" } From f5e91d0e88ed7cd53b43c6f29996f85702a35c26 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 2 Oct 2013 11:30:23 -0700 Subject: [PATCH 18/46] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/537a1ebbcaa7 Author: James Lal Desc: Merge pull request #12559 from qdot/922394-notification-integration Bug 922394 - Add skipped test for notification app integration test ======== https://hg.mozilla.org/integration/gaia-central/rev/5908df26c6e1 Author: Kyle Machulis Desc: Bug 922394 - Add skipped test for notification app integration test --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 0d68d59a6ced..9b2aa4b8d8ec 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "87d4039f587f68d79969d13d56b59bcb31f0f1f6", + "revision": "537a1ebbcaa74baa36a62ffb1aa5b967db5afa0a", "repo_path": "/integration/gaia-central" } From 1d3d89945abb6a66c961e8ee574129fce3cc789a Mon Sep 17 00:00:00 2001 From: Kyle Machulis Date: Wed, 2 Oct 2013 13:51:35 -0700 Subject: [PATCH 19/46] Bug 915002 - Convert optional AppNotificationService arguments to webidl dictionary, add directional/lang arguments; r=fabrice r=bz --- b2g/chrome/content/shell.js | 10 ++++++---- b2g/components/AlertsService.js | 14 ++++++------- .../nsIDOMDesktopNotification.idl | 10 +++++----- dom/src/notification/DesktopNotification.cpp | 16 +++++++++++---- dom/src/notification/Notification.cpp | 20 +++++++++++++++---- .../AppNotificationServiceOptions.webidl | 15 ++++++++++++++ dom/webidl/DummyBinding.webidl | 1 + dom/webidl/moz.build | 1 + 8 files changed, 62 insertions(+), 25 deletions(-) create mode 100644 dom/webidl/AppNotificationServiceOptions.webidl diff --git a/b2g/chrome/content/shell.js b/b2g/chrome/content/shell.js index 9159b707bbe6..cb27f3cb755a 100644 --- a/b2g/chrome/content/shell.js +++ b/b2g/chrome/content/shell.js @@ -886,18 +886,20 @@ var AlertsHelper = { } let data = aMessage.data; + let details = data.details; let listener = { mm: aMessage.target, title: data.title, text: data.text, - manifestURL: data.manifestURL, + manifestURL: details.manifestURL, imageURL: data.imageURL - } + }; this.registerAppListener(data.uid, listener); this.showNotification(data.imageURL, data.title, data.text, - data.textClickable, null, - data.uid, null, null, data.manifestURL); + details.textClickable, null, + data.uid, details.dir, + details.lang, details.manifestURL); }, } diff --git a/b2g/components/AlertsService.js b/b2g/components/AlertsService.js index 6bb59328ba8f..ee0f384c653f 100644 --- a/b2g/components/AlertsService.js +++ b/b2g/components/AlertsService.js @@ -65,17 +65,16 @@ AlertsService.prototype = { showAppNotification: function showAppNotification(aImageURL, aTitle, aText, - aTextClickable, - aManifestURL, aAlertListener, - aId) { - let uid = (aId == "") ? "app-notif-" + uuidGenerator.generateUUID() : aId; + aDetails) { + let uid = (aDetails.id == "") ? + "app-notif-" + uuidGenerator.generateUUID() : aDetails.id; this._listeners[uid] = { observer: aAlertListener, title: aTitle, text: aText, - manifestURL: aManifestURL, + manifestURL: aDetails.manifestURL, imageURL: aImageURL }; @@ -83,9 +82,8 @@ AlertsService.prototype = { imageURL: aImageURL, title: aTitle, text: aText, - textClickable: aTextClickable, - manifestURL: aManifestURL, - uid: uid + uid: uid, + details: aDetails }); }, diff --git a/dom/interfaces/notification/nsIDOMDesktopNotification.idl b/dom/interfaces/notification/nsIDOMDesktopNotification.idl index 852340919b70..308849684a01 100644 --- a/dom/interfaces/notification/nsIDOMDesktopNotification.idl +++ b/dom/interfaces/notification/nsIDOMDesktopNotification.idl @@ -7,14 +7,14 @@ interface nsIObserver; // Notification service that also provides the manifest URL -[scriptable, uuid(61c4adf4-187d-4d18-937c-4df17bc01073)] +[scriptable, uuid(50cb17d2-dc8a-4aa6-bcd3-94d76af14e20)] interface nsIAppNotificationService : nsISupports { void showAppNotification(in AString imageUrl, in AString title, in AString text, - [optional] in boolean textClickable, - [optional] in AString manifestURL, - [optional] in nsIObserver alertListener, - [optional] in AString id); + in nsIObserver alertListener, + // details should be a WebIDL + // AppNotificationServiceOptions Dictionary object + in jsval details); }; diff --git a/dom/src/notification/DesktopNotification.cpp b/dom/src/notification/DesktopNotification.cpp index 09d3910d9b1b..2e90c3470ede 100644 --- a/dom/src/notification/DesktopNotification.cpp +++ b/dom/src/notification/DesktopNotification.cpp @@ -3,6 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "mozilla/dom/DesktopNotification.h" #include "mozilla/dom/DesktopNotificationBinding.h" +#include "mozilla/dom/AppNotificationServiceOptionsBinding.h" #include "nsContentPermissionHelper.h" #include "nsXULAppAPI.h" #include "mozilla/dom/PBrowserChild.h" @@ -91,11 +92,18 @@ DesktopNotification::PostDesktopNotification() nsCOMPtr appsService = do_GetService("@mozilla.org/AppsService;1"); nsString manifestUrl = EmptyString(); appsService->GetManifestURLByLocalId(appId, manifestUrl); + mozilla::AutoSafeJSContext cx; + JS::RootedValue val(cx); + AppNotificationServiceOptionsInitializer ops; + ops.mTextClickable = true; + ops.mManifestURL = manifestUrl; + + if (!ops.ToObject(cx, JS::NullPtr(), &val)) { + return NS_ERROR_FAILURE; + } + return appNotifier->ShowAppNotification(mIconURL, mTitle, mDescription, - true, - manifestUrl, - mObserver, - EmptyString()); + mObserver, val); } } #endif diff --git a/dom/src/notification/Notification.cpp b/dom/src/notification/Notification.cpp index dc91865f68b1..9e44fc019079 100644 --- a/dom/src/notification/Notification.cpp +++ b/dom/src/notification/Notification.cpp @@ -4,6 +4,7 @@ #include "PCOMContentPermissionRequestChild.h" #include "mozilla/dom/Notification.h" +#include "mozilla/dom/AppNotificationServiceOptionsBinding.h" #include "mozilla/dom/OwningNonNull.h" #include "mozilla/Preferences.h" #include "TabChild.h" @@ -375,11 +376,22 @@ Notification::ShowInternal() nsCOMPtr appsService = do_GetService("@mozilla.org/AppsService;1"); nsString manifestUrl = EmptyString(); appsService->GetManifestURLByLocalId(appId, manifestUrl); + mozilla::AutoSafeJSContext cx; + JS::RootedValue val(cx); + AppNotificationServiceOptionsInitializer ops; + ops.mTextClickable = true; + ops.mManifestURL = manifestUrl; + ops.mId = alertName; + ops.mDir = DirectionToString(mDir); + ops.mLang = mLang; + + if (!ops.ToObject(cx, JS::NullPtr(), &val)) { + NS_WARNING("Converting dict to object failed!"); + return NS_ERROR_FAILURE; + } + return appNotifier->ShowAppNotification(mIconUrl, mTitle, mBody, - true, - manifestUrl, - observer, - alertName); + observer, val); } } #endif diff --git a/dom/webidl/AppNotificationServiceOptions.webidl b/dom/webidl/AppNotificationServiceOptions.webidl new file mode 100644 index 000000000000..6fdc00e3a09f --- /dev/null +++ b/dom/webidl/AppNotificationServiceOptions.webidl @@ -0,0 +1,15 @@ +/* -*- 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/. + */ + +interface MozObserver; + +dictionary AppNotificationServiceOptions { + boolean textClickable = false; + DOMString manifestURL = ""; + DOMString id = ""; + DOMString dir = ""; + DOMString lang = ""; +}; diff --git a/dom/webidl/DummyBinding.webidl b/dom/webidl/DummyBinding.webidl index 4ee74ac824dd..a1aa3d731169 100644 --- a/dom/webidl/DummyBinding.webidl +++ b/dom/webidl/DummyBinding.webidl @@ -27,6 +27,7 @@ interface DummyInterface : EventTarget { void DOMWindowResizeEventDetail(optional DOMWindowResizeEventDetail arg); void WifiOptions(optional WifiCommandOptions arg1, optional WifiResultOptions arg2); + void AppNotificationServiceOptions(optional AppNotificationServiceOptions arg); }; interface DummyInterfaceWorkers { diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build index f99f0f013523..b097a7bd1f6f 100644 --- a/dom/webidl/moz.build +++ b/dom/webidl/moz.build @@ -18,6 +18,7 @@ PREPROCESSED_WEBIDL_FILES = [ WEBIDL_FILES = [ 'AnalyserNode.webidl', 'AnimationEvent.webidl', + 'AppNotificationServiceOptions.webidl', 'ArchiveReader.webidl', 'ArchiveRequest.webidl', 'Attr.webidl', From f22ebd65e5bf2aa777372e861f51acc9efe6686c Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 2 Oct 2013 17:45:23 -0700 Subject: [PATCH 20/46] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/b663302329f2 Author: James Lal Desc: Merge pull request #12630 from lightsofapollo/revert-9d1a9fe Revert "Merge pull request #12564 from gitmai/bug-880775-birthday-timezo... ======== https://hg.mozilla.org/integration/gaia-central/rev/521b090f0150 Author: James Lal Desc: Revert "Merge pull request #12564 from gitmai/bug-880775-birthday-timezone" This reverts commit 9d1a9fe8c40519f2bf7b558790a4df4d5b818ca3, reversing changes made to 893bcd450ba60886a711e26a11d73aa3e88a1ee5. --- 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 9b2aa4b8d8ec..cd75e16fe990 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "537a1ebbcaa74baa36a62ffb1aa5b967db5afa0a", + "revision": "b663302329f214694250dd97672182e3da54127e", "repo_path": "/integration/gaia-central" } From cc6efe22689110ba3f7bf69a649be800eb1019d1 Mon Sep 17 00:00:00 2001 From: Eric Chou Date: Thu, 3 Oct 2013 10:12:46 +0800 Subject: [PATCH 21/46] Bug 912376 - SCO wouldn't be dropped after SLC was disconnected, r=btian --- dom/bluetooth/BluetoothHfpManager.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dom/bluetooth/BluetoothHfpManager.cpp b/dom/bluetooth/BluetoothHfpManager.cpp index 481dfe760bbb..6838becdb8fc 100644 --- a/dom/bluetooth/BluetoothHfpManager.cpp +++ b/dom/bluetooth/BluetoothHfpManager.cpp @@ -1653,14 +1653,8 @@ BluetoothHfpManager::ConnectSco(BluetoothReplyRunnable* aRunnable) bool BluetoothHfpManager::DisconnectSco() { - if (!IsConnected()) { - BT_WARNING("BluetoothHfpManager is not connected"); - return false; - } - - SocketConnectionStatus status = mScoSocket->GetConnectionStatus(); - if (status != SOCKET_CONNECTED && status != SOCKET_CONNECTING) { - BT_WARNING("No SCO exists"); + if (!IsScoConnected()) { + BT_WARNING("SCO has been already disconnected."); return false; } From 0425658944e58619372c1476a46237573aab9592 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 2 Oct 2013 20:50:23 -0700 Subject: [PATCH 22/46] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/10bb252685ef Author: Greg Weng Desc: Merge pull request #12610 from snowmantw/issue921392 Bug 921392 - [LockScreen] Need to dark the icons of locksceen ======== https://hg.mozilla.org/integration/gaia-central/rev/93aa21239ed4 Author: Greg Weng Desc: Bug 921392 - [LockScreen] Need to dark the icons of locksceen --- 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 cd75e16fe990..86a6a889f323 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "b663302329f214694250dd97672182e3da54127e", + "revision": "10bb252685ef7d053f9aaeaa30f322f2ac0bd92a", "repo_path": "/integration/gaia-central" } From 8ce9170c5f579b710c188d1920ad5e75a2b033dc Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 2 Oct 2013 21:25:23 -0700 Subject: [PATCH 23/46] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/349d8c123bac Author: GaryChen(pychen) Desc: Merge pull request #12567 from mpizza/Bug_917461_No_globe_icon Bug 917461 - [B2G][Keyboard] No "globe" icon - unable to select internat... r=janjongboom. ======== https://hg.mozilla.org/integration/gaia-central/rev/1bfe2e200513 Author: GaryChen(pychen) Desc: Bug 917461 - [B2G][Keyboard] No "globe" icon - unable to select international keyboards. r=janjongboom. -- need to expose all input type enable keyboard layouts to gecko (chrome) --- 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 86a6a889f323..96158907f3d2 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "10bb252685ef7d053f9aaeaa30f322f2ac0bd92a", + "revision": "349d8c123bac8672ab241855bbf0bc3912b28afd", "repo_path": "/integration/gaia-central" } From 75d9bbb26cbc96e9da5ed1a3098154e943dce495 Mon Sep 17 00:00:00 2001 From: Vincent Chang Date: Mon, 30 Sep 2013 19:19:25 +0800 Subject: [PATCH 24/46] Bug 917096 - [Buri][WIFI]When set the wifi hotspot name as blank space and save,it can't be searched. r=chucklee --- dom/wifi/WifiWorker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/wifi/WifiWorker.js b/dom/wifi/WifiWorker.js index 764b3767e4a9..3114c93146a1 100644 --- a/dom/wifi/WifiWorker.js +++ b/dom/wifi/WifiWorker.js @@ -2348,7 +2348,7 @@ function WifiWorker() { self.networksArray = []; for (let i = 1; i < lines.length; ++i) { // bssid / frequency / signal level / flags / ssid - var match = /([\S]+)\s+([\S]+)\s+([\S]+)\s+(\[[\S]+\])?\s+(.*)/.exec(lines[i]); + var match = /([\S]+)\s+([\S]+)\s+([\S]+)\s+(\[[\S]+\])?\s(.*)/.exec(lines[i]); if (match && match[5]) { let ssid = match[5], From f37397162550928a8b278353778d31f17f2ce237 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 3 Oct 2013 00:55:22 -0700 Subject: [PATCH 25/46] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/2bc23f07df0b Author: Cristian Rodriguez Desc: Merge pull request #12622 from crdlc/bug-922185 Bug 922185 - [e.me] e.me search can find hidden apps ======== https://hg.mozilla.org/integration/gaia-central/rev/fbca8ac7770a Author: crdlc Desc: Bug 922185 - [e.me] e.me search can find hidden apps --- 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 96158907f3d2..dc54bed0df38 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "349d8c123bac8672ab241855bbf0bc3912b28afd", + "revision": "2bc23f07df0befa02ccebcc45dda84a05325ccf0", "repo_path": "/integration/gaia-central" } From cfb91603378f0619ffb4859bb1ce56ed3ac185c4 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 3 Oct 2013 01:20:23 -0700 Subject: [PATCH 26/46] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/b11bce51cbc8 Author: Cristian Rodriguez Desc: Merge pull request #12614 from EverythingMe/919463-dnd-dialer Bug 919463 - [e.me][bug] Can't drag Dailer / Contacts into Collection [r... ======== https://hg.mozilla.org/integration/gaia-central/rev/b223ab8d8000 Author: Amir Nissim Desc: Bug 919463 - [e.me][bug] Can't drag Dailer / Contacts into Collection [r=crdlc] --- 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 dc54bed0df38..704d22c33ced 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "2bc23f07df0befa02ccebcc45dda84a05325ccf0", + "revision": "b11bce51cbc83b2658d9e3098e8efaa39c5d6d19", "repo_path": "/integration/gaia-central" } From ed746854d2229638bb6b32cd2435c0ea0e9fe02d Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 3 Oct 2013 01:30:24 -0700 Subject: [PATCH 27/46] Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/d84ca6d2cb4d Author: Evyatar Amitay Desc: Merge pull request #12617 from EverythingMe/923095-entertainment-bgimage [Bug 923095] fix entertainment bgimage [r=ranbena] ======== https://hg.mozilla.org/integration/gaia-central/rev/5d3cbdba7d88 Author: Evyatar Amitay Desc: [Bug 923095] fix entertainment bgimage [r=ranbena] ======== https://hg.mozilla.org/integration/gaia-central/rev/a326226a1cf4 Author: Evyatar Amitay Desc: Merge pull request #12583 from EverythingMe/bugfix-loading-align [Bug 922192] Fix loading indicator position [r=ranbena] ======== https://hg.mozilla.org/integration/gaia-central/rev/9efd59e29cfd Author: Evyatar Amitay Desc: [Bug 922192] Fix loading indicator position [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 704d22c33ced..c11c841b96e4 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "b11bce51cbc83b2658d9e3098e8efaa39c5d6d19", + "revision": "d84ca6d2cb4d0fd0675ff93b16b39103d578c2e1", "repo_path": "/integration/gaia-central" } From 81784fc5884fd24ba124cef4a925d2f5cc344fb5 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 3 Oct 2013 02:15:24 -0700 Subject: [PATCH 28/46] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/c9c11ebb5342 Author: Jose M. Cantera Desc: Merge pull request #12631 from gitmai/bug-880775-birthday-timezone-error Bug 880775 - Birthday timezone error ======== https://hg.mozilla.org/integration/gaia-central/rev/bb80a61e4e57 Author: mai Desc: Bug 880775 - Birthday timezone error --- 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 c11c841b96e4..c9a72e032784 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "d84ca6d2cb4d0fd0675ff93b16b39103d578c2e1", + "revision": "c9c11ebb5342234dfb4c4c35029f97e4e1e1d295", "repo_path": "/integration/gaia-central" } From 5e4b5d9ec81da9369c0ef3fa1fb6ef499a1c52a6 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 3 Oct 2013 03:15:24 -0700 Subject: [PATCH 29/46] Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/37bb1a2fe97d Author: Dale Harvey Desc: Bug 915137 - Dont error if custom contextmenu data is not defined --- 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 c9a72e032784..afc784325b13 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "c9c11ebb5342234dfb4c4c35029f97e4e1e1d295", + "revision": "37bb1a2fe97d95db2241396ac3b6a3285c8364b2", "repo_path": "/integration/gaia-central" } From 4ab3c78c81b9f24293566f88eced82159da3fb5c Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 3 Oct 2013 04:00:24 -0700 Subject: [PATCH 30/46] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/f08ee6217ddf Author: Zac Desc: Merge pull request #12519 from edmoz/Add-uitests-mozId-persona Add UI Tests mozId tests ======== https://hg.mozilla.org/integration/gaia-central/rev/04d84aadd85a Author: Edwin Wong Desc: Bug 919615 - Add navigator.mozId automated test, r=zac --- 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 afc784325b13..089951dcb5f9 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "37bb1a2fe97d95db2241396ac3b6a3285c8364b2", + "revision": "f08ee6217ddf0ec5a666e28fde466cde60ceb7bc", "repo_path": "/integration/gaia-central" } From 2705883fef08a9583a3f444ff218bb318ec9f062 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 3 Oct 2013 06:00:23 -0700 Subject: [PATCH 31/46] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/329b001bc2e0 Author: Ran Ben Aharon Desc: Merge pull request #12637 from EverythingMe/905455-oversized-icons [Bug 905455] Fix HDPI issues [r=crdlc] ======== https://hg.mozilla.org/integration/gaia-central/rev/a8a41825321b Author: Evyatar Amitay Desc: [Bug 905455] Fix HDPI issues [r=crdlc] --- 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 089951dcb5f9..b8d45feb1ea9 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "f08ee6217ddf0ec5a666e28fde466cde60ceb7bc", + "revision": "329b001bc2e0700db04f55cf15a02af80c86f178", "repo_path": "/integration/gaia-central" } From 1cef2e21f117c1d091f5e2204964edbd0b2cf9ec Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 3 Oct 2013 06:21:23 -0700 Subject: [PATCH 32/46] Bumping gaia.json for 5 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/92078a873c0d Author: bmac Desc: Bug 917339 - [Clock] Timer Sound should use same input type as Alarm Sound r=jugglinmike ======== https://hg.mozilla.org/integration/gaia-central/rev/45f6ae2e7503 Author: Amir Nissim Desc: Merge pull request #12546 from EverythingMe/910354-add-collections Bug 910354 - [e.me][feature] Add Collections ======== https://hg.mozilla.org/integration/gaia-central/rev/6d67875c6185 Author: Amir Nissim Desc: Bug 910354 - [e.me][feature] Add Collections [r=crdlc] ======== https://hg.mozilla.org/integration/gaia-central/rev/58bc6ee1b213 Author: Evyatar Amitay Desc: Merge pull request #12619 from EverythingMe/923097-save-to-homescreen [Bug 923097] Fix add to homescreen [r=crdlc] ======== https://hg.mozilla.org/integration/gaia-central/rev/52acdbd09e59 Author: Evyatar Amitay Desc: [Bug 923097] Fix add to homescreen [r=crdlc] --- 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 b8d45feb1ea9..54cff438619b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "329b001bc2e0700db04f55cf15a02af80c86f178", + "revision": "92078a873c0d9c5cf3d9f2c1e7560ef97e482c0d", "repo_path": "/integration/gaia-central" } From e7d3b80e3752c3b598dc2f6578251c03317c1a31 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 3 Oct 2013 07:10:23 -0700 Subject: [PATCH 33/46] Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/742a017e771d Author: Cristian Rodriguez Desc: Merge pull request #12624 from crdlc/bug-912515 Bug 912515 - Update Homescreen and App Grid for Unification and Legibility ======== https://hg.mozilla.org/integration/gaia-central/rev/426c794bf0f3 Author: crdlc Desc: Bug 912515 - Update Homescreen and App Grid for Unification and Legibility ======== https://hg.mozilla.org/integration/gaia-central/rev/e684dda89893 Author: Evyatar Amitay Desc: Merge pull request #12638 from EverythingMe/923399-translate-download [Bug 923399] Translate "Download" label for market apps [r=crdlc] ======== https://hg.mozilla.org/integration/gaia-central/rev/5029d347917d Author: Evyatar Amitay Desc: [Bug 923399] Translate "Download" label for market apps [r=crdlc] --- 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 54cff438619b..65977e4c5e65 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "92078a873c0d9c5cf3d9f2c1e7560ef97e482c0d", + "revision": "742a017e771da72f39b4fd237526b4efe462dd86", "repo_path": "/integration/gaia-central" } From e5e02fc355f1dba3d58a38e0937ce73104d911d6 Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Thu, 3 Oct 2013 07:41:07 -0700 Subject: [PATCH 34/46] Backed out changeset bd2a54f589c3 (bug 915002) for mochitest-8 bustage --- b2g/chrome/content/shell.js | 10 ++++------ b2g/components/AlertsService.js | 14 +++++++------ .../nsIDOMDesktopNotification.idl | 10 +++++----- dom/src/notification/DesktopNotification.cpp | 16 ++++----------- dom/src/notification/Notification.cpp | 20 ++++--------------- .../AppNotificationServiceOptions.webidl | 15 -------------- dom/webidl/DummyBinding.webidl | 1 - dom/webidl/moz.build | 1 - 8 files changed, 25 insertions(+), 62 deletions(-) delete mode 100644 dom/webidl/AppNotificationServiceOptions.webidl diff --git a/b2g/chrome/content/shell.js b/b2g/chrome/content/shell.js index cb27f3cb755a..9159b707bbe6 100644 --- a/b2g/chrome/content/shell.js +++ b/b2g/chrome/content/shell.js @@ -886,20 +886,18 @@ var AlertsHelper = { } let data = aMessage.data; - let details = data.details; let listener = { mm: aMessage.target, title: data.title, text: data.text, - manifestURL: details.manifestURL, + manifestURL: data.manifestURL, imageURL: data.imageURL - }; + } this.registerAppListener(data.uid, listener); this.showNotification(data.imageURL, data.title, data.text, - details.textClickable, null, - data.uid, details.dir, - details.lang, details.manifestURL); + data.textClickable, null, + data.uid, null, null, data.manifestURL); }, } diff --git a/b2g/components/AlertsService.js b/b2g/components/AlertsService.js index ee0f384c653f..6bb59328ba8f 100644 --- a/b2g/components/AlertsService.js +++ b/b2g/components/AlertsService.js @@ -65,16 +65,17 @@ AlertsService.prototype = { showAppNotification: function showAppNotification(aImageURL, aTitle, aText, + aTextClickable, + aManifestURL, aAlertListener, - aDetails) { - let uid = (aDetails.id == "") ? - "app-notif-" + uuidGenerator.generateUUID() : aDetails.id; + aId) { + let uid = (aId == "") ? "app-notif-" + uuidGenerator.generateUUID() : aId; this._listeners[uid] = { observer: aAlertListener, title: aTitle, text: aText, - manifestURL: aDetails.manifestURL, + manifestURL: aManifestURL, imageURL: aImageURL }; @@ -82,8 +83,9 @@ AlertsService.prototype = { imageURL: aImageURL, title: aTitle, text: aText, - uid: uid, - details: aDetails + textClickable: aTextClickable, + manifestURL: aManifestURL, + uid: uid }); }, diff --git a/dom/interfaces/notification/nsIDOMDesktopNotification.idl b/dom/interfaces/notification/nsIDOMDesktopNotification.idl index 308849684a01..852340919b70 100644 --- a/dom/interfaces/notification/nsIDOMDesktopNotification.idl +++ b/dom/interfaces/notification/nsIDOMDesktopNotification.idl @@ -7,14 +7,14 @@ interface nsIObserver; // Notification service that also provides the manifest URL -[scriptable, uuid(50cb17d2-dc8a-4aa6-bcd3-94d76af14e20)] +[scriptable, uuid(61c4adf4-187d-4d18-937c-4df17bc01073)] interface nsIAppNotificationService : nsISupports { void showAppNotification(in AString imageUrl, in AString title, in AString text, - in nsIObserver alertListener, - // details should be a WebIDL - // AppNotificationServiceOptions Dictionary object - in jsval details); + [optional] in boolean textClickable, + [optional] in AString manifestURL, + [optional] in nsIObserver alertListener, + [optional] in AString id); }; diff --git a/dom/src/notification/DesktopNotification.cpp b/dom/src/notification/DesktopNotification.cpp index 2e90c3470ede..09d3910d9b1b 100644 --- a/dom/src/notification/DesktopNotification.cpp +++ b/dom/src/notification/DesktopNotification.cpp @@ -3,7 +3,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "mozilla/dom/DesktopNotification.h" #include "mozilla/dom/DesktopNotificationBinding.h" -#include "mozilla/dom/AppNotificationServiceOptionsBinding.h" #include "nsContentPermissionHelper.h" #include "nsXULAppAPI.h" #include "mozilla/dom/PBrowserChild.h" @@ -92,18 +91,11 @@ DesktopNotification::PostDesktopNotification() nsCOMPtr appsService = do_GetService("@mozilla.org/AppsService;1"); nsString manifestUrl = EmptyString(); appsService->GetManifestURLByLocalId(appId, manifestUrl); - mozilla::AutoSafeJSContext cx; - JS::RootedValue val(cx); - AppNotificationServiceOptionsInitializer ops; - ops.mTextClickable = true; - ops.mManifestURL = manifestUrl; - - if (!ops.ToObject(cx, JS::NullPtr(), &val)) { - return NS_ERROR_FAILURE; - } - return appNotifier->ShowAppNotification(mIconURL, mTitle, mDescription, - mObserver, val); + true, + manifestUrl, + mObserver, + EmptyString()); } } #endif diff --git a/dom/src/notification/Notification.cpp b/dom/src/notification/Notification.cpp index 9e44fc019079..dc91865f68b1 100644 --- a/dom/src/notification/Notification.cpp +++ b/dom/src/notification/Notification.cpp @@ -4,7 +4,6 @@ #include "PCOMContentPermissionRequestChild.h" #include "mozilla/dom/Notification.h" -#include "mozilla/dom/AppNotificationServiceOptionsBinding.h" #include "mozilla/dom/OwningNonNull.h" #include "mozilla/Preferences.h" #include "TabChild.h" @@ -376,22 +375,11 @@ Notification::ShowInternal() nsCOMPtr appsService = do_GetService("@mozilla.org/AppsService;1"); nsString manifestUrl = EmptyString(); appsService->GetManifestURLByLocalId(appId, manifestUrl); - mozilla::AutoSafeJSContext cx; - JS::RootedValue val(cx); - AppNotificationServiceOptionsInitializer ops; - ops.mTextClickable = true; - ops.mManifestURL = manifestUrl; - ops.mId = alertName; - ops.mDir = DirectionToString(mDir); - ops.mLang = mLang; - - if (!ops.ToObject(cx, JS::NullPtr(), &val)) { - NS_WARNING("Converting dict to object failed!"); - return NS_ERROR_FAILURE; - } - return appNotifier->ShowAppNotification(mIconUrl, mTitle, mBody, - observer, val); + true, + manifestUrl, + observer, + alertName); } } #endif diff --git a/dom/webidl/AppNotificationServiceOptions.webidl b/dom/webidl/AppNotificationServiceOptions.webidl deleted file mode 100644 index 6fdc00e3a09f..000000000000 --- a/dom/webidl/AppNotificationServiceOptions.webidl +++ /dev/null @@ -1,15 +0,0 @@ -/* -*- 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/. - */ - -interface MozObserver; - -dictionary AppNotificationServiceOptions { - boolean textClickable = false; - DOMString manifestURL = ""; - DOMString id = ""; - DOMString dir = ""; - DOMString lang = ""; -}; diff --git a/dom/webidl/DummyBinding.webidl b/dom/webidl/DummyBinding.webidl index a1aa3d731169..4ee74ac824dd 100644 --- a/dom/webidl/DummyBinding.webidl +++ b/dom/webidl/DummyBinding.webidl @@ -27,7 +27,6 @@ interface DummyInterface : EventTarget { void DOMWindowResizeEventDetail(optional DOMWindowResizeEventDetail arg); void WifiOptions(optional WifiCommandOptions arg1, optional WifiResultOptions arg2); - void AppNotificationServiceOptions(optional AppNotificationServiceOptions arg); }; interface DummyInterfaceWorkers { diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build index b097a7bd1f6f..f99f0f013523 100644 --- a/dom/webidl/moz.build +++ b/dom/webidl/moz.build @@ -18,7 +18,6 @@ PREPROCESSED_WEBIDL_FILES = [ WEBIDL_FILES = [ 'AnalyserNode.webidl', 'AnimationEvent.webidl', - 'AppNotificationServiceOptions.webidl', 'ArchiveReader.webidl', 'ArchiveRequest.webidl', 'Attr.webidl', From 6870ae02e173f609d71bf1e55ab0ad48105c14c1 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 3 Oct 2013 07:55:23 -0700 Subject: [PATCH 35/46] Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/a9f93ecf3154 Author: Julien Wajsberg Desc: Bug 923456 - The "newcap" rule must be explicitely set to "false" to disable it r=rik --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 65977e4c5e65..e372e2ab131a 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "742a017e771da72f39b4fd237526b4efe462dd86", + "revision": "a9f93ecf31547677dab9eb46f162ce95343bd32e", "repo_path": "/integration/gaia-central" } From 15be3de2fa02da67e5845acc4fab838b86f00e4e Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 3 Oct 2013 08:05:35 -0700 Subject: [PATCH 36/46] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/4b8c8dc5811d Author: Cristian Rodriguez Desc: Merge pull request #12636 from crdlc/bug-923401 Bug 923401 - The collection title should be showed when it is opened always without exception ======== https://hg.mozilla.org/integration/gaia-central/rev/f260d91cf246 Author: crdlc Desc: Bug 923401 - The collection title should be showed when it is opened always without exception --- 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 e372e2ab131a..28fb3234221c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "a9f93ecf31547677dab9eb46f162ce95343bd32e", + "revision": "4b8c8dc5811d0d619e54fe1131122de750dc6141", "repo_path": "/integration/gaia-central" } From f57be3d379021a7faeda8bd4da4cf9a729546b9b Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 3 Oct 2013 09:05:23 -0700 Subject: [PATCH 37/46] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/993bb249c5df Author: Cristian Rodriguez Desc: Merge pull request #12547 from crdlc/bug-lazy-dom-elements Bug 922020 - Lazy load DOM nodes via HTML Import polyfill ======== https://hg.mozilla.org/integration/gaia-central/rev/f00a92586b0e Author: crdlc Desc: Bug 922020 - Lazy load Contacts DOM nodes via HTML Import polyfill --- 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 28fb3234221c..8929907b9977 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "4b8c8dc5811d0d619e54fe1131122de750dc6141", + "revision": "993bb249c5df7858efaf2f96b3139f1d1dfe3ec0", "repo_path": "/integration/gaia-central" } From b2029d968dad608fd3308df6a794bae1467710ff Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 3 Oct 2013 09:30:22 -0700 Subject: [PATCH 38/46] Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/f5bf7aaa3214 Author: Evelyn Eastmond Desc: Bug 921115 - [Clock] Lap string is not localized r=jugglinmike --- 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 8929907b9977..27da9b986c73 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "993bb249c5df7858efaf2f96b3139f1d1dfe3ec0", + "revision": "f5bf7aaa3214395c98255fa01ff5348db4c77098", "repo_path": "/integration/gaia-central" } From 14e0c56f7d9b6681667755919265671644e32fb5 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 3 Oct 2013 09:40:23 -0700 Subject: [PATCH 39/46] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/991402cd93d6 Author: Ran Ben Aharon Desc: Merge pull request #12634 from EverythingMe/911544-offline-ready Bug 911544 - [e.me][feature] Support offline-ready [r=crdlc] ======== https://hg.mozilla.org/integration/gaia-central/rev/7e280031920d Author: Ran Ben Aharon Desc: Bug 911544 - [e.me][feature] Support offline-ready [r=crdlc] --- 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 27da9b986c73..5b464462b1b0 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "f5bf7aaa3214395c98255fa01ff5348db4c77098", + "revision": "991402cd93d6054bd4ad09fca676eeed673e09b3", "repo_path": "/integration/gaia-central" } From 03bc02f1f5a80f70e88e91a232963d3abdf809c7 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 3 Oct 2013 09:55:23 -0700 Subject: [PATCH 40/46] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/9fd8ef3b7fa0 Author: Evyatar Amitay Desc: Merge pull request #12640 from EverythingMe/923420-translate-more-apps [Bug 923420] Add 'More Apps' to l10n [r=crdlc] ======== https://hg.mozilla.org/integration/gaia-central/rev/24f079bc0cff Author: Evyatar Amitay Desc: [Bug 923420] Add 'More Apps' to l10n [r=crdlc] --- 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 5b464462b1b0..da0893664e98 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "991402cd93d6054bd4ad09fca676eeed673e09b3", + "revision": "9fd8ef3b7fa03b5abde9f2888a47239866b361f3", "repo_path": "/integration/gaia-central" } From 1de76ca44c5134d8e98b7319db2381e20bbe602e Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 3 Oct 2013 10:05:23 -0700 Subject: [PATCH 41/46] Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/91ceb4e44110 Author: Julien Wajsberg Desc: Bug 914454 - Ensure SMS messages in only uppercase Greek letters are sent with 7bit encoding on the carrier partner network r=rwaldron Set x-inputmode=-moz-sms-7bit for SMS 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 da0893664e98..4b585443b47d 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "9fd8ef3b7fa03b5abde9f2888a47239866b361f3", + "revision": "91ceb4e441109423c7580c24fc0b2a084dc3e0c8", "repo_path": "/integration/gaia-central" } From 746b03ceb0e8abb45d564f21ce9401e002c18fb0 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 3 Oct 2013 11:15:24 -0700 Subject: [PATCH 42/46] Bumping gaia.json for 3 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/bb654d6017aa Author: Francisco Jordano Desc: Merge pull request #12656 from arcturus/bug-914191 Bug 914191 - [Contacts] Import contacts from SD card make phone not enter sleep. ======== https://hg.mozilla.org/integration/gaia-central/rev/a78cd31786db Author: Francisco Jordano Desc: Bug 914191 - [Contacts] Import contacts from SD card make phone not enter sleep. ======== https://hg.mozilla.org/integration/gaia-central/rev/d30466480e07 Author: Ran Ben Aharon Desc: [Bug 903405] [E.me][L10n] After changing language, the description in e.me should change [r=crdlc] --- 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 4b585443b47d..09bf945f8fc8 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "91ceb4e441109423c7580c24fc0b2a084dc3e0c8", + "revision": "bb654d6017aa14a53807aef34c45a07fa31e21c0", "repo_path": "/integration/gaia-central" } From 0adbdbe083ec2a3594ae1706cba78972207ce8d2 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 3 Oct 2013 11:40:23 -0700 Subject: [PATCH 43/46] Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/dbdd39110d1c Author: Evyatar Amitay Desc: Merge pull request #12645 from EverythingMe/923445-grid-icons-alignment [Bug 923445] Align grid icons on first page [r=crdlc] ======== https://hg.mozilla.org/integration/gaia-central/rev/fdb7c0b8fbc4 Author: Evyatar Amitay Desc: [Bug 923445] Align grid icons on first page [r=crdlc] ======== https://hg.mozilla.org/integration/gaia-central/rev/25dc49bfa2fa Author: Francisco Jordano Desc: Merge pull request #12651 from wanderview/contacts-notify-empty Bug 923467: notifyAboveTheFold() when no contacts ======== https://hg.mozilla.org/integration/gaia-central/rev/4b01ee152bb7 Author: Ben Kelly Desc: Bug 923467: notifyAboveTheFold() when no 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 09bf945f8fc8..5d6b2de7a137 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "bb654d6017aa14a53807aef34c45a07fa31e21c0", + "revision": "dbdd39110d1cc52a414830a4f6d052c0019791ae", "repo_path": "/integration/gaia-central" } From d33f64748dd1a57f8ff70cce293910f2e98d41ac Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 3 Oct 2013 13:45:24 -0700 Subject: [PATCH 44/46] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/4e435fd97c9c Author: Francisco Jordano Desc: Merge pull request #12639 from jmcanterafonseca/fix_gmail_import_name Bug 898304 - [Contact] Import from gmail shows null when the contact doe... ======== https://hg.mozilla.org/integration/gaia-central/rev/5fc1a5c64982 Author: Jose M. Cantera Desc: Bug 898304 - [Contact] Import from gmail shows null when the contact does not have name --- 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 5d6b2de7a137..e32241475361 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "dbdd39110d1cc52a414830a4f6d052c0019791ae", + "revision": "4e435fd97c9ca0473e83c59f49ee27a521a6e3ce", "repo_path": "/integration/gaia-central" } From c9602fe28055c915a303c12350c9a85bd6ca5fb9 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 3 Oct 2013 15:20:23 -0700 Subject: [PATCH 45/46] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/744ef5fa84a3 Author: Ghislain 'Aus' Lacroix Desc: Merge pull request #12453 from nullaus/bug917582-operator-variant-console bug 917582 - OperatorVariantHelper error when IccHelper.enabled == false... ======== https://hg.mozilla.org/integration/gaia-central/rev/c5cf75d8cf0e Author: Ghislain 'Aus' Lacroix Desc: bug 917582 -OperatorVariantHelper error when IccHelper.enabled == false should be more descriptive since it is an expected error when running in b2g desktop or fxos simulator. -Do not throw when IccHelper is undefined, it only indicates that the feature was omitted in the build r=dflanagan --- 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 e32241475361..58980957e827 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "4e435fd97c9ca0473e83c59f49ee27a521a6e3ce", + "revision": "744ef5fa84a355e4c705d74a8424cdc4ef8d8b12", "repo_path": "/integration/gaia-central" } From 3e689970298f88c331a8dba209222836d52ecf7f Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 3 Oct 2013 15:45:23 -0700 Subject: [PATCH 46/46] Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/06ea7706d721 Author: Anthony Ricaud Desc: Revert "Merge pull request #12656 from arcturus/bug-914191" This reverts commit 12d41a0c09531ac8b527b71edaa4daada7b08e9d, reversing changes made to 79cc970a9aca9c1f0888c70b60687b87a8871c32. Conflicts: apps/communications/contacts/test/unit/mock_wakelock.js --- 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 58980957e827..5e150fabd412 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "744ef5fa84a355e4c705d74a8424cdc4ef8d8b12", + "revision": "06ea7706d72174637b5f956122f52200d3f81fda", "repo_path": "/integration/gaia-central" }