Commit Graph

222647 Commits

Author SHA1 Message Date
Ryan VanderMeulen
e0b22e2139 Backed out changeset 46822560ac53 (bug 1118804) for mochitest-dt failures.
CLOSED TREE
2015-01-09 11:16:00 -05:00
Masatoshi Kimura
e22607aacf Bug 1113780 - Use SSL_ERROR_UNSUPPORTED_VERSION for SSLv3 error page. r=gijs 2015-01-09 06:23:00 +00:00
Carsten "Tomcat" Book
91d1296031 Merge mozilla-central to fx-team 2015-01-09 15:51:09 +01:00
Eddy Bruël
dc4646c774 Bug 1105652 - Handle uncaught promise rejections in the style editor;r=bgrins 2015-01-09 15:45:33 +01:00
Eddy Bruël
c278433a76 Bug 1118806 - Handle uncaught promise rejections in the storage inspector;r=pbrosset 2015-01-09 15:26:54 +01:00
Patrick Brosset
03b25d47cc Bug 1114780 - Re-enable devtools animation actors tests; r=me 2015-01-09 15:22:38 +01:00
Patrick Brosset
15a96ee892 Bug 1113091 - Make the AnimationPlayerActor aware of the player ready promise; r=bgrins 2015-01-09 15:21:05 +01:00
Eddy Bruël
b92bfb4326 Bug 1118804 - Handle uncaught promise rejections in the inspector;r=pbrosset 2015-01-09 15:09:28 +01:00
Carsten "Tomcat" Book
e478167826 merge fx-team to mozilla-central a=merge 2015-01-09 14:16:30 +01:00
Carsten "Tomcat" Book
1a341c3f97 merge b2g-inbound to mozilla-central a=merge 2015-01-09 14:08:02 +01:00
Mark Banner
f218d0cc59 Bug 1119485 - Link clicker UI no longer resets to the stat conversation view after giving feedback. r=nperriault 2015-01-09 09:07:46 +00:00
B2G Bumper Bot
034ed3aae1 Bumping manifests a=b2g-bump 2015-01-08 21:26:54 -08:00
B2G Bumper Bot
bea79a1488 Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/de2fb8cf47d9
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 1060915 - Accept view-source:protocol"

This reverts commit 4417a3ad0cd311f5ca856655d71f9355c4c93467.

========

https://hg.mozilla.org/integration/gaia-central/rev/430af407fdb1
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #27239 from cctuan/1118174

Bug 1118174 - [TextSelection] Copypaste bubble should not show on the front of utility_tray

========

https://hg.mozilla.org/integration/gaia-central/rev/9d05647a7f62
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 1118174 - [TextSelection] Copypaste bubble should not show on the front of utility_tray
2015-01-08 21:22:16 -08:00
B2G Bumper Bot
512c392ceb Bumping manifests a=b2g-bump 2015-01-08 19:51:40 -08:00
B2G Bumper Bot
e51b77cfca Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/eb5610c19cae
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #27222 from huchengtw-moz/bug-1115273-open-search-bar

Bug 1115273 - [Stingray][smart-home/smart-system] Implement opening sear..., r=dwi2

========

https://hg.mozilla.org/integration/gaia-central/rev/52bee514ee5b
Author: John Hu <johu@mozilla.com>
Desc: Bug 1115273 - [Stingray][smart-home/smart-system] Implement opening search bar
2015-01-08 19:47:31 -08:00
B2G Bumper Bot
687f74188c Bumping manifests a=b2g-bump 2015-01-08 19:36:53 -08:00
B2G Bumper Bot
b3f1e5fb0f Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/fb9c19e72876
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #27215 from KevinGrandon/bug_1113050_action_menu_zindex

Bug 1113050 - Increase action menu z-index to cover gesture-panel r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/f03f5d84b1c1
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1113050 - Increase action menu z-index to cover gesture-panel r=alive
2015-01-08 19:32:15 -08:00
B2G Bumper Bot
8b35dc5907 Bumping manifests a=b2g-bump 2015-01-08 19:22:06 -08:00
B2G Bumper Bot
cde7328752 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f3ba8a176128
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #27244 from takenspc/bug1060915

Bug 1060915 - Accept view-source:protocol r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/a689e445941d
Author: Takeshi Kurosawa <taken.spc@gmail.com>
Desc: Bug 1060915 - Accept view-source:protocol
2015-01-08 19:17:27 -08:00
B2G Bumper Bot
5366718926 Bumping manifests a=b2g-bump 2015-01-08 19:06:54 -08:00
B2G Bumper Bot
a289df1371 Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/31dadd978219
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #27210 from KevinGrandon/bug_1118891_remove_geolocation_request

