Ryan VanderMeulen
52ab5ad2dc
Merge b2g-inbound to m-c.
2013-12-09 17:26:11 -05:00
Alex Keybl
e149dacf53
Merging in version bump NO BUG
2013-12-09 13:38:06 -05:00
Phil Ringnalda
f72fddae43
Backed out 5 changesets (bug 944665, bug 922465, bug 930282) for b2g xpcshell crashes
...
CLOSED TREE
Backed out changeset c4f970dd2a4f (bug 930282)
Backed out changeset 625f5303fc68 (bug 930282)
Backed out changeset bf8e90edd152 (bug 922465)
Backed out changeset a21b57c78253 (bug 944665)
Backed out changeset 9275a2efc9e3 (bug 944665)
--HG--
extra : rebase_source : bfbe3786e0db2073e26dc383b89525d22be0b3bd
2013-12-08 15:32:15 -08:00
Patrick Wang
d27736c0b1
Bug 930282: Part 1: Enable Nuwa by default. r=khuey
2013-12-07 10:27:32 +08:00
Patrick Wang
df57fe71d0
Bug 930282: Part 1: Enable Nuwa by default. r=khuey
2013-10-15 17:43:08 +08:00
Fabrice Desré
2d148375b6
Bug 938023 - Implement the download API : Part 2, implementation. r=auswerk
2013-11-27 23:18:08 -08:00
Lukas Blakk
1fcd935dd9
Merging in version bump NO BUG
2013-10-28 13:37:48 -07:00
Ryan VanderMeulen
af288628a8
Merge m-c to inbound.
2013-09-30 16:51:06 -04:00
Benjamin Smedberg
9a19fa4609
Bug 920731 part B - also stop export JS symbols for android and B2G, r=glandium
...
--HG--
extra : rebase_source : 063d2f9e1776e6be4f333c3cc943a45c6d5e7373
2013-09-30 16:09:28 -04:00
Alex Keybl
19bdb8a64c
m-c is now FxOS 1.3 r=merge NO BUG
2013-09-17 14:26:06 -04:00
Alex Keybl
78cc8a9f85
Merging in version bump NO BUG
2013-09-17 09:38:37 -04:00
Thinker Lee ext:(%2C%20Cervantes%20Yu%20%3Ccyu%40mozilla.com%3E)
52df1fd957
Bug 771765 - Support template content process, part 1: the Nuwa API and low-level wrappers. r=khuey
...
Support of zygote-like process forking is done as:
* The b2g chrome process forks a child process that will be the template for forking other content processes.
* The template process starts running to some point and freeze.
* When ready, the chrome process starts requesting the template to fork content proceses.
* The content processes forked from the template process recovers its states including the threads, file descriptors for epoll, signaling and IPC.
Recovery of the process states are done by wrapping some system and pthread calls to record the states in the template process and recover in the forked content process.
2013-05-07 14:25:13 +08:00
Bhavana Bajaj
26604ce559
Merging in version bump NO BUG
2013-08-05 11:06:54 -07:00
Shih-Chiang Chien
30db599e0c
Bug 882526 - Remove Gecko support for WBMP. r=joe, r=roc
2013-07-22 22:31:24 -04:00
Alexandre Poirot
158694a98f
Bug 888409 - Set b2g version to 1.2.0.0 for master. r=akeybl
2013-07-02 08:18:04 -04:00
Alex Keybl
821f644108
Merging in version bump NO BUG
2013-06-24 11:37:32 -07:00
Lukas Blakk
7e9b4bbff1
Merging in version bump NO BUG
2013-05-13 09:09:39 -07:00
Kevin Grandon
85790695f7
Bug 861496 - Replace #ifdef MOZ_SYS_MSG by a preference. r=fabrice
2013-04-30 09:01:46 -04:00
Ms2ger
f7333eed15
Backout changesets 8d69a81abff9:6c2e3ea6afa6 for M2 timeouts and crashtest, reftest leaks.
2013-04-26 13:23:17 +02:00
Kevin Grandon
a3dc1b8ed6
Bug 861496 - Replace #ifdef MOZ_SYS_MSG by a preference. r=fabrice
2013-04-26 12:17:25 +02:00
Camilo Viecco
3241bef579
Bug 864633 - broken site identity info bar. r=bsmith
...
--HG--
extra : rebase_source : 36c4613ed39ab93c33008964ed62bccdcacc9c9c
2013-04-25 13:39:43 -07:00
Bhavana Bajaj
c68f877f73
Merging in version bump NO BUG
2013-04-01 11:28:13 -07:00
Shih-Chiang Chien
5cc5056451
Bug 852053 - Support WBMP on FirefoxOS only. r=joe
2013-03-20 14:03:07 +08:00
Steven Lee
5a1d8c2297
Bug 818843 - Part 2: gyp modifications and add some system call wrappers for B2G. r=ted, r=ethanhugg, r=jesup
2013-03-19 16:02:44 -04:00
Mike Hommey
8ad3f2b1b5
Bug 648407 - Fold NSPR, NSS and SQLite libraries all together on B2G, Android, OSX and Windows. r=blassey,r=cjones,r=bsmedberg
2013-03-17 08:02:54 +01:00
Lukas Blakk
96a4d23df2
Merging in version bump NO BUG CLOSED TREE
2013-02-19 09:35:19 -08:00
David Dahl
e04136004d
Bug 683262 - window.crypto throws if MOZ_DISABLE_DOMCRYPTO is turned on - window.crypto patch - r=jst
...
--HG--
rename : dom/interfaces/base/nsIDOMCrypto.idl => dom/interfaces/base/nsIDOMCryptoLegacy.idl
2013-02-16 22:43:16 -06:00
Phil Ringnalda
c71c586441
Back out 236ba87c0a9f (bug 440046) and d3b7606d94a6:895a7efc978d (bug 683262) for b2g mochitest failures
2013-02-15 23:33:45 -08:00
David Dahl
a29fc61d9f
Bug 683262 - window.crypto throws if MOZ_DISABLE_DOMCRYPTO is turned on - window.crypto patch r=jst
...
--HG--
rename : dom/interfaces/base/nsIDOMCrypto.idl => dom/interfaces/base/nsIDOMCryptoLegacy.idl
2013-02-15 23:34:15 -06:00
Shih-Chiang Chien
3f2dfe58f2
Bug 841243 - Followup fix for the captive portal changes, r=fabrice a=shira+
2013-02-15 14:26:58 -08:00
Shih-Chiang Chien
c5e6583de2
Bug 780793 - Part 1: Add mozChormeEvent/mozContentEvent for captive portal login. r=timdream
2012-11-15 11:26:30 +08:00
Alexandre Poirot
d05ec351a4
Bug 836506 - Set the version on mozilla-central/master to 2.0.0.0-prerelease. r=fabrice
2013-02-04 14:48:14 -05:00
Alexandre Poirot
1c88865c77
Bug 829451 - Change the Firefox OS version to 1.0.0.0 (4 digits). r=fabrice
2013-01-15 19:44:43 -05:00
Alex Keybl
9fc46ad72d
Merging in version bump NO BUG
2013-01-07 12:31:33 -08:00
Richard Newman
387157b566
Bug 788894 - Pref off FHR for B2G. r=gps
2012-12-19 15:37:51 -08:00
Brian Smith
9dcf1b156f
Bug 772365, Part 3: Add B2G-specific customizations to NSS certificate trust database with tests, r=rrelyea r=honzab
...
--HG--
rename : dom/tests/browser/browser_ConsoleStoragePBTest_perwindowpb.js => dom/tests/browser/browser_ConsoleStoragePBTest.js
rename : dom/tests/mochitest/localstorage/test_localStorageBasePrivateBrowsing_perwindowpb.html => dom/tests/mochitest/localstorage/test_localStorageBasePrivateBrowsing.html
rename : security/manager/ssl/tests/mochitest/browser/browser_bug627234_perwindowpb.js => security/manager/ssl/tests/unit/test_bug627234.js
extra : rebase_source : 2792b75d7ccccf80e9a23feed70c134dfcdfe00f
2012-12-10 07:17:29 -08:00
Shelly Lin
9d63415c7d
Bug 816899 - Add keys of firmware revision and software info. r=cjones
2012-12-04 10:30:26 +08:00
Fabrice Desré
d3ef25be45
Fix bustage of b2g desktop builds, no bug r=me
2012-11-30 17:41:15 -08:00
Steven Lee
c4ba48ecb6
Bug 809106 - [music] Unplugging headphones while playing music should pause it. Part2-AudioChannelManager implemenentation. r=jlebar, r=sicking
2012-11-29 17:52:03 -05:00
Gregory Szorc
1edab3eadb
Bug 718067 - Part 1: Create skeletons for services/{metrics,healthreport}; r=rnewman
...
services/metrics will hold generic metrics code. services/healthreport
report will build on top of that to provide the Firefox Health Report
feature. All functionality will land in subsequent patches.
2012-11-05 12:49:58 -08:00
Alex Keybl
d1de145dd7
Merging in version bump NO BUG
2012-11-19 12:03:27 -08:00
Marco Bonardo
2d7946316e
Bug 799609 - Disable Places in B2G - Part 5 - Build B2G without Places
...
r=jlebar
2012-11-09 10:56:01 +01:00
Fabrice Desré
1aad1d89a4
Bug 809325 - change version number to reflect not production-ready state [r=vingtetun]
2012-11-08 16:53:31 -08:00
Mounir Lamouri
5a334278ca
Bug 795715 - Remove B2G-specific stuff from nsIDOMWindow. r=khuey,fabrice sr=smaug
2012-11-07 18:10:40 +00:00
Boris Zbarsky
404d9ab987
Bug 807222 part 2. Condition MozTimeManager classinfo so we don't stick it on the global in builds that don't ship the xpt for it. r=jlebar
2012-11-05 10:20:03 -05:00
Gregory Szorc
0c9a888a7c
Bug 800154 - Refactor how services/ integrates with build system; r=glandium
...
We now have MOZ_SERVICES_COMMON and MOZ_SERVICES_CRYPTO to control
inclusion of services/common and services/crypto, respectively.
2012-10-11 10:34:09 -07:00
Justin Lebar
2633a72813
Bug 799536 - Disable sync on B2G. r=fabrice
2012-10-09 12:49:15 -04:00
Alex Keybl
5e5b54cfae
Merging in version bump NO BUG
2012-10-08 11:01:15 -07:00
Fabrice Desré
2d02559cb5
Bug 787054 - Make the UA string OS agnostic again, use UserAgentOverrides.jsm to white-list sites that need "Android" [r=dao,gerv]
2012-10-03 13:27:46 -07:00
Shelly Lin
439f951fa8
Bug 790158 - Add os version and hardware info to mozSettings. r=cjones
2012-09-19 18:06:40 +08:00
Fernando Jiménez
8140be46f6
Bug 767818 - Implement navigator.pay. Part 4 - B2G implementation; r=fabrice
2012-08-29 18:41:35 -03:00
Ryan VanderMeulen
1a2865e046
Merge m-c to inbound.
2012-08-27 19:34:23 -04:00
Alex Keybl
0f6cdb0532
Merging in version bump NO BUG
2012-08-27 12:21:46 -07:00
Andreas Gal
66294310e0
Revert B2G UA string regression (bug 785647, r=cjones).
2012-08-25 18:02:38 -03:00
Fabrice Desré
5c8940d410
Bug 778758 - Don't build and use the search service on b2g [r=vingtetun]
2012-08-27 10:43:56 -07:00
Jonathan Griffin
02dc92ac91
Bug 779984 - Re-land patch without letting ENABLE_MARIONETTE=1 actually load Marionette in desktop Firefox, r=ted
2012-08-22 16:26:32 -07:00
Jonathan Griffin
261a32b242
Bug 779984 - Backout 98fc3d40910c due to leaking crashtest, CLOSED TREE
2012-08-22 13:11:53 -07:00
Jonathan Griffin
598c998f37
Bug 779984 - replace --enable-marionette with ENABLE_MARIONETTE and make it consistent, r=ted
2012-08-22 11:17:22 -07:00
Dão Gottwald
f5170992cb
Bug 777710 - Remove platform and OS identifiers from B2G UA. r=bz
...
--HG--
extra : rebase_source : 75ddd7a0e75f22a065fc0e7efad3a749511b813d
2012-07-31 17:37:26 +02:00
Lukas Blakk
8c55cde959
Merging in version bump NO BUG
2012-07-16 10:08:20 -07:00
Fabrice Desré
4aa73a62d5
Bug 755245 - Implement System Message Handler : Part 4, B2G glue [r=vingtetun]
2012-07-02 17:16:55 -07:00
Lukas Blakk
7fa7186c92
Merging in version bump NO BUG
2012-06-04 12:36:59 -07:00
Gervase Markham
82ff7027aa
Bug 716478 - update licence to MPL 2.
2012-05-21 12:12:37 +01:00
Lukas Blakk
b8be00698a
Merging in version bump NO BUG a=relman
2012-04-24 12:54:16 -04:00
Malini Das
266b7139f6
Bug 737930 - Enable marionette in confvars.sh instead of mozconfig, r=jgriffin
2012-03-27 11:24:49 -07:00
Joel Maher
710c159137
Bug 712643 - land Marionette on m-c. r=mossop,robcee
2012-03-22 11:19:57 -04:00
Fabrice Desré
d2f974204b
No bug - Bump b2g version number to 14.0a1 [r=me] DONTBUILD because NPOTB
2012-03-14 09:33:12 -07:00
Fabrice Desré
0a1475455a
Bug 723169 - port Bug 671634 to b2g [r=cjones]
2012-02-01 19:13:36 -08:00
Fabrice Desré
b7ee99591b
Backed out changeset 61352cba1254
2012-02-01 19:04:31 -08:00
Fabrice Desré
c2a3b4c2ac
Bug XXXXXX - port Bug 671634 to b2g
2012-02-01 18:51:54 -08:00
Matt Brubeck
62194b3925
Bug 721459 - Enable WebSMS by default for B2G [r=mounir,khuey] DONTBUILD (NPOTB)
2012-01-30 11:46:05 -08:00
Philipp von Weitershausen
8b71672e80
Bug 699876 - Import the initial b2g/ directory. r=cjones
...
--HG--
rename : mobile/xul/LICENSE => b2g/LICENSE
rename : mobile/xul/Makefile.in => b2g/Makefile.in
rename : mobile/xul/app/Makefile.in => b2g/app/Makefile.in
rename : mobile/xul/app/macbuild/Contents/Info.plist.in => b2g/app/macbuild/Contents/Info.plist.in
rename : mobile/xul/app/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in => b2g/app/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in
rename : mobile/xul/app/nsBrowserApp.cpp => b2g/app/nsBrowserApp.cpp
rename : mobile/xul/branding/official/Makefile.in => b2g/branding/official/Makefile.in
rename : mobile/xul/branding/official/android-resources.mn => b2g/branding/official/android-resources.mn
rename : mobile/xul/branding/official/configure.sh => b2g/branding/official/configure.sh
rename : mobile/xul/branding/official/content/Makefile.in => b2g/branding/official/content/Makefile.in
rename : mobile/xul/branding/official/content/about.png => b2g/branding/official/content/about.png
rename : mobile/xul/branding/official/content/favicon32.png => b2g/branding/official/content/favicon32.png
rename : mobile/xul/branding/official/content/jar.mn => b2g/branding/official/content/jar.mn
rename : mobile/xul/branding/official/content/logo.png => b2g/branding/official/content/logo.png
rename : mobile/xul/branding/official/content/logoWordmark.png => b2g/branding/official/content/logoWordmark.png
rename : mobile/xul/branding/official/content/splash.png => b2g/branding/official/content/splash.png
rename : mobile/xul/branding/official/locales/Makefile.in => b2g/branding/official/locales/Makefile.in
rename : mobile/xul/branding/official/locales/en-US/brand.dtd => b2g/branding/official/locales/en-US/brand.dtd
rename : mobile/xul/branding/official/locales/en-US/brand.properties => b2g/branding/official/locales/en-US/brand.properties
rename : mobile/xul/branding/official/locales/jar.mn => b2g/branding/official/locales/jar.mn
rename : mobile/xul/branding/unofficial/Makefile.in => b2g/branding/unofficial/Makefile.in
rename : mobile/xul/branding/unofficial/android-resources.mn => b2g/branding/unofficial/android-resources.mn
rename : mobile/xul/branding/unofficial/configure.sh => b2g/branding/unofficial/configure.sh
rename : mobile/xul/branding/unofficial/content/Makefile.in => b2g/branding/unofficial/content/Makefile.in
rename : mobile/xul/branding/unofficial/content/about.png => b2g/branding/unofficial/content/about.png
rename : mobile/xul/branding/unofficial/content/favicon32.png => b2g/branding/unofficial/content/favicon32.png
rename : mobile/xul/branding/unofficial/content/jar.mn => b2g/branding/unofficial/content/jar.mn
rename : mobile/xul/branding/unofficial/content/logo.png => b2g/branding/unofficial/content/logo.png
rename : mobile/xul/branding/unofficial/content/logoWordmark.png => b2g/branding/unofficial/content/logoWordmark.png
rename : mobile/xul/branding/unofficial/content/splash.png => b2g/branding/unofficial/content/splash.png
rename : mobile/xul/branding/unofficial/locales/Makefile.in => b2g/branding/unofficial/locales/Makefile.in
rename : mobile/xul/branding/unofficial/locales/en-US/brand.dtd => b2g/branding/unofficial/locales/en-US/brand.dtd
rename : mobile/xul/branding/unofficial/locales/en-US/brand.properties => b2g/branding/unofficial/locales/en-US/brand.properties
rename : mobile/xul/branding/unofficial/locales/jar.mn => b2g/branding/unofficial/locales/jar.mn
rename : mobile/xul/build.mk => b2g/build.mk
rename : mobile/xul/chrome/Makefile.in => b2g/chrome/Makefile.in
rename : mobile/xul/chrome/content/commandUtil.js => b2g/chrome/content/commandUtil.js
rename : mobile/xul/chrome/content/netError.xhtml => b2g/chrome/content/netError.xhtml
rename : mobile/xul/chrome/jar.mn => b2g/chrome/jar.mn
rename : mobile/xul/confvars.sh => b2g/confvars.sh
rename : mobile/xul/installer/Makefile.in => b2g/installer/Makefile.in
rename : mobile/xul/installer/package-manifest.in => b2g/installer/package-manifest.in
rename : mobile/xul/installer/removed-files.in => b2g/installer/removed-files.in
rename : mobile/xul/locales/Makefile.in => b2g/locales/Makefile.in
rename : mobile/xul/locales/all-locales => b2g/locales/all-locales
rename : mobile/xul/locales/en-US/chrome/about.dtd => b2g/locales/en-US/chrome/about.dtd
rename : mobile/xul/locales/en-US/chrome/aboutCertError.dtd => b2g/locales/en-US/chrome/aboutCertError.dtd
rename : mobile/xul/locales/en-US/chrome/notification.dtd => b2g/locales/en-US/chrome/notification.dtd
rename : mobile/xul/locales/en-US/chrome/overrides/appstrings.properties => b2g/locales/en-US/chrome/overrides/appstrings.properties
rename : mobile/xul/locales/en-US/chrome/overrides/netError.dtd => b2g/locales/en-US/chrome/overrides/netError.dtd
rename : mobile/xul/locales/en-US/chrome/overrides/passwordmgr.properties => b2g/locales/en-US/chrome/overrides/passwordmgr.properties
rename : mobile/xul/locales/en-US/chrome/phishing.dtd => b2g/locales/en-US/chrome/phishing.dtd
rename : mobile/xul/locales/en-US/chrome/webapps.dtd => b2g/locales/en-US/chrome/webapps.dtd
rename : mobile/xul/locales/en-US/crashreporter/crashreporter-override.ini => b2g/locales/en-US/crashreporter/crashreporter-override.ini
rename : mobile/xul/locales/en-US/defines.inc => b2g/locales/en-US/defines.inc
rename : mobile/xul/locales/en-US/installer/setup.ini => b2g/locales/en-US/installer/setup.ini
rename : mobile/xul/locales/en-US/updater/updater.ini => b2g/locales/en-US/updater/updater.ini
rename : mobile/xul/locales/filter.py => b2g/locales/filter.py
rename : mobile/xul/locales/generic/install.rdf => b2g/locales/generic/install.rdf
rename : mobile/xul/locales/jar.mn => b2g/locales/jar.mn
rename : mobile/xul/locales/l10n.ini => b2g/locales/l10n.ini
rename : mobile/xul/makefiles.sh => b2g/makefiles.sh
2011-12-07 07:52:26 +08:00