nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity
610906 commits 1 branch 98 tags 6.4 GiB
Commit graph

34 commits

Author SHA1 Message Date
Johann Hofmann
b812e620f1 Bug 1484574 - Update copy for the content blocking section in the identity popup. r=paolo 
This updates some copy based on UX and legal requirements as well as add a correct
SUMO URL for the "Learn More" link for breakage reporting.

Differential Revision: https://phabricator.services.mozilla.com/D4172

--HG--
extra : moz-landing-system : lando
 2018-08-24 09:26:33 +00:00
Johann Hofmann
21681630cf Bug 1483727 - Correctly test the TP UI state when CB UI is off. r=francois 
Differential Revision: https://phabricator.services.mozilla.com/D4167

--HG--
extra : moz-landing-system : lando
 2018-08-23 21:31:22 +00:00
Johann Hofmann
f673d00adb Bug 1484439 - Always test browser_trackingUI_report_breakage.js with CB UI enabled. r=RyanVM 
Differential Revision: https://phabricator.services.mozilla.com/D4163

--HG--
extra : moz-landing-system : lando
 2018-08-23 21:06:10 +00:00
Ehsan Akhgari
f148747c8d Bug 1485199 - Add prefs for hiding the other two categories in the Content Blocking section of the Control Centre; r=johannh 2018-08-22 17:06:21 -04:00
Ehsan Akhgari
bdb451ac2e Bug 1484312 - Add UI for restricting third-party cookies to the Control Centre; r=johannh,flod 2018-08-22 17:05:19 -04:00
Johann Hofmann
4ba4761b76 Bug 1482634 - Only run Content Blocking UI assertions if Content Blocking UI is enabled. r=nhnt11 
Differential Revision: https://phabricator.services.mozilla.com/D3312

--HG--
extra : moz-landing-system : lando
 2018-08-16 09:11:43 +00:00
Johann Hofmann
a7d5d9b4a7 Bug 1474238 - Add a "report breakage" dialog for Tracking Protection. r=Paolo 
MozReview-Commit-ID: 26q5PYLUZGS

--HG--
extra : rebase_source : 34c534968c82784539aecb25c2ee77f4fb0bbdde
 2018-07-11 17:14:35 +02:00
Johann Hofmann
b72851d67d Bug 1476224 - Update the Tracking Protection section in the main menu for Content Blocking. r=nhnt11 
Differential Revision: https://phabricator.services.mozilla.com/D2978

--HG--
extra : rebase_source : 0d37900b25bf2e7164ed13e3d6e88bd1bec4e87b
 2018-08-09 01:33:38 +02:00
Johann Hofmann
5584301845 Bug 1476218 - Part 3 - Update Tracking Protection tests to reflect Content Blocking changes. r=nhnt11 
This commit also moves the remaining trackingUI_* tests out of b/b/c/test/general,
since I needed to touch them anyway

Differential Revision: https://phabricator.services.mozilla.com/D2935

--HG--
rename : browser/base/content/test/general/benignPage.html => browser/base/content/test/trackingUI/benignPage.html
rename : browser/base/content/test/general/browser_trackingUI_3.js => browser/base/content/test/trackingUI/browser_trackingUI_3.js
rename : browser/base/content/test/general/browser_trackingUI_4.js => browser/base/content/test/trackingUI/browser_trackingUI_animation_2.js
rename : browser/base/content/test/general/browser_trackingUI_6.js => browser/base/content/test/trackingUI/browser_trackingUI_fetch.js
rename : browser/base/content/test/general/browser_trackingUI_5.js => browser/base/content/test/trackingUI/browser_trackingUI_pbmode_exceptions.js
rename : browser/base/content/test/general/browser_trackingUI_telemetry.js => browser/base/content/test/trackingUI/browser_trackingUI_telemetry.js
rename : browser/base/content/test/general/file_trackingUI_6.html => browser/base/content/test/trackingUI/file_trackingUI_fetch.html
rename : browser/base/content/test/general/file_trackingUI_6.js => browser/base/content/test/trackingUI/file_trackingUI_fetch.js
rename : browser/base/content/test/general/file_trackingUI_6.js^headers^ => browser/base/content/test/trackingUI/file_trackingUI_fetch.js^headers^
rename : browser/base/content/test/general/trackingPage.html => browser/base/content/test/trackingUI/trackingPage.html
extra : rebase_source : 2a12463ab2ba39bdcf077580a2d6e565f80c879c
 2018-08-08 14:31:34 +02:00
