Commit Graph

2582 Commits

Author SHA1 Message Date
Ryan VanderMeulen
7b34913ca7 Merge fx-team to m-c. a=merge
CLOSED TREE
2015-01-06 10:55:03 -05:00
Wes Kocher
690f2a5038 Merge m-c to fx-team a=merge 2015-01-05 17:29:14 -08:00
Mike Conley
a4adf2fde1 Bug 1117867 - Disable e10s by default for a week of non-e10s testing on Nightly. r=felipe.
--HG--
extra : amend_source : 8b87f93f4b7156d2f07044af8579c78002e14160
2015-01-05 13:44:25 -05:00
Gavin Sharp
9cd3807a46 Bug 1117158: move search service prefs to all.js, r=markh/margaret/fabrice
--HG--
extra : rebase_source : 5b3380dd9a0dc695c44a2d7d85e8217d8fb2119a
2015-01-05 08:01:12 -08:00
Paul Rouget
76a5e9c75c Bug 1087877 - [timeline] User should be able to filter out any type of marker. r=vporof 2015-01-05 03:06:20 +01:00
ffxbld
9fb7fb3d24 No bug, Automated blocklist update from host bld-linux64-spot-100 - a=blocklist-update 2015-01-03 03:20:28 -08:00
Bill McCloskey
a4ecf73623 Bug 1102643 - [e10s] Prefetching for add-on shims (r=mconley) 2015-01-05 13:49:44 -08:00
ffxbld
744175c38b No bug, Automated blocklist update from host b-linux64-ix-0002 - a=blocklist-update 2014-12-27 03:21:34 -08:00
Brian Grinstead
9fd69f162d Bug 1112258 - Don't enable timeline panel by default on developer edition. r=vporof 2014-12-23 14:14:00 -05:00
Mark Hammond
8dc853f068 Bug 1109120 - use a geoip xhr request for more reliable country detection for search. r=gavin 2014-12-23 22:17:12 +11:00
Matthew Noorenberghe
ee9f79888e Bug 1114486 - Add a trailing slash to loop.gettingStarted.url so switchToTab works properly with the redirect adding the slash. r=jaws
--HG--
extra : rebase_source : 92c5974cabe078f8d12b29605e7293d360a3adc7
2014-12-22 12:25:35 -05:00
ffxbld
02c19cd4f7 No bug, Automated blocklist update from host bld-linux64-spot-115 - a=blocklist-update 2014-12-20 03:20:59 -08:00
Bill McCloskey
73c276ef13 Bug 1110938 - Add timeout for CPOWs (default to 0) (r=dvander) 2014-12-18 17:35:44 -08:00
Carsten "Tomcat" Book
4755deb0c5 merge mozilla-inbound to mozilla-central a=merge 2014-12-18 13:50:27 +01:00
Matthew Noorenberghe
d2c2fdd7eb Bug 1080953 - UITour: tell page when first incoming call is received and if that room window is open. r=dmose,dolske
--HG--
extra : rebase_source : de8a2b58aedc35fb07951736829cd43b8f1632fc
2014-12-17 22:37:19 -05:00
Chris Peterson
249ac81315 Bug 1110031 - Part 1: Mark more directories as FAIL_ON_WARNINGS. r=gps 2014-12-10 22:56:31 -08:00
Gavin Sharp
69a6c5091b Bug 1108627: market-specific search defaults broke default engine behavior for Fennec, so make it desktop Firefox-only, r=dolske 2014-12-08 13:54:17 -08:00
Ryan VanderMeulen
ea023df69a Backed out changeset cab12d762123 (bug 1087877) for e10s mochitest-dt failures. 2014-12-15 15:58:27 -05:00
Paul Rouget
4406c2c5e0 Bug 1087877 - [timeline] User should be able to filter out any type of marker. r=vporof 2014-12-15 05:07:00 -05:00
Chris Peterson
d61475d34f Bug 1108303 - Update gcli inject to use HTTPS and update underscore.js version. r=jwalker 2014-12-06 13:31:19 -08:00
Bob Owen
b539721eb8 Bug 928044 Part 2: Enable the content sandbox by default on Windows with an open policy. r=tabraldes,glandium,jimm
--HG--
rename : security/sandbox/win/src/warnonlysandbox/wosCallbacks.h => security/sandbox/win/src/logging/loggingCallbacks.h
rename : security/sandbox/win/src/warnonlysandbox/wosTypes.h => security/sandbox/win/src/logging/loggingTypes.h
rename : security/sandbox/win/src/warnonlysandbox/warnOnlySandbox.cpp => security/sandbox/win/src/logging/sandboxLogging.cpp
rename : security/sandbox/win/src/warnonlysandbox/warnOnlySandbox.h => security/sandbox/win/src/logging/sandboxLogging.h
2014-11-29 17:12:18 +00:00
ffxbld
0fc40b83df No bug, Automated blocklist update from host b-linux64-ix-0005 - a=blocklist-update 2014-11-29 03:20:01 -08:00
Phil Ringnalda
a9f8d89c2f Merge f-t to m-c, a=merge 2014-11-28 14:52:29 -08:00
Gavin Sharp
c575c1bf7d Bug 1102416 followup: don't put the en-US only hack prefs in a localized file, a=me 2014-11-28 11:40:57 -08:00
Gavin Sharp
ce93d8354d Bug 1102416: make Yahoo the default search plugin for en-US in American time zones, r=dolske, a=me 2014-11-23 20:38:22 -08:00
Dave Townsend
8599032cc9 Bug 1101654: First use tour for search UI. r=felipe 2014-11-20 15:27:10 -08:00
Carsten "Tomcat" Book
e9d5f6eabb Merge mozilla-central to fx-team 2014-11-27 13:03:31 +01:00
Florian Quèze
ad7d7dab67 Bug 1103190 - enable the Flare UI for all locales in Firefox 36, r=felipe. 2014-11-27 12:24:53 +01:00
Anthony Jones
7376e9423b Bug 1103733 - Enable EME on non-release builds; r=cpearce 2014-11-27 16:16:38 +13:00
Ryan VanderMeulen
05536d8139 Merge fx-team to m-c. a=merge 2014-11-26 21:08:54 -05:00
Mark Banner
f9aa45809c Bug 1105488 Update Privacy and ToS URLs for Loop. r=jaws 2014-11-26 22:03:10 +00:00
Marco Bonardo
24bd6339dd Bug 1105456 - Temporarily disable Unified Complete due to recent regressions. r=post-facto a=ryanVM for pushing on a CLOSED TREE central
--HG--
extra : histedit_source : 040465fdd50a2b6a310a8e2169ddad9b7d1d4500
2014-11-26 21:13:18 +01:00
Florian Quèze
94833decfe Bug 1088660 - Improve the search bar UI to support one-off searches, r=felipe. 2014-11-18 00:59:11 +01:00
Carsten "Tomcat" Book
351cb789a0 merge fx-team to mozilla-central a=merge 2014-11-25 12:51:23 +01:00
Gijs Kruitbosch
68377cb915 Bug 1100079 - enable update badging on Nightly, r=gavin 2014-11-18 19:39:47 +00:00
Wes Kocher
1d5fb56d35 Merge inbound to m-c a=merge 2014-11-24 16:55:25 -08:00
Carsten "Tomcat" Book
07ed8e8c39 Merge mozilla-central to fx-team 2014-11-24 14:21:46 +01:00
Carsten "Tomcat" Book
5969f2ac89 merge fx-team to mozilla-central a=merge 2014-11-24 14:06:00 +01:00
Carsten "Tomcat" Book
972242692b merge mozilla-inbound to mozilla-central a=merge 2014-11-24 13:30:23 +01:00
Romain Gauthier
023d0a2865 Bug 1059756 - Add a link to Loop's help page in the gear menu. r=MattN 2014-11-24 09:57:44 +00:00
Mike Conley
d5831722aa Bug 1101193 - Disable e10s on Nightly for several days before Aurora uplift. r=felipe, a=pref-only
Landing this directly on mozilla-central in order to ensure this gets into the
Nightly of November 24th, 2014. That's to ensure a solid week of non-e10s testing
on Nightly.