Bug 1118891 - [E.me] Remove geolocation request from api helper

========

https://hg.mozilla.org/integration/gaia-central/rev/ba17799efa0b
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1118891 - [E.me] Remove geolocation request from api helper r=crdlc

========

https://hg.mozilla.org/integration/gaia-central/rev/9880d46209dd
Author: Greg Weng <snowmantw@gmail.com>
Desc: Revert "Merge pull request #27052 from snowmantw/bug1116091-rev2"

This reverts commit 12d74b902d356f94837bcf0edcd4f4089f77207d, reversing
changes made to 91bd809dc8c3f0f600b782f09443be4d954e9ff9.
2015-01-08 19:02:15 -08:00
dlee
73129bab53 Bug 1109456 - Support NFC tag transceive WebAPI. r=smaug, yoshi
---
 dom/nfc/NfcContentHelper.js        |   33 ++++++++++++++++++++++
 dom/nfc/gonk/Nfc.js                |    7 ++++-
 dom/nfc/gonk/NfcGonkMessage.h      |    2 ++
 dom/nfc/gonk/NfcMessageHandler.cpp |   54 ++++++++++++++++++++++++++++++++++++
 dom/nfc/gonk/NfcMessageHandler.h   |    4 ++-
 dom/nfc/gonk/NfcOptions.h          |   13 +++++++++
 dom/nfc/gonk/NfcService.cpp        |    6 ++++
 dom/nfc/nsINfcContentHelper.idl    |   27 ++++++++++++++++--
 dom/nfc/nsNfc.js                   |   19 +++++++++++++
 dom/webidl/MozNFCTag.webidl        |    6 ++++
 dom/webidl/NfcOptions.webidl       |    6 ++++
 11 files changed, 173 insertions(+), 4 deletions(-)
2015-01-09 10:42:48 +08:00
Richard Marti
4ff3eebb09 Bug 1118888 - Remove extra space around Tracking Protection preferences. r=jaws 2015-01-08 22:14:14 +01:00
Jordan Santell
d9a85a2420 Bug 1118299 - Performance tool now provides default blueprint for its waterfall and markers-overview graphs to work. r=vp 2015-01-08 11:17:00 +01:00
Ben Tian
a035b9d1d1 Bug 1118163 - Restore received file for small size (1-packet) file, r=shuang 2015-01-08 18:11:37 +08:00
B2G Bumper Bot
b85c7b7e94 Bumping manifests a=b2g-bump 2015-01-08 18:04:02 -08:00
Wes Kocher
440877789b Merge mozilla-inbound to mozilla-central a=merge 2015-01-08 17:08:12 -08:00
Wes Kocher
6991bac6f9 Merge fx-team to mozilla-central a=merge 2015-01-08 16:58:52 -08:00
Wes Kocher
a40f7cf491 Bug 1073003 - wError bustage fix in non-unified builds r=me a=bustage
--HG--
extra : amend_source : 8054a3a25f0adf4caea5b70f2b75a94665a6e59d
2015-01-08 15:46:15 -08:00
B2G Bumper Bot
7a41eb1db1 Bumping manifests a=b2g-bump 2015-01-08 14:43:56 -08:00
B2G Bumper Bot
1deaa1ca7b Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/85bbbd703dba
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #27205 from julienw/1118829-fix-debug-in-firefox

Bug 1118829 - Restore DESKTOP=1 DEBUG=0 functionality in Firefox r=ocham...

========

https://hg.mozilla.org/integration/gaia-central/rev/4793c9f3c7c0
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 1118829 - Restore DESKTOP=1 DEBUG=0 functionality in Firefox r=ochameau
2015-01-08 14:42:18 -08:00
Dave Hylands
24d125ce40 Bug 1073003 - Create an stlport modifications patch and update README.mozilla r=nfroyd (on a CLOSED TREE) 2015-01-08 13:52:22 -08:00
Dave Hylands
54da7dc7db Bug 1073003 - Fix warnings in stlport causing errors in emulator build. r=bzbarsky 2015-01-08 13:52:20 -08:00
Dave Hylands
62f1864ebc Bug 1073003 - Fix warnings causing errors in emulator build. r=nfroyd 2015-01-08 13:52:19 -08:00
Vivek Balakrishnan
865c062697 Bug 1096669 - Update last synced time every minute in Android Firefox Account status screen. r=nalexander
========