Jonathan Kingston
2f0987a202 Bug 1362034 - Tests for addTab() to provide the correct triggering principal. r=ckerschb r?=gijs 
Summary: Depends on D2046

Reviewers: ckerschb!, Gijs!

Tags: #secure-revision

Bug #: 1362034

Differential Revision: https://phabricator.services.mozilla.com/D2047

--HG--
extra : source : 33884d05cc94463950b31fab1fd2f37ada9becef
extra : intermediate-source : 72471adb75d5ec3dc2b0c8f972a6f1f26bfd3ae2
extra : histedit_source : f384cbab58401575afc3443c9a431b73cff806d4
 2018-07-06 21:16:29 +01:00
dvarga
12f19b94e9 Backed out 2 changesets (bug 1362034) for failure at browser/tools/mozscreenshots/primaryUI/browser_primaryUI.js on a CLOSED TREE 
Backed out changeset 1c3329958b8a (bug 1362034)
Backed out changeset f68b1b76af36 (bug 1362034)

--HG--
extra : histedit_source : 6169c5ffe856266d3bc8b2ca32f4b67054c71bbe
 2018-08-08 22:11:56 +03:00
Jonathan Kingston
c15f69d427 Bug 1362034 - Tests for addTab() to provide the correct triggering principal. r=ckerschb,Gijs 
Summary: Depends on D2046

Reviewers: ckerschb, Gijs

Reviewed By: ckerschb, Gijs

Bug #: 1362034

Differential Revision: https://phabricator.services.mozilla.com/D2047

--HG--
extra : rebase_source : ccded0f06a0dc4567b827f42ee29f4b8954154fe
extra : amend_source : 94da8ecc053e56958fa4137d7e497362fa2c11f1
 2018-08-08 20:05:30 +03:00
Andreea Pavel
f5c1119983 Backed out 2 changesets (bug 1362034) for failing damp | inspector/cold-open.js on a CLOSED TREE 
Backed out changeset 8c8925b75aa2 (bug 1362034)
Backed out changeset ff6b05c96094 (bug 1362034)
 2018-08-06 20:42:44 +03:00
Jonathan Kingston
4ca581ffed Bug 1362034 - Tests for addTab() to provide the correct triggering principal. r=ckerschb,Gijs 
Summary: Depends on D2046

Reviewers: ckerschb, Gijs

Reviewed By: ckerschb, Gijs

Bug #: 1362034

Differential Revision: https://phabricator.services.mozilla.com/D2047

--HG--
extra : rebase_source : 4bb9e7feb0704239756e6e38623c0fea81669f7b
extra : amend_source : 9417f96547735fbdc55ea23666327a5cb86ac92f
 2018-08-06 19:56:37 +03:00
Johann Hofmann
e4580d39d9 Bug 1476317 - Fix identity popup display for pages with exceptions that have blocked content. r=nhnt11 
The identity popup will now show that there's an exception on the site instead of being confused.

We previously didn't handle this state because I assumed it wouldn't be possible to enter.
Turns out if you open the same (tracking) site in two tabs and then add an exception in one tab,
the other tab will be in this state until reload.

MozReview-Commit-ID: GVVdNpsAm6h

--HG--
extra : rebase_source : 3ace3cd4f99094edf3c678c56a39adebdc37d1f3
 2018-07-18 16:33:06 +02:00
Johann Hofmann
45ac034b6e Bug 1471713 - Add an animation for the tracking protection icon. r=sfoster 
MozReview-Commit-ID: GBUbaoShxQi

--HG--
extra : rebase_source : 60040607f91cd0477fbf98c49b77b8ee09112a17
 2018-07-05 23:45:34 +02:00
Johann Hofmann
17c3a96af9 Bug 1472535 - Put the main menu tracking protection toggle behind a pref. r=mikedeboer 
This is assuming we want to pref off for 62 and pref on again for 63, simply delaying the feature by one release.

MozReview-Commit-ID: 7Q4uD7QJDFc

--HG--
extra : rebase_source : 5839daaac17384fdca8969e750af2bb76b6403fb
 2018-07-09 13:09:53 +02:00
