Commit Graph

892 Commits

Author SHA1 Message Date
Myk Melez
12e97baa8f Bug 1030464 - log mozApps debug messages only if pref is set; r=fabrice 2014-06-30 17:27:34 -07:00
Fabrice Desré
31f428d234 Bug 1024157 - Lazy load more js modules - part 1: NFC r=psiddh 2014-05-07 15:53:16 -07:00
Carsten "Tomcat" Book
11b78eff19 merge mozilla-inbound to mozilla-central a=merge 2014-06-27 15:34:28 +02:00
Fernando Jiménez
e4d30f24db Bug 1023266 - Make the Mobile ID API privileged. Part 1: Add mobileid permission. r=smaug, ehsan 2014-06-27 01:18:19 +02:00
Sean Lin
55eae6406e Bug 908999 - Update Registered/Allowed Connections for Inter-App Communication API When App Gets Uninstalled. r=gene 2014-06-20 17:44:37 +08:00
Carsten "Tomcat" Book
662392adb6 Merge mozilla-central to mozilla-inbound 2014-06-26 15:51:31 +02:00
Carsten "Tomcat" Book
f7be686002 merge mozilla-inbound to mozilla-central a=merge
--HG--
extra : amend_source : 8afac23e33906916e7e6297e2307417e09fa27ae
2014-06-26 14:11:00 +02:00
Ghislain 'Aus' Lacroix
6fa5715ded Bug 1023796 - Vertical homescreen without icons in applications after an app gets OOMed. r=fabrice 2014-06-25 22:07:14 -07:00
Shian-Yow Wu
0ca38c19f7 Bug 998243 - Get correct path of packaged app when local installation is skipped. r=marco 2014-06-26 11:17:25 +08:00
Marco Castelluccio
33609a5a86 Bug 922187 - Properly catch exceptions in checkInstalled and fire the error callback on the DOM request. r=myk 2014-06-25 01:51:28 +02:00
Ryan VanderMeulen
b9d5670093 Merge b2g-inbound to m-c. a=merge
--HG--
rename : layout/style/nsCSSStyleSheet.cpp => layout/style/CSSStyleSheet.cpp
rename : layout/style/nsCSSStyleSheet.h => layout/style/CSSStyleSheet.h
2014-06-23 10:56:03 -04:00
James Lal
bb7f3320de Bug 1027458 - Correctly cleanup after canceling a mozapp download. r=fabrice 2014-06-21 01:32:15 +02:00
Fernando Jiménez
bf91e66eac Bug 1006237 - Unify permissions check in nsIDataStore.checkPermission. r=baku, ehsan 2014-06-19 16:03:54 +02:00
Carmen Jimenez
708c1f04e1 Bug 1014517 - Execute the single variant customization the first time a configured SIM is inserted. r=ferjm 2014-06-17 05:00:00 -04:00
Wes Kocher
62217765cf Merge inbound to m-c a=merge 2014-06-11 18:46:34 -07:00
Ed Morley
446d6e3518 Merge mozilla-central and b2g-inbound 2014-06-11 18:06:52 +01:00
Bobby Holley
8172b7e91d Bug 1020609 - Fix up mozApps for Array Xrays. r=mccr8 2014-06-11 15:16:06 -07:00
Antonio M. Amaya
aaae4a79a0 Bug 833633 - Remember permissions granted by users for PROMPT_ACTION through an update. r=ferjm 2014-06-11 04:47:00 -04:00
Myk Melez
0115947054 Bug 1019054 - re-add uninstallation from about:apps context menu; r=mfinkle,marco 2014-06-10 15:52:47 -07:00
Richard Newman
59410a1ef5 Bug 1021342 - Eliminate non-synthetic web app code. r=myk,mfinkle 2014-06-10 10:37:38 -07:00
Ryan VanderMeulen
8ad58324ce Merge m-c to inbound on a CLOSED TREE. a=me 2014-06-07 13:36:44 -04:00
Myk Melez
d4ff39f24e Bug 1013433 - complete the packaged app update process; r=mfinkle,marco 2014-06-06 12:10:59 -07:00
Wes Kocher
6be262ea9e Merge fx-team to mozilla-central a=merge 2014-06-04 17:44:12 -07:00
Martyn Haigh
3dd4b21c70 Bug 985614- Trigger onsuccess for package install from marketplace. r=myk 2014-06-03 05:13:00 -04:00
Sean Lin
040151966e Bug 899260 - System notifications are fired even if the message handler is not set in the manifest file of the app. r=gene 2014-06-03 18:27:12 +08:00
Marco Castelluccio
1f5f000d8d Bug 1013895 - Stop _processManifestForIds from modifying the registry. r=myk 2014-06-07 11:28:45 +02:00
Randell Jesup
7f8962f409 Bug 1021643: allow Certified B2G apps to access mic and camera without prompting r=pauljt,sicking 2014-06-07 00:12:45 -04:00
Vivien Nicolas
1ad073089f Bug 988212 - Change the attention screen permission from |certified| to |privileged|. r=sicking 2014-06-06 20:43:33 +02:00
James Lal
a554e34894 Bug 1027347 - Only set downloadError to an error if it actually is an error and clear past errors after successful states. r=fabrice 2014-06-25 22:47:00 +02:00
Ryan VanderMeulen
c4ae56fcc7 Merge m-c to inbound. 2014-05-28 16:28:34 -04:00
Gene Lian
6b0b14581a Bug 1014594 - IAC: when no apps are selected to connect, we still need to do connections for the existing allowed apps. r=nsm 2014-05-24 11:19:02 +08:00
Carsten "Tomcat" Book
5cdf419e8d Backed out changeset 8473f191f232 (bug 1014594) for gaia ui test failures on a CLOSED TREE 2014-05-28 10:26:49 +02:00
Gene Lian
31f939622c Bug 1014594 - IAC: when no apps are selected to connect, we still need to do connections for the existing allowed apps. r=nsm 2014-05-24 11:19:02 +08:00
Antonio M. Amaya
e3e1b38d3c Bug 1014410 - Silently upgrade permissions PROMPT_ACTION to ALLOW_ACTION for preinstalled privileged apps. r=fabrice 2014-05-26 12:30:11 +02:00
Ryan VanderMeulen
a14ebecdb7 Backed out changeset 09ebd0af27a4 (bug 903291) for frequent B2G debug mochitest crashes. 2014-05-27 15:47:04 -04:00
Carsten "Tomcat" Book
c509721e94 merge b2g-inbound to mozilla-central 2014-05-26 15:26:11 +02:00
Sean Lin
311190e038 Bug 908191 - Use xpcom-interface caller to do interaction between Inter-App Communication API and run-time prompt. r=gene,fabrice 2014-05-26 11:53:44 +08:00
Fernando Jiménez
974cbdab7d Bug 903291 - App download hangs indefinitely if the child process dies before confirming the install. r=fabrice
* * *
Bug 903291 - App download hangs indefinitely if the child process dies before confirming the install
2014-05-24 12:28:13 -07:00
Wes Kocher
ccec589109 Backed out changeset 3986e809158a (bug 903291) for Gu bustage 2014-05-23 15:48:20 -07:00
Fernando Jiménez
40750ab439 Bug 903291 - App download hangs indefinitely if the child process dies before confirming the install. r=fabrice
* * *
Bug 903291 - App download hangs indefinitely if the child process dies before confirming the install
2014-05-23 14:21:09 -07:00
Gene Lian
d9a0fd291b Bug 1009408 - IAC shouldn't check the install origin for certified apps (part 2, remove the install origin check for the certified app in Gecko). r=ferjm 2014-05-13 17:52:20 +08:00
Fernando Jiménez
f2ada05fb6 Bug 988427 - Allow audio-channel-ringer to be used by |privileged| apps. r=pauljt, r=fabrice 2014-05-19 05:10:00 -04:00
Fernando Jiménez
c0129b0c6c Bug 990552 - Grant |privileged| apps use the Telephony channel by requesting the audio-channel-telephony permission. r=pauljt, r=fabrice 2014-05-19 05:09:00 -04:00
Shian-Yow Wu
5c6307cea7 Bug 945152 - Part 3-4: Test case to get array buffor by XHR with app:// URL. r=smaug,fabrice 2014-05-16 13:34:44 +08:00
Ed Morley
112b6ca721 Backed out changeset 3dbd84a99ce8 (bug 993282) for causing bug 1008357 2014-05-15 17:01:56 +01:00
Alphan Chen
55e2846c5c Bug 983502 - navigator.getFeature implementation (support hardware.memory). r=bz 2014-05-12 10:05:03 +08:00
Marco Castelluccio
1ac8981457 Bug 1005048 - Set the error property in the Webapps:UpdateState message and not in the Webapps:FireEvent message. r=fabrice 2014-05-10 10:16:07 +02:00
Myk Melez
ce063f2025 bug 1004825 - prioritized, tagged Android logging in JS; r=mfinkle, marco 2014-05-09 13:15:54 -07:00
Ryan VanderMeulen
bc1e37147b Merge b2g-inbound to m-c. 2014-05-08 15:52:48 -04:00
Fabrice Desré
b655114689 Bug 993282 - Lazy load more js modules - part 1: NFC r=psiddh 2014-05-07 15:53:16 -07:00
Wes Kocher
fae8204d08 Backed out 3 changesets (bug 993282) for b2g emulator mochitest 3 failures
Backed out changeset 30e0991d49e0 (bug 993282)
Backed out changeset 6b9c8d6ab401 (bug 993282)
Backed out changeset 96e1a542bb45 (bug 993282)
2014-05-07 18:47:17 -07:00
Fabrice Desré
365d7ca756 Bug 993282 - Lazy load more js modules - part 1: NFC r=psiddh 2014-05-07 15:53:16 -07:00
Alexandre Lissy
ad096abd0a Bug 963234 - Move AlertsHelper out of shell.js. r=fabrice, r=ochameau 2014-05-01 05:23:00 -04:00
Ed Morley
42a7f8cefd Merge mozilla-central and inbound 2014-04-29 18:23:29 +01:00
Fredrik Lanker
8ac8f7a03b Bug 1002383 - Mark fallback cache entries correctly. r=ochameau
storeCache is async, so at the time markEntry was run for fallback
items, the cache entry might not exist yet which led to that the
fallback entries were not properly marked. Instead, we now send the
proper type directly to storeCache.
2014-04-28 02:20:00 +02:00
Marco Castelluccio
e9960a3308 Bug 999220 - Make confirmInstall call aInstallSuccessCallback after the manifest has been written to disk. r=fabrice 2014-04-29 04:18:00 -04:00
Marco Castelluccio
e5d2b450b6 Bug 947565 - Remove custom timeout in packaged apps tests. r=fabrice 2014-04-29 04:02:00 -04:00
Ryan VanderMeulen
330cfa8d95 Backed out changeset 9d04bde9fcd1 (bug 989806) for Android mochitest failures. 2014-04-27 21:25:28 -04:00
Marco Castelluccio
958a771d98 Bug 997886 - Test installing and updating apps with asm.js pre-compiling. r=fabrice 2014-04-26 03:37:00 -04:00
Marco Castelluccio
294bf89e5f Bug 989806 - Use reviewer certs for reviewer pages. r=fabrice 2014-04-27 13:38:00 -04:00
Marco Castelluccio
44d314f69a Bug 989806 - Use reviewer certs for reviewer pages. r=fabrice 2014-04-28 10:50:00 +02:00
Gene Lian
8a7e5577c2 Bug 1003689 - InterAppCommService does not implement nsIObserver. r=ferjm 2014-04-30 14:34:42 +08:00
Marco Castelluccio
ed1841fc1f Bug 915879 - Wait for _writeFile to finish before continuing. r=fabrice 2014-04-25 11:49:00 -04:00
Marco Castelluccio
47b54822f9 Bug 1027229 - Use the non-localized name to install apps since it allows users to change locale without running into problems. r=myk 2014-06-23 02:22:07 +02:00
Ed Morley
afbbc1aab9 Backed out changeset b589de6c1084 (bug 889744) for failures in test_marketplace_pkg_install.html 2014-04-24 15:29:20 +01:00
Marco Castelluccio
73bf109f8a Bug 889744 - Use reviewer certs for reviewer pages. r=fabrice 2014-04-24 04:27:00 +02:00
Carsten "Tomcat" Book
d87604f93c Merge m-c to mozilla-inbound 2014-04-24 13:20:37 +02:00
Marco Castelluccio
48c22d5c20 Bug 1000168 - Cleanup moz.build files under dom/apps/. r=mshal 2014-04-24 01:53:00 +02:00
Ryan VanderMeulen
b638e3c6b5 Backed out changeset d525f195556d (bug 997886) for intermittent test failures. 2014-04-21 14:23:54 -04:00
Marco Castelluccio
b3091b5932 Bug 984464 - Create mozIApplication objects directly with the mozIApplication constructor (without mutating the prototype). r=fabrice 2014-04-21 11:30:15 -04:00
Marco Castelluccio
8c11956ebb Bug 997886 - Test installing and updating apps with asm.js pre-compiling. r=fabrice 2014-04-21 10:58:19 -04:00
Gene Lian
67f7a4a797 Bug 915884 - Add tests for Inter-App Communication API (part 3, clean up the alignment). r=ferjm 2013-12-12 12:06:00 +08:00
Gene Lian
8e817bea79 Bug 915884 - Add tests for Inter-App Communication API (part 2, xpcshell tests for InterAppCommService.jsm). r=ferjm 2013-12-05 17:57:31 +08:00
Gene Lian
0cea6f5b5e Bug 915884 - Add tests for Inter-App Communication API (part 1, create InterAppCommService.jsm). r=ferjm
--HG--
rename : dom/apps/src/InterAppCommService.js => dom/apps/src/InterAppCommService.jsm
2013-12-02 14:45:33 +08:00
Ryan VanderMeulen
ac4c946801 Merge m-c to b2g-inbound. a=merge 2014-04-18 10:03:35 -04:00
Gene Lian
541a817e18 Bug 967653 - [Inter-App Communication API] use appsService.getAppByManifestURL(aManifestURL).appStatus to get appStatus. r=fabrice a=v1.4+ 2014-04-17 18:57:02 +08:00
Marco Castelluccio
1bd0344246 Bug 993326 - Automatically restore apps launchable value. r=fabrice 2014-04-17 16:43:04 -04:00
Marco Castelluccio
6c4c5956a9 Bug 993326 - Don't directly set the dom.mozApps.auto_confirm_install preference in test_operator_app_install. r=fabrice 2014-04-17 16:43:04 -04:00
Fabrice Desré
140000dc46 Bug 965970 - Add support to compile asm.js code at install/update time r=luke,bholley,marco 2014-04-17 22:03:03 -07:00
Fabrice Desré
afa4ba4584 Bug 996912 - [B2G] Apps will close after the user initiates a BT transfer to another phone r=gene a=v1.3t+ 2014-04-17 10:03:02 +08:00
Marco Castelluccio
79a3aa3327 Bug 996109 - Lazily load some modules in AppsUtils.jsm. r=felipe 2014-04-15 10:45:06 -04:00
Marco Castelluccio
1da7c03cb4 Bug 858772 - Fail if the checkForUpdate request fails instead of timing out. r=fabrice 2014-04-14 11:06:00 +02:00
Marco Castelluccio
b326ec63a2 Bug 906223 - Add currently running app to the registry if it isn't already there. r=fabrice
--HG--
rename : toolkit/webapps/tests/test_hosted_launch.xul => toolkit/webapps/tests/test_hosted_launch_no_registry.xul
rename : toolkit/webapps/tests/test_packaged_launch.xul => toolkit/webapps/tests/test_packaged_launch_no_registry.xul
2014-04-13 14:42:39 -04:00
Alexandre Lissy
5791343b37 Bug 989876 - Keep updateTime field uptodate for gaia apps. r=fabrice 2014-04-09 15:45:15 +02:00
Carmen Jimenez
0096e2592f Bug 992589 - OperatorApps.jsm errors when running with and without Single Variant apps. r=ferjm 2014-04-08 12:46:27 +02:00
Marco Castelluccio
318be9acea Bug 991246 - Fix "aIdsApp is undefined" error in OperatorApps.jsm. r=cjc 2014-04-07 10:42:56 -04:00
Reuben Morais
13ea852996 Bug 982777 - Prompt for permission to use the Camera API in privileged apps. r=sicking r=jdm 2014-04-02 01:08:42 -03:00
Marco Castelluccio
47ee37b2ca Bug 972927 - Re-enable dom/apps tests on b2g. r=RyanVM 2014-03-28 11:29:57 -04:00
Antonio M. Amaya
572fc8db93 Bug 880043 - Signed packaged installation test certificate generation. r=cviecco
--HG--
rename : security/manager/ssl/tests/unit/test_signed_apps/nss_ctypes.py => security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/nss_ctypes.py
rename : security/manager/ssl/tests/unit/test_signed_apps/sign_b2g_app.py => security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/sign_b2g_app.py
2014-03-27 11:02:27 -04:00
David Clarke
9eb9e7237a Bug 880043 - Signed packaged installation tests. r=fabrice 2014-01-21 18:53:55 +01:00
Marco Castelluccio
4e70d25fc5 Bug 981085 - Stop using OS.File in apps code. r=fabrice 2014-03-25 09:14:06 -04:00
Carsten "Tomcat" Book
82d342c637 Merge mozilla-central to fx-team on a CLOSED TREE 2014-03-26 14:01:16 +01:00
Carsten "Tomcat" Book
9cb216684f Backed out changeset 246f001547ac (bug 981085) 2014-03-26 11:09:16 +01:00
Marco Castelluccio
0dbb5d4be6 Bug 981085 - Stop using OS.File in apps code. r=fabrice 2014-03-25 09:14:06 -04:00
Matthew Noorenberghe
cd71affa66 Bug 988000 - Lazily load FreeSpaceWatcher.jsm. r=fabrice 2014-03-25 19:54:48 -07:00
Ryan VanderMeulen
85d2cbd02e Merge inbound to m-c. 2014-03-24 16:47:07 -04:00
Bobby Holley
7f56c979e3 Bug 986940 - Remove Cu.createArrayIn. r=gabor 2014-03-24 11:30:20 -03:00
Marco Castelluccio
f258044304 Bug 986493 - Lazily load some modules in Webapps.jsm. r=felipe 2014-03-24 09:37:27 -04:00
Marco Castelluccio
b8a6061fab Bug 983641 - Fail the apps tests explicitly in case of exceptions instead of letting them fail because of timeouts. r=fabrice 2014-03-19 08:48:24 -04:00
Carmen Jimenez
e12f097e34 Bug 978785 - SV: Enable customization during first time to insert a SIM card. r=fabrice, r=gene 2014-03-11 16:55:55 +01:00
Marco Castelluccio
97ab2c87f2 Bug 898647 - Backend for app updates. r=myk,fabrice
--HG--
rename : browser/modules/webappsUI.jsm => browser/modules/WebappManager.jsm
rename : toolkit/webapps/WebappsInstaller.jsm => toolkit/webapps/NativeApp.jsm
rename : webapprt/WebappsHandler.jsm => webapprt/WebappManager.jsm
2014-03-15 14:37:37 -07:00
Wes Kocher
c71cbaa650 Backed out changeset 4ce831d82c1f (bug 898647) for gaia-ui bustage on an already CLOSED TREE
--HG--
rename : browser/modules/WebappManager.jsm => browser/modules/webappsUI.jsm
rename : toolkit/webapps/NativeApp.jsm => toolkit/webapps/WebappsInstaller.jsm
rename : webapprt/WebappManager.jsm => webapprt/WebappsHandler.jsm
2014-03-14 14:13:25 -07:00
Marco Castelluccio
2a551f3b08 Bug 898647 - Backend for app updates. r=myk,fabrice
--HG--
rename : browser/modules/webappsUI.jsm => browser/modules/WebappManager.jsm
rename : toolkit/webapps/WebappsInstaller.jsm => toolkit/webapps/NativeApp.jsm
rename : webapprt/WebappsHandler.jsm => webapprt/WebappManager.jsm
extra : rebase_source : d009be9de28cb917062d567592f773e9ece4266e
2014-03-14 10:30:53 -07:00
Bill McCloskey
aa5f40a77e Bug 982828 - [e10s] Disable mochitest-plain tests that don't pass in e10s (r=ted) 2014-03-13 21:38:19 -07:00
Wes Kocher
a3277d291d Backed out changeset 88425ad0f06a (bug 982828) for introducing various mochitest-5 failures on a CLOSED TREE
* * *
Backed out changeset 94f9ebdc6662 (bug 982828)
2014-03-13 19:41:21 -07:00
Bill McCloskey
f4f6bf8e4d Bug 982828 - [e10s] Disable mochitest-plain tests that don't pass in e10s (r=ted) 2014-03-13 15:41:41 -07:00
Bill McCloskey
7193069fa0 Backed out changeset d6261f65070a 2014-03-13 15:52:27 -07:00
Bill McCloskey
69a746922b Bug 982828 - [e10s] Disable mochitest-plain tests that don't pass in e10s (r=ted) 2014-03-13 15:41:41 -07:00
Vaibhav Agarwal
086e8d6332 Bug 971132 - B2G mochitests should use the new manifest format; r=jmaher 2014-03-12 11:41:08 -04:00
Vaibhav Agarwal
9a59a5c96d Bug 971132 - B2G mochitests should use the new manifest format; r=jmaher 2014-03-06 13:42:43 -05:00
Wes Kocher
ca3c2f0986 Backed out changeset 6058a0d53426 (bug 903291) for causing bug 977215 2014-02-28 15:25:21 -08:00
Fernando Jiménez
dcd2003855 Bug 903291 - App download hangs indefinitely if the child process dies before confirming the install. r=fabrice 2014-02-24 09:52:15 +01:00
Fabrice Desré
155aecfb5c Backout 96eaa0f376ab (bug 961282) for smoketest regression. 2014-02-21 11:54:03 -08:00
Fabrice Desré
80bd1c4153 Bug 975038 - Remove obsolete indexedDB migration code r=mwu 2014-02-20 11:31:57 -08:00
Marco Castelluccio
35f0c9f4e5 Bug 961282 - In Webapps.jsm, create directories only when really needed. r=fabrice 2014-02-20 15:35:09 -05:00
Ehsan Akhgari
c716aa3244 Bug 973143 - Move some variables to moz.build; r=glandium
--HG--
extra : rebase_source : b767d6cb044efa50844129df80864b9e802b51bd
2014-02-18 02:02:00 -05:00
Ehsan Akhgari
16b2ad1171 Backed out changeset 5ecd0339a087 (bug 973143) because of a possible Talos regression 2014-02-18 14:27:51 -05:00
Ehsan Akhgari
88c47212e9 Bug 973143 - Move some variables to moz.build; r=glandium 2014-02-18 02:02:00 -05:00
Phil Ringnalda
045a2cbe55 Merge m-i to m-c 2014-02-15 09:54:57 -08:00
Brian Smith
83e4eaa908 Bug 896620: Make marketplace certs work on in all products, r=keeler
--HG--
extra : source : 86ec7137a8892f75918c77e605df970f5b96ef62
extra : histedit_source : 33326790804d49e6ec658626116ebf870d94d445
2014-02-14 14:37:07 -08:00
James Hugman
7bdb1c804e Bug 970467 - wait until after saving apps to call hosted app install success callback; r=fabrice 2014-02-14 09:54:00 -08:00
Alfredo Yang
3a4bbe0a0b Bug 853356 - gUM video permisson prompt. r=fabrice, felipc, wjohnston, mrbkap, jimm, jesup, khuey, jsmith 2014-02-09 15:34:40 -05:00
Boris Zbarsky
8367dee14d Bug 965094. Reconcile the behavior of the JSObject* argument for Func on interfaces and on interface members. r=bholley 2014-02-05 13:38:18 -05:00
Honza Bambas
e9a11b99f8 Bug 956930 - Launching an app preloading appcache throws an offline error, r=jduell+sicking 2014-02-04 01:52:57 +01:00
Fabrice Desré
9a9349ce2f Bug 959941 - [B2G][Marketplace] Launching Candy Crush will open into the file system menu r=ferjm 2014-02-03 07:58:33 -08:00
Ryan VanderMeulen
2a828dc50d Merge m-c to inbound. 2014-02-01 17:22:56 -05:00
Fabrice Desré
da7e46af81 Bug 966502 - Use Cu.cloneInto() instead of ObjectWrapper.jsm r=baku 2014-02-01 11:06:59 -08:00
Marco Castelluccio
ae14f0c452 Bug 961468 - In _readManifests, read the manifests without checking file existence. r=fabrice 2014-01-31 13:14:17 -05:00
Ryan VanderMeulen
cb279069ad Merge m-c to inbound. 2014-01-31 21:16:16 -05:00
Myk Melez
68ceae48ec bug 934760 - refactor DOMApplicationRegistry.checkForUpdate to expose updateHostedApp/updatePackagedApp; r=fabrice"
--HG--
extra : rebase_source : 5cc51a4d8f57e6a3ed8cc88df5b96e0dd4088565
2014-01-31 14:50:37 -08:00
Myk Melez
11af04fdf3 bug 962858 - bypass native installation during automated tests; r=mfinkle,fabrice
--HG--
extra : rebase_source : bf4a585b4f7bee784d36a7338ba1f592bdedae94
2014-01-24 20:51:30 -08:00
Carmen Jimenez
f1bbd80ecd Bug 960601 - Fixed installation of priviledged app with origin. r=fabrice 2014-01-22 15:42:56 +01:00
Marco Castelluccio
cf5ec19be8 Bug 960837 - Use the basic receipt check introduced in bug 757226 for installations. r=fabrice 2014-01-23 09:46:20 -05:00
Myk Melez
461b17725e Bug 958356 - rename packageName to unambiguous name in app objects; r=wesj, fabrice
--HG--
extra : rebase_source : abde2ac924fd8265319f1ffa386f0447518fc46d
2014-01-22 13:09:47 -08:00
Myk Melez
eabe546e90 bug 962229 - suppress spurious error messages about webapps.json not found on Fennec firstrun; r=fabrice
--HG--
extra : amend_source : 5ddf753e11f7d3a7d120d1db5f0700db810a2a8a
2014-01-22 10:08:48 -08:00
Alexandre Poirot
4f60ea3b19 Bug 961655 - Ensure that webapps-registry-ready event is fired, even if the Webapps registry is initialized before shell.html is loaded. r=fabrice 2014-01-22 10:06:29 -08:00
Myk Melez
afd5c3940d Bug 953328 - followup nit fixes to change that makes about:apps work with synthetic APKs; r=wesj, fabrice 2014-01-22 01:02:47 -08:00
Myk Melez
5932f7fdbf Bug 953328 - make about:apps work with synthetic APKs; r=wesj 2014-01-22 00:50:02 -08:00
Marco Castelluccio
c23020f93d Bug 959420 - Followup to fix the last saveApps call introduced in bug 757226. r=fabrice 2014-01-16 17:00:29 -08:00
Marco Castelluccio
6060d57d0c Bug 757226 - Implement mozApps addReceipt, removeReceipt, replaceReceipt. r=fabrice,andym,kumar 2014-01-16 16:26:26 -08:00
Marco Castelluccio
a05143f25c Bug 959420 - Refactor saveApps, getManifestFor, readManifests, writeFile functions to use promises. r=fabrice 2014-01-16 16:26:24 -08:00
Wes Kocher
1e0c835efd Merge b2g-inbound to m-c 2014-01-09 16:32:37 -08:00
Fabrice Desré
8ee4f54361 Bug 940254 - Make "storage" permission in the database not grant "offline-app" r=gwagner 2014-01-08 17:14:22 -08:00
Wes Kocher
f94698e85f Backed out changeset fe10dc4545c6 (bug 940254) for xpcshell bustage 2014-01-08 18:21:35 -08:00
Fabrice Desré
1e0f7b7f32 Bug 940254 - Make "storage" permission in the database not grant "offline-app" r=gwagner 2014-01-08 17:14:22 -08:00
Wes Kocher
8f3b601c7c Merge m-c to inbound 2014-01-06 18:14:57 -08:00
Fabrice Desré
c8c087b2d6 Bug 956833 - Clear manifests cache on memory pressure r=gal 2014-01-06 13:03:50 -08:00
Kevin Grandon
87da82b944 Bug 949242 - [inter-app-comm-api] Wrongly filters out messages when the page has a hash. r=gene, r=fabrice 2014-01-06 15:25:28 -05:00
Marco Castelluccio
50ba2b6f81 Bug 917673 - Throw APP_PACKAGE_INVALID when the JAR is invalid and throw APP_PACKAGE_CORRUPT when the JAR has been tampered with. r=fabrice 2013-12-15 14:03:28 -05:00
Randell Jesup
fac641fbfb Bug 853356: backout p1 2013-12-10 01:00:18 -05:00
Fabrice Desré
96e317fb1e Bug 937917 - [Facebook] Fix to support https and enable webshare activities r=ferjm 2013-12-09 14:05:14 -08:00
Alfredo Yang
e36a238d1e Bug 853356 - Part1 Add new permissions and prompt for mutiple permissions request. r=fabrice, felipc, wjohnston, mrbkap, jimm 2013-12-06 17:38:51 -05:00
Andrea Marchesini
97c72a5e48 Bug 942639 - Make DataStore API Certified-only for 1.3, r=ehsan, r=fabrice 2013-12-05 23:12:23 +00:00
Ryan VanderMeulen
ae2b8d02ad Backed out changeset 9fb6d1811696 (bug 942639) for B2G mochitest-3 timeouts. 2013-12-05 11:36:01 -05:00
Andrea Marchesini
949dd56a57 Bug 942639 - Make DataStore API Certified-only for 1.3, r=ehsan, r=fabrice 2013-12-05 13:50:11 +00:00
Ryan VanderMeulen
e57afbe1f2 Merge m-c to inbound. 2013-12-02 16:58:15 -05:00
Fernando Jiménez
8577cf4780 Bug 928389 - Default to strong listeners added via DOMRequestHelper. Part 2: Webapps. r=fabrice, genelian, bkelly 2013-12-02 21:39:04 +01:00
Carmen Jimenez
6e97eb218e Bug 935924 - [SingleVariant] 3rd party apps are deleted after a factory reset. r=fabrice 2013-11-21 17:56:15 +01:00
Antonio M. Amaya
9e0ccf1512 Bug 926219 - Relax the signature validation for locally installed apps. r=bsmith, r=fabrice 2013-11-19 20:41:54 +01:00
Fabrice Desré
619c5db6bd Bug 938023 - Implement the download API : Part 2, implementation. r=auswerk 2013-11-27 23:18:08 -08:00
Randy Lin
19e505c45a Bug 854753 - [B2G][Audio] Implement SpeakerManager API. r=amarchesini, sr=jonas 2013-11-25 12:50:03 +13:00
Myk Melez
b2e72b42d4 bug 910815 - refactor package installation to improve maintainability; r=fabrice 2013-11-25 15:14:35 -08:00
Antonio M. Amaya
4218da7115 Bug 936018 - Ensure that we update the child objects even when the child was already known. r=fabrice 2013-11-20 00:12:12 +01:00
Ben Kelly
6cbcf4947b Bug 924565: Part 1: Declare nsIObserver QI in DOMRequestHelper child classes. r=fabrice 2013-11-20 13:33:10 +08:00
Mike Hommey
a65383e1e9 Bug 939632 - Remove LIBRARY_NAME for leaf libraries. r=gps
Landing on a CLOSED TREE.
2013-11-19 11:50:54 +09:00
Mike Hommey
8ceb917350 Bug 939074 - Remove most LIBXUL_LIBRARY. rs=gps 2013-11-19 11:48:10 +09:00
Mike Hommey
d7b6f95761 Bug 935881 - Use FINAL_LIBRARY for all (fake) libraries that end up linked in a single other library. r=gps 2013-11-19 11:47:14 +09:00
Garner Lee
356af575a4 Bug 674741 - Part 5: NFC Permissions Changes. r=fabrice
--HG--
extra : rebase_source : 77f7485328b2fd1e57cf6b8ef845dcd0afb7845e
2013-11-04 17:17:05 -08:00
Ms2ger
b381084fe3 Bug 931459 - Move LOCAL_INCLUDES to moz.build in dom/; r=mshal 2013-11-11 09:04:11 +01:00
Fernando Jiménez
621e7bfb8b Bug 927699 - navigator.mozApps.install(url) lets NS_ERROR_FAILURE onto the web. r=fabrice 2013-11-07 12:30:31 +01:00
Reuben Morais
cd93ebe5c9 Backed out 4 changesets (bug 853356) for breaking permission prompts. 2013-11-06 01:32:42 -02:00
Ryan VanderMeulen
9f768a7f28 Merge m-c to inbound. 2013-11-05 15:36:23 -05:00
Fernando Jiménez
d263aaed9a Bug 933719 - Missing deprecated Webapps:PackageEvent 2013-11-05 20:10:17 +01:00
Alfredo Yang
d986bb0870 Bug 853356 - Part1 Add new permissions and prompt for mutiple permissions request. r=fabrice, felipc, wjohnston, mrbkap, jimm 2013-11-05 16:29:27 +08:00
Kan-Ru Chen (陳侃如)
3e69e11d54 Backout 3903cb4b779f 2013-11-05 15:00:31 +08:00
Alfredo Yang
cbe0ab494e Bug 853356 - Part1 Add new permissions and prompt for mutiple permissions request. r=fabrice, felipc, wjohnston, mrbkap, jimm 2013-11-05 14:05:52 +08:00
Antonio M. Amaya
bdbae3a6be Bug 932843 - Allow the installation of operator packaged apps without network connection. r=fabrice 2013-11-01 02:58:28 +01:00
Ed Morley
2e6e6cf1f6 Merge mozilla-central and b2g-inbound 2013-11-01 13:17:37 +00:00
Tim Chien
185ed6b3c2 Bug 915570 - Rename 'keyboard' permission and role to 'input'. r=yxl 2013-11-01 09:01:14 -04:00
Doug Turner
28599ccc63 Backing out 7fe2c77ebbf2 2013-10-31 20:25:03 -07:00
Edgar Chen
362732e1a0 Bug 926343 - Part 5: Use default clientId in OperatorApps. r=fabrice 2013-10-16 16:15:35 +08:00
Alfredo Yang
7adc033362 Bug 853356 - Part 1: Add new permissions and prompt for mutiple permissions request. r=fabrice, felipc, wjohnston, mrbkap, jimm 2013-10-26 21:19:32 -04:00
Phil Ringnalda
e5b6bdef9d Bug 928262 - Disable test_operator_app_install.xul on Windows for frequent timeouts 2013-10-26 15:23:25 -07:00
Mike Hommey
1d566f7586 Bug 929905 - Consolidate sources in moz.build. r=gps 2013-10-25 08:23:05 +09:00
Trevor Saunders
d3d322d222 [PATCH] bug 922566 - kill dom-config.mk
From 6681eaa8bb47ddb4756fd71738771c4c437101c0 Mon Sep 17 00:00:00 2001
---
 content/media/webspeech/recognition/Makefile.in |  1 -
 content/media/webspeech/recognition/moz.build   |  5 +-
 content/media/webspeech/synth/Makefile.in       |  1 -
 content/media/webspeech/synth/pico/Makefile.in  |  3 --
 dom/alarm/Makefile.in                           |  2 -
 dom/apps/src/Makefile.in                        |  1 -
 dom/base/Makefile.in                            |  2 -
 dom/base/moz.build                              | 26 ++++++++++-
 dom/battery/Makefile.in                         |  1 -
 dom/bindings/Makefile.in                        |  3 --
 dom/bindings/moz.build                          | 17 ++++++-
 dom/bindings/test/Makefile.in                   |  5 +-
 dom/bluetooth/Makefile.in                       |  2 -
 dom/bluetooth/moz.build                         |  7 ++-
 dom/browser-element/Makefile.in                 |  3 --
 dom/browser-element/moz.build                   |  6 ++-
 dom/camera/Makefile.in                          |  1 -
 dom/camera/moz.build                            |  5 +-
 dom/devicestorage/Makefile.in                   |  1 -
 dom/dom-config.mk                               | 61 -------------------------
 dom/encoding/Makefile.in                        |  1 -
 dom/fmradio/Makefile.in                         |  2 -
 dom/fmradio/ipc/Makefile.in                     |  1 -
 dom/fmradio/ipc/moz.build                       |  5 +-
 dom/fmradio/moz.build                           |  5 +-
 dom/icc/src/Makefile.in                         |  4 --
 dom/media/Makefile.in                           |  3 --
 dom/media/moz.build                             |  6 ++-
 dom/mobilemessage/src/Makefile.in               |  1 -
 dom/mobilemessage/src/moz.build                 |  5 +-
 dom/network/src/Makefile.in                     |  2 -
 dom/plugins/base/Makefile.in                    |  1 -
 dom/plugins/base/moz.build                      |  8 +++-
 dom/power/Makefile.in                           |  1 -
 dom/quota/Makefile.in                           |  1 -
 dom/system/gonk/Makefile.in                     |  2 -
 dom/telephony/Makefile.in                       |  1 -
 dom/time/Makefile.in                            |  1 -
 dom/wifi/Makefile.in                            |  5 --
 39 files changed, 85 insertions(+), 123 deletions(-)
 delete mode 100644 dom/dom-config.mk
 delete mode 100644 dom/wifi/Makefile.in
