Benjamin Smedberg
27a6ed9eb4
Bug 853973 - If a plugin is overlayed by other content on the page, then treat it as a hidden plugin: hide the overlay and present the infobar for click-to-play or crashed plugins, r=jaws
2013-12-17 10:53:32 -05:00
Carsten "Tomcat" Book
799e8605e5
Merge mozilla-central to mozilla-inbound
2013-12-17 13:16:00 +01:00
Carsten "Tomcat" Book
b6ee9780c4
merge fx-team to mozilla-central
2013-12-17 12:47:11 +01:00
Henri Sivonen
8f254a1c64
Bug 949345 - Gather telemetry about non-default Cyrillic legacy encodings. r=emk,f=sstamm.
2013-12-17 12:47:25 +02:00
Wes Kocher
1280a9d9a4
Merge m-c to mozilla-inbound
2013-12-16 21:34:34 -08:00
Wes Kocher
b8a8bd4ca4
Merge inbound to m-c
2013-12-16 21:33:31 -08:00
Shane Caraveo
26a7f2e9b1
bug 935640 part 2 Australis, update social sidebar with new ux, activation panel, r=markh
2013-12-16 21:38:22 -08:00
Ryan VanderMeulen
64cc5ca3eb
Merge m-c to fx-team.
2013-12-16 17:00:19 -05:00
Ryan VanderMeulen
1afb369d7b
Merge inbound to m-c.
2013-12-16 16:58:27 -05:00
Heather Arthur
f22df63ea1
Bug 949678 - Rule view should show inline sheet links as 'inline:<lineno>' instead of '/:<lineno>' when source maps are enabled; r=pbrosset
2013-12-16 11:49:17 -08:00
Panos Astithas
b8d78d3bd3
Bug 773563 - Cleanup BTA_detach callers to avoid redundant state checks; r=robcee
2013-12-16 21:27:00 +02:00
Carsten "Tomcat" Book
945b5cb10e
Merge mozilla-central to fx-team
2013-12-16 16:08:50 +01:00
Nick Alexander
e0226fc1b7
Bug 923950 - Fix Android single locale repacks. r=glandium
...
There are two parts to this. The first is to add AndroidManifest.xml
as a dependency to the "no dependencies" ap_ built during packaging.
The aapt call requires it. So "no dependencies" is more accurately
"no *resource* dependencies".
The second is to avoid including the Android res/ directory in the
language repack step. What happens is that the l10n.py script sees
the Android res/ files left in the dist/ directory after unpacking and
expects to find them in the objdir. They're not there, so the script
fails. To avoid this, we delete them after unpacking. See the
comments in packager.mk describing this process.
--HG--
extra : rebase_source : 35c3c125dddcd575c1a5e8ad58f9aa13ff2db4c3
2013-12-14 15:36:17 -08:00
Phil Ringnalda
29c097638f
Bug 934057 - Disable test_notifications_popup.html on Linux for constant failures
...
--HG--
extra : rebase_source : 1c585e1593ccfbcc5613ebe07aed594a0e8c762b
2013-12-15 21:17:52 -08:00
Phil Ringnalda
cd4db255b7
Back out 2412b1a7b97e (bug 863872) for Android xpcshell orange
2013-12-14 18:48:06 -08:00
Brian Grinstead
4783fb9e1f
Bug 950097 - [ruleview] Styles not being updated on some pages;r=paul
2013-12-13 13:17:23 -06:00
David Keeler
c5f0099402
bug 887321 - initial OCSP stapling telemetry r=briansmith
2013-12-16 09:32:16 -08:00
Jim Mathies
f07ef3ba59
Bug 950288 - Update the last run id when the browser launches so it's always up to date. r=bbondy
2013-12-16 11:06:08 -06:00
Nicholas Nethercote
3b7c5d2e8c
Bug 945973 (part 4) - Add SystemMemoryReporter, which presents Linux-specific, system-wide memory measurements taken from the OS. r=glandium.
...
--HG--
extra : rebase_source : 032d1d2944b790ac9e9e4d7f18c8ac9d79858ef3
2013-12-04 19:32:50 -08:00
Nicholas Nethercote
0c6f2b5076
Bug 945973 (part 3) - Fix some trivial reporter/report confusions in aboutMemory.js. r=mccr8.
...
--HG--
extra : rebase_source : 12eec13cd507100fa29bf798372784d5d8bcfbdb
2013-12-03 20:20:15 -08:00
Nicholas Nethercote
c5dab89370
Bug 945973 (part 2) - Don't complain if there aren't any "explicit" reports for a process. r=mccr8.
...
--HG--
extra : rebase_source : 05129260b8a3e7cfbdadcecffe4c18715254323c
2013-12-03 20:19:41 -08:00
Nicholas Nethercote
392bf9cb31
Bug 945973 (part 1) - Remove about:memory's is-a-sentence description check. r=mccr8.
...
--HG--
extra : rebase_source : bf47145a953a23b73fa1e7c441b695ffeceafbb8
2013-12-03 20:10:59 -08:00
Benjamin Smedberg
c1d7e0f7f3
Bug 941137 followup - fix xpcshell test which expects the test plugin to be click-to-activate to actually set the state it desires.
2013-11-21 12:37:47 -05:00
Mike Conley
e6246f9341
Bug 863872 - If we have overdue TelemetryPings, try to send them all. r=nfroyd, feedback=irving.
2013-12-14 15:30:00 -05:00
Mike Hommey
0f2cce4150
Bug 949334 - Use FINAL_LIBRARY for webrtc. r=gps
2013-12-14 11:38:53 +09:00
Nathan Froyd
c429c9c441
Bug 932285 - part 3 - don't export comments to telemetry's string table; r=vladan
2013-12-06 15:18:48 -05:00
Nathan Froyd
4c8765f1fa
Bug 932285 - part 2 - convert nsITelemetry.registeredHistograms to a function returning an array; r=vladan
2013-12-13 12:56:11 -05:00
Nathan Froyd
12daf67baf
Bug 932285 - part 1 - iterate over registered histograms, then check existence in snapshots; r=vladan
2013-12-13 12:22:02 -05:00
Monica Chew
f286cbfec8
Bug 837202: Add telemetry for application reputation check (r=paolo,yoric)
2013-12-12 11:20:11 -08:00
Mike Conley
0032d627e3
Backout fa2130fc4f08 (bug 863872) due to xpcshell orange. r=bustage-fix for CLOSED TREE.
2013-12-13 16:33:13 -05:00
Ryan VanderMeulen
adf6ecbe13
Merge m-c to inbound.
2013-12-13 16:16:46 -05:00
Ryan VanderMeulen
c7ce80e17d
Merge inbound to m-c.
2013-12-13 16:15:52 -05:00
Brian R. Bondy
e2cb100a24
Bug 945829 - Metrofox hangs on startup when trying to show the profile chooser dialog. r=jimm
2013-12-13 12:12:00 -05:00
Jim Mathies
5e155a22a4
Bug 949590 - When switching browsers, wait for the previous instance to close the profile before launching. r=bbondy
2013-12-13 09:51:21 -06:00
Wes Kocher
3b7fc0a192
Merge inbound to m-c
2013-12-12 19:12:51 -08:00
Bill McCloskey
1c2ce4d177
Bug 948238 - Fix ASAN bustage on a CLOSED TREE
2013-12-12 15:27:07 -08:00
Jared Wein
1e5e5802de
Bug 926487 - Replace className comparisons with classList.contains in viewSource.js. r=Unfocused
...
--HG--
extra : rebase_source : 1e5a9b55e2c455b08454e8bd17afe4412f42a042
2013-12-12 18:14:25 -05:00
Mike Conley
0db316251a
Bug 863872 - If we have overdue TelemetryPings, try to send them all. r=nfroyd, feedback=irving.
2013-12-06 16:37:52 -05:00
Ehsan Akhgari
d009c157e2
Bug 940821 - Build crashreporter in unified mode; r=ted
2013-12-13 09:55:39 -05:00
Carsten "Tomcat" Book
1afaf84b1f
merge mozilla-central to fx-team
2013-12-12 16:09:30 +01:00
Carsten "Tomcat" Book
1aface9dae
merge fx-team to mozilla-central
2013-12-12 13:28:08 +01:00
Matt Brubeck
411cdadc85
Bug 946296 - Add a pref to completely disable add-on providers in Metro [r=Unfocused]
2013-12-11 16:23:36 -08:00
Matt Brubeck
f22f1abbbf
Back out c237f02b3578 (bug 946296) because it broke mochitest-metro-chrome
2013-12-11 18:46:53 -08:00
Matt Brubeck
761e142d7e
Bug 946296 - Add a pref to completely disable add-on providers in Metro [r=Unfocused]
2013-12-11 16:23:36 -08:00
Nick Alexander
42814c41ba
Bug 934646 - Part 3: Declare Android resource directories relative to $SRCDIR. r=glandium,gps,mfinkle
...
--HG--
rename : mobile/android/base/resources/drawable-mdpi/crash_reporter.png => mobile/android/base/crashreporter/res/drawable-mdpi/crash_reporter.png
rename : mobile/android/base/resources/layout/crash_reporter.xml => mobile/android/base/crashreporter/res/layout/crash_reporter.xml
rename : mobile/android/branding/aurora/content/fennec_72x72.png => mobile/android/branding/aurora/res/drawable-hdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_48x48.png => mobile/android/branding/aurora/res/drawable-mdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_96x96.png => mobile/android/branding/aurora/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_144x144.png => mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_72x72.png => mobile/android/branding/beta/res/drawable-hdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_48x48.png => mobile/android/branding/beta/res/drawable-mdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_96x96.png => mobile/android/branding/beta/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_144x144.png => mobile/android/branding/beta/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_72x72.png => mobile/android/branding/nightly/res/drawable-hdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_48x48.png => mobile/android/branding/nightly/res/drawable-mdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_96x96.png => mobile/android/branding/nightly/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_144x144.png => mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_72x72.png => mobile/android/branding/official/res/drawable-hdpi/icon.png
rename : mobile/android/branding/official/content/fennec_48x48.png => mobile/android/branding/official/res/drawable-mdpi/icon.png
rename : mobile/android/branding/official/content/fennec_96x96.png => mobile/android/branding/official/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_144x144.png => mobile/android/branding/official/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_72x72.png => mobile/android/branding/unofficial/res/drawable-hdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_48x48.png => mobile/android/branding/unofficial/res/drawable-mdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_96x96.png => mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_144x144.png => mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png
extra : rebase_source : f6ec8a38594e70520b10202c735dc019f8c856fd
2013-12-11 21:20:07 -08:00
Tim Taubert
b1670632a9
Bug 947583 - Fix "this.updateProviderURLs is not a function" when toggling "Block reported attack sites" preference r=dolske
...
From 8ba7cef13d00454ddcdec7e4f8eb32bcb6bee5ac Mon Sep 17 00:00:00 2001
2013-12-07 09:50:19 +01:00
Ryan VanderMeulen
6292d5e586
Merge fx-team to m-c.
2013-12-11 13:29:43 -05:00
Carsten "Tomcat" Book
ee52c53bd6
merge fx-team to mozilla-central
2013-12-11 10:15:44 +01:00
Matthew Noorenberghe
5216e8d870
Bug 897074 - Lower MAX_SEARCH_TOKENS to 10 in FormHistory.jsm. r=dolske
2013-12-11 00:05:31 -08:00
Matthew Noorenberghe
ae221c76c9
Bug 897074 - Limit the number of tokens used in satchel's getAutoCompleteResults SQL queries. r=dolske
2013-12-10 23:34:42 -08:00