Coroiu Cristina
d429af947c Backed out changeset 27335463acd1 (bug 1471713) for browser-chrome failures at browser/components/uitour/test/browser_trackingProtection.js 2018-07-12 14:57:30 +03:00
Johann Hofmann
365f7536ea Bug 1471713 - Add an animation for the tracking protection icon. r=sfoster 
MozReview-Commit-ID: GBUbaoShxQi

--HG--
extra : rebase_source : 2d101873b071911763a0ccd7574cbc04026cc89f
 2018-07-05 23:45:34 +02:00
Coroiu Cristina
d1d4997c18 Backed out changeset 66d9b0f57c81 (bug 1471713) for build bustage on a CLOSED TREE 2018-07-12 10:25:04 +03:00
Johann Hofmann
47d3860672 Bug 1471713 - Add an animation for the tracking protection icon. r=sfoster 
MozReview-Commit-ID: GBUbaoShxQi

--HG--
extra : rebase_source : 1623e497e03ff178f98657a9e8d36d0692a31fe1
 2018-07-05 23:45:34 +02:00
Johann Hofmann
5f6d7909f1 Bug 1473685 - When a user "disables protection" on a site, and no trackers are detected, indicate that TP is turned off instead of on. r=nhnt11 
MozReview-Commit-ID: 9JjCK1GYMbC

--HG--
extra : rebase_source : 86096c64d2fa533dc8d8632660b16e18e0b6995c
 2018-07-09 12:34:44 +02:00
Johann Hofmann
e338329576 Bug 1470020 - Part 2 - Add specific states for when the user has added a TP exception to the TP section of the identity popup. r=florian 
We used to give this all the same "tracking-loaded" state, but now we want to differentiate between:

- Tracking loaded because TP is off
- Tracking loaded because of an exception
- Tracking not loaded but the site has an exception, which we want to allow the user to remove (if TP is on)

MozReview-Commit-ID: E9j0Roq1bsH

--HG--
extra : rebase_source : 70992e27b91bfed3cce0b868b63ce3a8c0afc5d0
 2018-06-21 02:10:02 +02:00
Johann Hofmann
eea47c667c Bug 1470020 - Part 1 - Don't show the "Enable Protection" button when it links to the TP preferences. r=florian 
UX found this confusing and unnecessary, after all.

MozReview-Commit-ID: DSBu8Xyo3YO

--HG--
extra : rebase_source : baec57bcb107cd8c6359aeeebc9bf2010116da7c
 2018-06-21 02:05:08 +02:00
Johann Hofmann
9764429134 Bug 1462470 - Part 6 - Add tests for the updated tracking protection UI in the identity popup. r=Paolo 
This adds tests and moves the browser_trackingUI_1 test to the more general
trackingUI directory. The remaining TP tests will be moved in bug 1451307.

MozReview-Commit-ID: FHP4ULX0OQG

--HG--
rename : browser/base/content/test/general/browser_trackingUI_1.js => browser/base/content/test/trackingUI/browser_trackingUI_state.js
extra : rebase_source : 4f58e9f3aa3276536f43097257e312c6719a5cc6
 2018-05-31 22:54:26 +02:00
Johann Hofmann
35166c8f08 Bug 1462468 - Add a tracking protection option to the hamburger menu. r=mikedeboer 
MozReview-Commit-ID: HxRljbdsRau

--HG--
extra : rebase_source : 3f3aae722ca2e1b6a28a29a5116d66bf40aa8092
 2018-05-22 16:26:55 +02:00
Dorel Luca
e5fe6c3a9f Backed out changeset bc39ccd992a4 (bug 1462468) for Browser-chomre failures on browser/base/content/test/trackingUI/browser_trackingUI_appMenu.js 
--HG--
extra : rebase_source : a59dba114b09502056e229c7226b32741c8414f0
 2018-05-28 19:11:14 +03:00
Johann Hofmann
6e280711b9 Bug 1462468 - Add a tracking protection option to the hamburger menu. r=mikedeboer 
MozReview-Commit-ID: HxRljbdsRau

--HG--
extra : rebase_source : 34f62aed6cdafe091d2105c55669b052aba45040
 2018-05-22 16:26:55 +02:00
Andreea Pavel
267e2b904c Backed out 4 changesets (bug 1451307) for failing android at toolkit/components/url-classifier/tests/mochitest/test_cachemiss.html 
Backed out changeset 9e0246c2f62f (bug 1451307)
Backed out changeset 12ea607734b1 (bug 1451307)
Backed out changeset 7adc755a4229 (bug 1451307)
Backed out changeset 9f8135caee4f (bug 1451307)