2013-10-23 17:20:55 -04:00
Myk Melez
7ed59e75c8 bug 934756 - implement install/launch/uninstall flows for webapps on Android using synthetic APKs; r=wesj, fabrice
--HG--
extra : rebase_source : d97be65ec4c033f5eca37bc0b6f94979398fcf02
2014-01-09 10:18:55 -08:00
Fabrice Desré
0f64c6b40c Bug 927959 - Cannot preinstall a hosted app with appcache in a SIM customization variant r=ferjm 2013-10-23 16:50:57 -07:00
Terrence Cole
7a8646e521 Bug 929783 - Fix an exact rooting hazard in InterAppComm::EnabledForScope; r=smaug 2013-10-22 11:35:24 -07:00
Trevor Saunders
b61d74dae0 Backed out changeset 99b17c404db2 and e40a964458f8 for landing stuff that shouldn't have and then backing out stuff that should have stayed on a CLOSED TREE
--HG--
extra : amend_source : 54312955270ea4098a3add3cd0708866de2e40bb
2013-10-21 18:58:14 -04:00
Trevor Saunders
4898a4f035 bug 922566 - kill dom-config.mk r=gps 2013-10-11 12:02:41 -04:00
Fernando Jiménez
be4193d29b Bug 910466 - Refactor IPC app state updating. r=fabrice 2013-10-17 14:47:58 +02:00
Edgar Chen
03610d47f9 Bug 873380 - Part 1: Refined the error report policy for card lock functionality. r=smaug. sr=hsinyi 2013-09-25 14:49:44 +08:00
Fabrice Desré
94d42490f8 Bug 918658 - Don't pretend that mozIApplication inherits from mozIDOMApplication r=bent 2013-10-08 15:52:26 -07:00
Phil Ringnalda
ebe7b42c23 Merge m-c to m-i 2013-10-04 22:17:30 -07:00
Fernando Jiménez
c842df0573 Bug 915598 - Allow strong references to DOMRequestIPCHelper message listeners. Part 4: Tests. r=fabrice 2013-10-04 23:59:48 +02:00
Fernando Jiménez
c5aabf22e5 Bug 915598 - Allow strong references to DOMRequestIPCHelper message listeners. Part 3: Webapps usage. r=fabrice 2013-10-04 23:59:48 +02:00
Paul Rouget
048cf2d0e4 Bug 919981 - Dispatch app (un)install events via the webapps actor. r=fabrice 2013-10-04 13:01:14 -04:00
Ms2ger
bc14e4aa9c Merge m-c to inbound. 2013-10-03 11:09:17 +02:00
Ms2ger
105ce73cfa Bug 922268 - Remove empty makefiles; r=gps 2013-10-03 09:10:00 +02:00
Yoshi Huang
d6bd7819f3 Bug 921958 - B2G RIL: Exception... "'JavaScript component does not have a method named: "notifyCardStateChanged"'. r=fabrice 2013-10-01 18:36:15 +08:00
Fabrice Desré
260d412c8d Bug 919902 - [B2G][Helix][System][denghuachang]Device can not enter OS and stay on the third logo after uninstall some applications r=ferjm 2013-10-01 11:01:08 -07:00
Ed Morley
5f372d43ac Merge mozilla-central and inbound 2013-09-30 17:26:43 +01:00
Gregory Szorc
cc1da2c22a Bug 920223 - Part 2: Mass convert MOCHITEST_CHROME_FILES to manifests; rs=Ms2ger 2013-09-30 09:52:01 +02:00
Edgar Chen
7e786b9fbd Bug 921402 - Part 3: [OperatorApps] Use nsIIccProvider to get iccInfo. r=fabrice 2013-09-27 17:52:25 +08:00
Wes Kocher
3039134040 Merge b2g-inbound to m-c 2013-09-27 19:35:44 -07:00
Gregory Szorc
e53ac5e38d Bug 920223 - Part 1: Mass convert MOCHITEST_FILES to manifests; rs=Ms2ger 2013-09-30 09:51:57 +02:00
Ed Morley
d84dee3273 Backed out changeset 77bff106b704 (bug 920223) 2013-09-30 12:50:12 +01:00
Ed Morley
038cae0901 Backed out changeset 68b6b152f51a (bug 920223) 2013-09-30 12:50:09 +01:00
Gregory Szorc
483a776413 Bug 920223 - Part 2: Mass convert MOCHITEST_CHROME_FILES to manifests; rs=Ms2ger 2013-09-30 09:52:01 +02:00
Gregory Szorc
cabc6369a6 Bug 920223 - Part 1: Mass convert MOCHITEST_FILES to manifests; rs=Ms2ger 2013-09-30 09:51:57 +02:00
Carmen Jimenez
9ee2be6cfa Bug 919469 - Change the default value of the dom.webapps.firstRunWithSIM preference. r=fabrice 2013-09-23 13:24:20 +02:00
Marco Castelluccio
8f55a5a049 Bug 914931 - Test packaged apps update. r=fabrice 2013-09-27 07:59:03 -04:00
Olli Pettay
1c9447672c Bug 921033 - Make InterAppMessageEvent to use webidl event codegen, r=gene.lian
--HG--
rename : dom/webidl/InterAppMessageEvent.webidl => dom/webidl/MozInterAppMessageEvent.webidl
2013-09-27 13:50:05 +03:00
Marco Castelluccio
484147825c Bug 855765 - Move test_bug_795164 to dom/apps and avoid UI confirmation. r=fabrice
--HG--
rename : dom/apps/tests/test_uninstall_errors.html => dom/apps/tests/test_bug_795164.html
2013-09-25 09:37:21 -04:00
Yuan Xulei
552458a636 Bug 905573 - Add setInputMethodActive to browser elements to allow gaia system set the active IME app. r=fabrice 2013-09-23 09:40:59 -04:00
Marco Castelluccio
f62cd88dd9 Bug 859631 - Move test_uninstall_errors to dom/apps and avoid UI confirmation. r=fabrice 2013-09-19 15:38:45 -04:00
Marco Castelluccio
7c334a2059 Bug 916921 - Fix checkInstalled usage in test_packaged_app_install. r=fabrice 2013-09-17 11:12:15 -04:00
Andrea Marchesini
376ecbb43f Bug 871445 - patch 10 - DataStore: indexedDB permissions, r=ehsan 2013-10-02 13:27:23 -04:00
Andrea Marchesini
fbd4ec2a30 Bug 871445 - patch 4 - DatAStore: permissions, owned/access, r=mounir, r=ehsan
--HG--
rename : dom/datastore/tests/file_app.template.webapp => dom/datastore/tests/file_app2.template.webapp
rename : dom/datastore/tests/test_revision.html => dom/datastore/tests/file_revision.html
2013-10-02 13:27:14 -04:00
Andrea Marchesini
583e47bb3f Bug 871445 - patch 1 - DataStoreService and getDataStores(), r=mounir, r=fabrice, r=ehsan
--HG--
rename : dom/apps/tests/file_app.sjs => dom/datastore/tests/file_app.sjs
rename : dom/apps/tests/file_hosted_app.template.webapp => dom/datastore/tests/file_app.template.webapp
2013-10-02 13:27:07 -04:00
Ed Morley
98e8051ead Backed out changeset 3986762b88a3 (bug 871445) for failures in test_app_install.html 2013-10-02 17:58:06 +01:00
Ed Morley
b107b4f9ce Backed out changeset 0e76a4134db2 (bug 871445) 2013-10-02 17:57:43 +01:00
Ed Morley
67b40b6094 Backed out changeset 2767ff221c92 (bug 871445) 2013-10-02 17:57:25 +01:00
Andrea Marchesini
260c564f42 Bug 871445 - patch 10 - DataStore: indexedDB permissions, r=ehsan 2013-10-02 11:30:34 -04:00
Andrea Marchesini
0b36f0a4fc Bug 871445 - patch 4 - DatAStore: permissions, owned/access, r=mounir, r=ehsan
--HG--
rename : dom/datastore/tests/file_app.template.webapp => dom/datastore/tests/file_app2.template.webapp
rename : dom/datastore/tests/test_revision.html => dom/datastore/tests/file_revision.html
2013-10-02 11:30:26 -04:00
Andrea Marchesini
96b73df8b6 Bug 871445 - patch 1 - DataStoreService and getDataStores(), r=mounir, r=fabrice, r=ehsan
--HG--
rename : dom/apps/tests/file_app.sjs => dom/datastore/tests/file_app.sjs
rename : dom/apps/tests/file_hosted_app.template.webapp => dom/datastore/tests/file_app.template.webapp
2013-10-02 11:30:26 -04:00
Randell Jesup
83830f4a3c Bug 915705: reland changesets f6402ce2b67a and 5bdec1cb1428 r=bz 2013-09-16 02:39:03 -04:00
Antonio M. Amaya
ee96afe54a Bug 903291 - Part 2: Update newly created objects on childs with changes on parent. r=fabrice 2013-09-13 11:33:52 +02:00
Carmen Jimenez
695e8b6bd1 Bug 893800 - Unit tests for the Single Variant Apps. r=fabrice 2013-09-09 12:05:54 +02:00
Carmen Jimenez
b4294000c9 Bug 893800 - Install single variant apps the first time a SIM is detected. r=fabrice 2013-07-31 21:34:19 +02:00
Yuan Xulei
8474728fee Bug 901434 - Keyboard/IME API should be exposed to privileged app. r=fabrice 2013-09-13 14:29:26 -04:00
Marco Castelluccio
57a341b1a3 Bug 877932 - Check if the app is locally installed in the checkInstalled function. r=fabrice 2013-09-13 08:07:04 -04:00
Ryan VanderMeulen
09be8444e3 Backed out changesets 2a58557adc6f and e69381450554 (bug 893800) for test_app_uninstall.html timeouts. 2013-09-13 09:47:17 -04:00
Ryan VanderMeulen
8597044d83 Backed out changeset 7b018235edc0 (bug 877932) for test_app_uninstall.html timeouts. 2013-09-13 09:39:54 -04:00
Marco Castelluccio
8ce18edaff Bug 905881 - Move the package to the local installation directory. r=fabrice, r=myk 2013-09-13 08:32:47 -04:00
Marco Castelluccio
f052767d42 Bug 907481 - Check if localId is already used before using it. r=fabrice 2013-09-13 08:22:24 -04:00
Carmen Jimenez
0f9d4a257d Bug 893800 - Unit tests for the Single Variant Apps. r=ferjm 2013-09-09 12:05:54 +02:00
Carmen Jimenez
201ce9870a Bug 893800 - Install single variant apps the first time a SIM is detected. r=fabrice 2013-07-31 21:34:19 +02:00
Marco Castelluccio
ebe857fefe Bug 877932 - Check if the app is locally installed in the checkInstalled function. r=fabrice 2013-09-13 08:07:04 -04:00
Fabrice Desré
be5db6bbc4 Bug 915881 - Allow sideloading of certified apps r=ochameau 2013-09-13 00:49:11 -07:00
Gene Lian
51820322ba Bug 876397 - Inter-App Communication API (part 9, new promise). r=nsm 2013-09-12 23:21:10 +08:00
Gene Lian
e8400b1bf6 Bug 876397 - Inter-App Communication API (part 8, follow-up). r=bent 2013-09-12 22:14:48 +08:00
Gene Lian
d722fb9abe Bug 876397 - Inter-App Communication API (part 7, refine). r=bent 2013-09-12 21:01:00 +08:00
Gene Lian
3f3120ff6e Bug 876397 - Inter-App Communication API (part 6, post message). r=nsm,bent 2013-08-16 17:50:37 +08:00
Gene Lian
3a77acd448 Bug 876397 - Inter-App Communication API (part 5, connection wrapper). r=nsm 2013-08-16 17:49:53 +08:00
Gene Lian
04dc589339 Bug 876397 - Inter-App Communication API (part 4, getConnections()). r=nsm 2013-08-17 22:40:01 +08:00
Gene Lian
f2b8dd7403 Bug 876397 - Inter-App Communication API (part 3, connect()). r=nsm 2013-08-16 17:49:15 +08:00
Gene Lian
1613ee2d06 Bug 876397 - Inter-App Communication API (part 2, manifest registry). r=nsm 2013-08-16 17:48:37 +08:00
Gene Lian
04be0c1786 Bug 876397 - Inter-App Communication API (part 1, Web IDLs). r=nsm,ted sr=smaug 2013-07-30 22:03:06 +08:00
Ryan VanderMeulen
ce0f027f99 Merge b2g-inbound to m-c. 2013-09-11 20:58:14 -04:00