I felt this matched the 4th bullet for good reasons to land directly on mozilla-central
as listed here: https://wiki.mozilla.org/Tree_Rules#mozilla-central_.28Nightly_channel.29

--HG--
extra : rebase_source : 29e6342890785361517ad4ca22dc9dd44a436893
extra : amend_source : 5b1d730487f5b5e88a1850a95d59b9b50b8e3559
2014-11-19 15:32:45 -05:00
ffxbld
6be8ab4382 No bug, Automated blocklist update from host bld-linux64-spot-132 - a=blocklist-update 2014-11-22 03:19:46 -08:00
Jared Wein
3632bace8a Bug 1099462 - Set the Getting Started URL for Loop. r=MattN 2014-11-21 15:54:38 -05:00
Mark Banner
80e14a0a3d Bug 1096229 Adjust Loop server urls to include /v0 to avoid potential redirects. r=mikedeboer 2014-11-21 15:42:22 -05:00
Mike Conley
5f43ef445f Bug 1106104 - Re-enable e10s by default on Nightly 37. r=felipe.
--HG--
extra : rebase_source : 6932153f7c212079ed61496da44f99e07f9ef2bf
extra : amend_source : dfd66cef66a078ef13be69f6cf1d120e25224aa3
2014-11-28 10:59:29 -05:00
Wes Kocher
dcd7b41c02 Merge m-c to inbound a=merge 2014-11-24 17:09:11 -08:00
Bill McCloskey
7e5124ee68 Bug 1102634 - [e10s] Add pref for add-on shims (r=ally) 2014-11-21 14:01:23 -08:00
Carsten "Tomcat" Book
29e8f34944 Merge mozilla-central to mozilla-inbound 2014-11-24 14:16:11 +01:00
Jacek Caban
416d586a14 Bug 1102809 - Fixed -Wunused-function warnings found in mingw build. r=mattwoodrow 2014-11-24 11:19:36 +01:00
Ehsan Akhgari
c3552da3d5 Bug 1082792 - Build firefox.exe with -MD in ASAN builds; r=glandium
Mixing -MT and -MD as we do by default is not a supported configuration
for ASAN.  Given that we don't require supporting XP SP2 in those
builds, we can opt out of this.
2014-11-24 13:42:33 -05:00