--HG--
rename : browser/base/content/test/trackingUI/benignPage.html => browser/base/content/test/general/benignPage.html
rename : browser/base/content/test/trackingUI/browser_trackingUI_1.js => browser/base/content/test/general/browser_trackingUI_1.js
rename : browser/base/content/test/trackingUI/browser_trackingUI_2.js => browser/base/content/test/general/browser_trackingUI_2.js
rename : browser/base/content/test/trackingUI/browser_trackingUI_3.js => browser/base/content/test/general/browser_trackingUI_3.js
rename : browser/base/content/test/trackingUI/browser_trackingUI_4.js => browser/base/content/test/general/browser_trackingUI_4.js
rename : browser/base/content/test/trackingUI/browser_trackingUI_5.js => browser/base/content/test/general/browser_trackingUI_5.js
rename : browser/base/content/test/trackingUI/browser_trackingUI_6.js => browser/base/content/test/general/browser_trackingUI_6.js
rename : browser/base/content/test/trackingUI/browser_trackingUI_telemetry.js => browser/base/content/test/general/browser_trackingUI_telemetry.js
rename : browser/base/content/test/trackingUI/file_trackingUI_6.html => browser/base/content/test/general/file_trackingUI_6.html
rename : browser/base/content/test/trackingUI/file_trackingUI_6.js => browser/base/content/test/general/file_trackingUI_6.js
rename : browser/base/content/test/trackingUI/file_trackingUI_6.js^headers^ => browser/base/content/test/general/file_trackingUI_6.js^headers^
rename : browser/base/content/test/trackingUI/trackingPage.html => browser/base/content/test/general/trackingPage.html
 2018-05-06 19:59:27 +03:00
Johann Hofmann
6f773241f4 Bug 1451307 - Part 3 - Add a test for showing the TP UI for iframes and unloaded documents. r=francois 
MozReview-Commit-ID: FrcwyIbBTFL

--HG--
extra : rebase_source : 0fae5bec5b2e5d612736f231392dd442a2efe118
 2018-04-19 22:37:49 +02:00
Johann Hofmann
deccdc94f4 Bug 1451307 - Part 2 - Move trackingUI tests out of b/b/c/test/general into their own subdirectory. r=Gijs 
MozReview-Commit-ID: 5e2Hwt9jcX5

--HG--
rename : browser/base/content/test/general/benignPage.html => browser/base/content/test/trackingUI/benignPage.html
rename : browser/base/content/test/general/browser_trackingUI_1.js => browser/base/content/test/trackingUI/browser_trackingUI_1.js
rename : browser/base/content/test/general/browser_trackingUI_2.js => browser/base/content/test/trackingUI/browser_trackingUI_2.js
rename : browser/base/content/test/general/browser_trackingUI_3.js => browser/base/content/test/trackingUI/browser_trackingUI_3.js
rename : browser/base/content/test/general/browser_trackingUI_4.js => browser/base/content/test/trackingUI/browser_trackingUI_4.js
rename : browser/base/content/test/general/browser_trackingUI_5.js => browser/base/content/test/trackingUI/browser_trackingUI_5.js
rename : browser/base/content/test/general/browser_trackingUI_6.js => browser/base/content/test/trackingUI/browser_trackingUI_6.js
rename : browser/base/content/test/general/browser_trackingUI_telemetry.js => browser/base/content/test/trackingUI/browser_trackingUI_telemetry.js
rename : browser/base/content/test/general/file_trackingUI_6.html => browser/base/content/test/trackingUI/file_trackingUI_6.html
rename : browser/base/content/test/general/file_trackingUI_6.js => browser/base/content/test/trackingUI/file_trackingUI_6.js
rename : browser/base/content/test/general/file_trackingUI_6.js^headers^ => browser/base/content/test/trackingUI/file_trackingUI_6.js^headers^
rename : browser/base/content/test/general/head.js => browser/base/content/test/trackingUI/head.js
rename : browser/base/content/test/general/trackingPage.html => browser/base/content/test/trackingUI/trackingPage.html
extra : rebase_source : a707b58730293c95da87f77f1517436c681a2497
 2018-04-19 17:22:11 +02:00