ee8f501d56
Author: Vivek Balakrishnan <vivekb.balakrishnan@gmail.com>
    Bug 1096669 - Update last synced time every minute in Android Firefox Account status screen.

--HG--
extra : rebase_source : 87b5ec409512da7f1d19ae414292897ca14a09b1
2015-01-08 11:28:01 -08:00
Prabhjyot Singh Sodhi
bccf0fa8e8 Bug 1113415 - Make master sync instructions depend on Android version. r=nalexander
========

7d643a54cb
Author: Prabhjyot Singh Sodhi <prabhjyotsingh95@gmail.com>
    Bug 1113415 - Make master sync instructions depend on Android version.

--HG--
extra : rebase_source : 9d7c1479784add321e8d3ee9c59b3d1f99f5c2e4
2015-01-08 11:05:18 -08:00
David Keeler
a1f3b2453c bug 1101194 - follow-up to fix bustage in TestCertDB r=bustage on a CLOSED TREE
Turns out there was a code path that resulted in attempting to acquire a lock
on the DataStorage mutex when one had already been acquired, resulting in
deadlock. This fixes it.
2015-01-08 10:56:07 -08:00
Kai Engert
1aabca1e25 Bug 1107731, upgrade Mozilla 37 to use NSS 3.18 (this is beta 5), r=wtc 2015-01-08 19:40:05 +01:00
Nathan Toone
354e83a584 Bug 1119350 - Upgrade virtualenv to 12.0.5; r=gps
This addresses issues with offline builds - due to pip latest version checking

Source archive downloaded from
https://pypi.python.org/packages/source/v/virtualenv/virtualenv-12.0.5.tar.gz
and uncompressed into python/virtualenv. The egg-info directory was
removed.

--HG--
extra : amend_source : 30a79486d91d9f79a36535eab438c0cd6f81daf3
2015-01-08 10:52:07 -07:00
Mark Finkle
5782999a9a Bug 1118747 - Delay GMPInstallManager initialization for 60 secs after delayed startup (matches Desktop) r=margaret 2015-01-08 14:16:17 -05:00
Jared Wein
eef4699ffe Bug 1119368 - Enable in-content preferences for EARLY_BETA_OR_EARLIER before Beta 36. r=gijs 2015-01-08 13:51:39 -05:00
Mike de Boer
7d30b7e6ab Bug 1114957: cleanup LoopRooms event listeners when the conversation window is closed. r=Niko 2015-01-08 18:52:10 +01:00
B2G Bumper Bot
119b08bd33 Bumping manifests a=b2g-bump 2015-01-08 09:43:57 -08:00
B2G Bumper Bot
7cb37b3b1d Bumping manifests a=b2g-bump 2015-01-08 09:36:55 -08:00
B2G Bumper Bot
06c2beec7a Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d6080ec6a270
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #27218 from KevinGrandon/bug_1118270_bump_package_json

Bug 1118270 - Bump gaia node modules for raptor bump

========

https://hg.mozilla.org/integration/gaia-central/rev/06a64bae25ed
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1118270 - Bump gaia node modules for raptor bump r=kgrandon
2015-01-08 09:32:15 -08:00
Drew Willcoxon
98f17cde03 Bug 1112440 - Make the infobar update correctly to reflect "needs verified user" on about:accounts during Sync migration. r=markh 2015-01-08 09:28:55 -08:00
B2G Bumper Bot
3c65c45f90 Bumping manifests a=b2g-bump 2015-01-08 08:06:56 -08:00
B2G Bumper Bot
7c50a607c1 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f66829c60c08
Author: Salvador de la Puente González <neo.salvador@gmail.com>
Desc: Merge pull request #25656 from lodr/bug-1091486-change-to-mms-when-entering-email-thread

Bug 1091486 - [SMS] Switch to MMS when entering a email recipient thread
r=azasypkin

========

https://hg.mozilla.org/integration/gaia-central/rev/68a8e0b91b55
Author: Salvador de la Puente <salva@unoyunodiez.com>
Desc: Bug 1091486 - [SMS] Switch to MMS when entering a email recipient thread
2015-01-08 07:57:15 -08:00
B2G Bumper Bot
51c58bd789 Bumping manifests a=b2g-bump 2015-01-08 07:51:56 -08:00
B2G Bumper Bot
52cac935d4 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/351d3daeacc5
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Merge pull request #27246 from Cwiiis/bug1118311-followup

Bug 1118311 - Fix linter error in previous patch. r=me

========

https://hg.mozilla.org/integration/gaia-central/rev/56522e161f27
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1118311 - Fix linter error in previous patch. r=me
2015-01-08 07:42:16 -08:00