Wes Kocher
72e906f6af
Backed out changeset 0ac99e7e0440 (bug 1222377) for testRestrictions bustage in android rc3
...
--HG--
extra : commitid : Lxw3mc0Zmvu
2015-12-15 14:11:10 -08:00
Sebastian Kaspari
19c4497cec
Bug 1222377 - Add option to enable blocking content in restricted profiles. r=margaret
...
(Feature only enabled in Nightly until we deployed an actual block list)
--HG--
extra : commitid : 9KVeAmXbSZV
extra : rebase_source : b55299a0ead543d8dd1bc702ed9b753d4dff009c
extra : amend_source : 5290e5514ff66fad7a3bfa623aaeab66454e17bb
2015-12-15 13:34:49 +01:00
Alessio Placitelli
b535b6abb8
Bug 1231719 - Fix the in-tree docs for threadHangStats/chromeHangStats. r=gfritzsche
2015-12-14 01:01:00 +01:00
Carsten "Tomcat" Book
5a86bca15a
merge mozilla-inbound to mozilla-central a=merge
2015-12-15 12:16:29 +01:00
Phil Ringnalda
7387e07356
Merge m-c to f-t
2015-12-14 22:23:36 -08:00
Phil Ringnalda
e70ec2d790
Merge m-c to m-i
2015-12-14 22:22:33 -08:00
Wes Kocher
f2e16d8160
Bump some telemetry histogram expirations up to 47 to help unbreak m-c ASAP rs=mossop (bug 1232493, bug 1232494, and bug 1232496) a=bustage
...
--HG--
extra : commitid : F7I6CYSjLva
extra : amend_source : 373b916e166ffb00104721733222a185988658d0
2015-12-14 15:59:28 -08:00
Phil Ringnalda
f61cbd01dd
Merge m-i to m-c, a=merge
2015-12-11 21:20:03 -08:00
Carsten "Tomcat" Book
8c8e1c0526
Merge mozilla-central to mozilla-inbound
2015-12-11 11:42:10 +01:00
Carsten "Tomcat" Book
b25476080d
merge mozilla-inbound to mozilla-central a=merge
2015-12-11 11:38:17 +01:00
Kris Maglione
5806db05fe
Bug 1231827: Fix ESLint regressions in toolkit/components/extensions. r=trivial
...
--HG--
extra : commitid : LOHpVyIKcEO
2015-12-11 11:29:08 -05:00
Felipe Gomes
bddd338cd7
Bug 1231728 - Fixes some code to follow eslint rules. r=mak
...
--HG--
extra : commitid : 2pB0pOqsHVW
2015-12-10 14:38:30 -05:00
Felipe Gomes
19f1667df6
Bug 1231728 - Enable no-dupe-args, no-dupe-keys, no-duplicate-case, no-obj-calls, no-with rules globally, no-redlecare and consistent-return in browser. r=Mossop
...
--HG--
extra : commitid : Axo4haH85oJ
2015-12-10 14:34:44 -05:00
Marco Bonardo
c4481294ee
Bug 1231661 - followup: readd somehow lost double quotes. r=post-facto
...
--HG--
extra : commitid : 9yLTD3T4bWC
2015-12-10 14:09:38 -05:00
Marco Bonardo
672223aab8
Bug 1231661 - Relax no-multi-spaces Eslint rule. r=Mossop
...
--HG--
extra : commitid : 1EJvx7UZuqf
extra : rebase_source : be2c04fcb78999c35e4aad215ce399dd50c2448f
2015-12-10 10:15:04 -05:00
Carsten "Tomcat" Book
ffb37c03fb
merge mozilla-inbound to mozilla-central a=merge
2015-12-10 12:05:03 +01:00
Phil Ringnalda
c86db83adf
Bug 1208199 - Skip test_osfile_async_setDates.js on b2g debug, where it fails constantly
2015-12-09 18:40:57 -08:00
Margaret Leibovic
22506e4c27
Bug 1221513 - Disable test_TelemetryEnvironment.js on Android. r=me
...
--HG--
extra : commitid : E2e8gAiw27f
extra : rebase_source : 1398a25dc50d65420c51eb3134312dfc3671a072
2015-12-09 09:32:53 -05:00
David Anderson
d8db9b6470
Add Telemetry for the drawing models that plugins use. (bug 1229961 part 1, r=aklotz,vladan)
...
--HG--
extra : rebase_source : 235694f543026a0b55d8ed65bb1489a3cf97b04d
2015-12-10 13:16:30 -08:00
Chris Pearce
f51937602c
Bug 1230295 - Add telemetry to report when Ogg chaining is used. r=rillian,r=vladan
2015-12-10 12:10:41 -05:00
Carsten "Tomcat" Book
00e5b491e5
Merge mozilla-central to mozilla-inbound
2015-12-10 12:34:09 +01:00
Carsten "Tomcat" Book
8431613ae5
Backed out changeset bcb4ebf6ffac (bug 1198459) for bustage
2015-12-10 11:14:27 +01:00
Carsten "Tomcat" Book
7265490919
Backed out changeset 4b1d470d9f98 (bug 1198459)
2015-12-10 11:14:15 +01:00
Carsten "Tomcat" Book
0dbae93f68
Backed out changeset b3a52644af28 (bug 1198459)
2015-12-10 11:14:12 +01:00
Georg Fritzsche
943da0d5c5
Bug 1231055 - Fix tags usage in PluginProvider. r=dtownsend
2015-12-08 19:52:45 -05:00
Jim Mathies
9973bfb69c
Bug 1198459 - Update telemetry data based on the use of the forced enable pref. r=felipe
...
--HG--
extra : transplant_source : 2u%F3O%9F%20%94%B6f%A3J%23w%9B%F8%E5%9A%F3%8F%FC
2015-12-09 08:56:50 -05:00
Jim Mathies
cecee8b5fa
Bug 1198459 - Add support for disabling e10s if a11y was run in the previous session, or run in a session over the previous week. r=felipe
...
--HG--
extra : transplant_source : %3B_OS%DB%83%3E%8D%B9%A4h%19%90%5C%12/%23%A3%21c
2015-12-09 08:35:06 -05:00
Jim Mathies
33f95db847
Bug 1198459 - Prevent accessibility from initializing in content processes when e10s is running. r=tbsaunde
...
--HG--
extra : transplant_source : %BA%D2uF7%D5%C1jg%0E%BA%9B%84u%3D%10n%C0%93%8B
2015-12-09 08:35:06 -05:00
Andrea Marchesini
32580a380e
Bug 1231100 - Get rid of nsIDOMFileReader - patch 2, r=sicking
2015-12-09 15:52:38 -05:00
Andrea Marchesini
c2230f21f8
Bug 1231100 - Get rid of nsIDOMFileReader - patch 1, r=sicking
2015-12-09 15:52:15 -05:00
Patrick McManus
ef7802ae5c
Bug 1230742 - include ALPN code in existing telemetry description r=hurley
2015-12-05 07:32:29 -05:00
Patrick McManus
4c8ee0930e
Bug 1230743 - telemtry for nsConnectionEntry hit rate r=hurley
2015-12-05 07:43:01 -05:00
Carsten "Tomcat" Book
0eda110956
merge mozilla-inbound to mozilla-central a=merge
2015-12-09 12:02:12 +01:00
Matt Howell
421eb47a4b
Bug 1079858, Deal with deprecation of SHA1 (SHA-1) Authenticode signatures for Windows signing, part 2 (swap cert), r=catlee, a=lizzard
...
--HG--
extra : amend_source : 450203e03ee0f46929ca4b4ce1a1e43b4ea6df97
2015-12-08 16:16:55 -05:00
Matt Howell
23f09f2b29
Bug 1079858, Deal with deprecation of SHA1 (SHA-1) Authenticode signatures for Windows signing, part 1, r=catlee, a=lizzard
...
--HG--
extra : amend_source : 90642316bf1b25d73c8a2b5f4278ec1f9625ed9d
2015-12-08 16:06:26 -05:00
Bill McCloskey
6e0bf624bf
Bug 1208257 - [webext] tabs.json (r=kmag)
2015-12-06 08:50:24 -08:00
Bill McCloskey
7e37c83d7b
Bug 1208257 - [webext] web_navigation.json (r=kmag)
2015-12-06 08:50:24 -08:00
Bill McCloskey
a8890fbf4f
Bug 1208257 - [webext] WebNavigation test (r=kmag)
2015-12-06 08:50:24 -08:00
Bill McCloskey
d85785380e
Bug 1208257 - [webext] web_request.json (r=kmag)
2015-12-06 08:50:24 -08:00
Bill McCloskey
0c3e71a155
Bug 1208257 - [webext] Extension.jsm support for schemas (r=kmag)
2015-12-06 08:50:24 -08:00
Bill McCloskey
28f4ce315b
Bug 1208257 - [webext] Add basic schema support (r=kmag)
2015-12-06 08:50:24 -08:00
Ryan VanderMeulen
ec5f2e23e7
Merge m-c to inbound. a=merge
...
--HG--
rename : browser/.eslintrc => storage/.eslintrc
rename : devtools/.eslintrc => toolkit/components/extensions/.eslintrc
extra : rebase_source : 5b2d39a455c81a001bd26e7bc85e7fbacdb79171
2015-12-05 15:27:33 -05:00
Ryan VanderMeulen
289a16635a
Merge fx-team to m-c. a=merge
2015-12-05 15:09:41 -05:00
Marco Bonardo
eed11fe644
Bug 1225540 - follow-up: add alert_emails to urlbar histograms. rs=vladan
...
--HG--
extra : commitid : 10irbH7x1wh
2015-12-05 01:23:31 +01:00
Wes Kocher
39967e9806
Backed out changeset 0ea0832d052d (bug 1079858) for causing bug 1230631 a=backout
...
--HG--
extra : commitid : GeBy210BpUB
2015-12-04 14:58:55 -08:00
Carsten "Tomcat" Book
8d69e722ff
merge mozilla-inbound to mozilla-central a=merge
2015-12-04 11:57:23 +01:00
Dave Townsend
3f712c761e
Backed out 5161ded671e0 for causing Mulet failures
...
--HG--
extra : commitid : AcnOYAhDWhq
extra : rebase_source : 74bdf37c69b2518534c77ea0d29bfbe4f1166f62
2015-12-03 20:01:43 -08:00
Kris Maglione
b729a30707
Bug 1229874: Part 3 - Enable ESLint in WebExtension code. r=billm
...
The base .eslintrc is essentially a merge of the root Toolkit .eslintrc and
the devtools .eslintrc, with some minor changes to match our prevalent style.
For the most enforces the coding styles that we've been using most
consistently. There are a couple of significant differences, though:
* The rule for opening brace alignment can only be applied globally, and
doesn't make exceptions for top-level functions. I chose to turn it on, and
change the brace style of existing top-level functions that violated it,
since the rule seemed worth using, and that's the direction most Toolkit JS
code has been headed anyway.
* The rule for switch/case statements requires an added indentation level for
case statements. Most of our switch statements did not use an extra level
of indentation, and I initially wrote the rule to enforce that style, until
I came across case statements that used blocks, and required the extra
indentation level for sanity.
--HG--
rename : devtools/.eslintrc => toolkit/components/extensions/.eslintrc
extra : commitid : 4aDZOi5MNPc
extra : rebase_source : f34ba43aeb8046a0c971cb76b76410497bd12b42
extra : source : 2a7eb4ef7b375e5fd52d843ca206a071367a6475
2015-12-02 16:58:53 -08:00
Kris Maglione
62d3c9701a
Bug 1229874: Part 2 - Fix the major errors detected by ESLint. r=billm
...
--HG--
extra : commitid : 8MfFtdlzGEG
extra : rebase_source : 744d65868d5a3d217bd5f6428a3486e95fa14716
extra : source : 880fc261adae00a344e227ea2fa246b771cd57a6
2015-12-02 16:58:24 -08:00
Dave Townsend
6bafb02444
Bug 1229519: Fix miscellaneous parts of toolkit to pass eslint checks. r=MattN
...
--HG--
extra : commitid : HgkrvB0uHPG
extra : rebase_source : f3ac923e3d621d45b70951fc33dccc68a07c228d
2015-12-03 10:02:45 -08:00