Dorel Luca
7153e84656 Backed out 3 changesets (bug 1451307) for Mochitest failure on toolkit/components/url-classifier/tests/mochitest/test_bug1254766.html. CLOSED TREE 
Backed out changeset be0a9b78c224 (bug 1451307)
Backed out changeset 13e58d5887d8 (bug 1451307)
Backed out changeset 7f89d94d45ba (bug 1451307)

--HG--
rename : browser/base/content/test/trackingUI/benignPage.html => browser/base/content/test/general/benignPage.html
rename : browser/base/content/test/trackingUI/browser_trackingUI_1.js => browser/base/content/test/general/browser_trackingUI_1.js
rename : browser/base/content/test/trackingUI/browser_trackingUI_2.js => browser/base/content/test/general/browser_trackingUI_2.js
rename : browser/base/content/test/trackingUI/browser_trackingUI_3.js => browser/base/content/test/general/browser_trackingUI_3.js
rename : browser/base/content/test/trackingUI/browser_trackingUI_4.js => browser/base/content/test/general/browser_trackingUI_4.js
rename : browser/base/content/test/trackingUI/browser_trackingUI_5.js => browser/base/content/test/general/browser_trackingUI_5.js
rename : browser/base/content/test/trackingUI/browser_trackingUI_6.js => browser/base/content/test/general/browser_trackingUI_6.js
rename : browser/base/content/test/trackingUI/browser_trackingUI_telemetry.js => browser/base/content/test/general/browser_trackingUI_telemetry.js
rename : browser/base/content/test/trackingUI/file_trackingUI_6.html => browser/base/content/test/general/file_trackingUI_6.html
rename : browser/base/content/test/trackingUI/file_trackingUI_6.js => browser/base/content/test/general/file_trackingUI_6.js
rename : browser/base/content/test/trackingUI/file_trackingUI_6.js^headers^ => browser/base/content/test/general/file_trackingUI_6.js^headers^
rename : browser/base/content/test/trackingUI/trackingPage.html => browser/base/content/test/general/trackingPage.html
 2018-04-26 05:08:47 +03:00
Johann Hofmann
9a539486f3 Bug 1451307 - Part 3 - Add a test for showing the TP UI for iframes and unloaded documents. r=francois 
MozReview-Commit-ID: FrcwyIbBTFL

--HG--
extra : rebase_source : c21ec0fe49dd1cf3f845c249281fa5bdd6d9c622
 2018-04-19 22:37:49 +02:00
Johann Hofmann
951a4a9e6d Bug 1451307 - Part 2 - Move trackingUI tests out of b/b/c/test/general into their own subdirectory. r=Gijs 
MozReview-Commit-ID: 5e2Hwt9jcX5

--HG--
rename : browser/base/content/test/general/benignPage.html => browser/base/content/test/trackingUI/benignPage.html
rename : browser/base/content/test/general/browser_trackingUI_1.js => browser/base/content/test/trackingUI/browser_trackingUI_1.js
rename : browser/base/content/test/general/browser_trackingUI_2.js => browser/base/content/test/trackingUI/browser_trackingUI_2.js
rename : browser/base/content/test/general/browser_trackingUI_3.js => browser/base/content/test/trackingUI/browser_trackingUI_3.js
rename : browser/base/content/test/general/browser_trackingUI_4.js => browser/base/content/test/trackingUI/browser_trackingUI_4.js
rename : browser/base/content/test/general/browser_trackingUI_5.js => browser/base/content/test/trackingUI/browser_trackingUI_5.js
rename : browser/base/content/test/general/browser_trackingUI_6.js => browser/base/content/test/trackingUI/browser_trackingUI_6.js
rename : browser/base/content/test/general/browser_trackingUI_telemetry.js => browser/base/content/test/trackingUI/browser_trackingUI_telemetry.js
rename : browser/base/content/test/general/file_trackingUI_6.html => browser/base/content/test/trackingUI/file_trackingUI_6.html
rename : browser/base/content/test/general/file_trackingUI_6.js => browser/base/content/test/trackingUI/file_trackingUI_6.js
rename : browser/base/content/test/general/file_trackingUI_6.js^headers^ => browser/base/content/test/trackingUI/file_trackingUI_6.js^headers^
rename : browser/base/content/test/general/head.js => browser/base/content/test/trackingUI/head.js
rename : browser/base/content/test/general/trackingPage.html => browser/base/content/test/trackingUI/trackingPage.html
extra : rebase_source : 9384d9075391ce1574d0b047b06192ec02822579
 2018-04-19 17:22:11 +02:00