Граф коммитов

53 Коммитов

Автор SHA1 Сообщение Дата
Kirk Steuber ddc03c9f28 Add assets for flashblock testing pages 2017-01-26 15:54:15 -08:00
luke crouch 44c6c30f72 Merge pull request #21 from fmarier/remove-ga
Remove Google Analytics
2017-01-10 16:07:18 -06:00
Francois Marier 3f91103674 Link to Mana page 2017-01-10 13:51:54 -08:00
Francois Marier f9f128f254
Remove Google Analytics
It's blocked by the new CSP policy and isn't used by anyone.
2017-01-10 13:43:16 -08:00
Francois Marier cb8bb4249c Merge pull request #18 from tungmangtdh3/bug1279637
Bug 1279637 - Delete the forbidden site test page
2016-07-20 09:10:36 -07:00
Thomas Nguyen d046f1076e Bug 1279637 - Delete the forbidden site test page 2016-07-20 10:45:24 +08:00
Francois Marier 21633c9870 Merge pull request #17 from fmarier/simpler-dnt-check
Add a test for the DNT signal
2016-05-25 15:35:31 -07:00
Francois Marier df0a06307d Add a test for the DNT signal
https://bugzilla.mozilla.org/show_bug.cgi?id=1258039
2016-05-25 14:00:42 -07:00
Francois Marier 56acb40335 Merge pull request #16 from fmarier/revert-dnt-test
Revert "Add a test for the DNT-compliant list"
2016-05-25 13:46:25 -07:00
Francois Marier 54437fed48 Revert "Add a test for the DNT-compliant list"
This reverts commit 31cc61f88a.
2016-05-25 13:43:01 -07:00
Francois Marier 1363e89e42 Merge pull request #15 from fmarier/dntcompliant
Add a test for DNT-compliant trackers
2016-05-02 12:46:49 -07:00
Francois Marier 31cc61f88a Add a test for the DNT-compliant list
https://bugzilla.mozilla.org/show_bug.cgi?id=1258039
2016-04-28 15:49:01 -07:00
Francois Marier f0574ef47c Merge pull request #14 from fmarier/add-license
Add a copy of the MPL
2016-04-27 14:08:22 -07:00
Francois Marier 639542f10b Add a copy of the MPL 2016-04-27 14:07:21 -07:00
Francois Marier cd5b36bfe8 Use CSS classes instead of IDs and add/remove them properly 2016-04-27 13:43:42 -07:00
Francois Marier 137d7512ce Merge pull request #13 from fmarier/issue9
Remove locale from outbound links (fixes #9)
2016-04-06 15:25:45 -07:00
Francois Marier 0de9eab42c Remove locale from outbound links (fixes #9) 2016-04-06 15:20:29 -07:00
Benjamin Sternthal e3e0d95078 Merge pull request #11 from tobytailor/master
Add blocking.html to test that plugin content blocking is working
2016-04-06 14:54:18 -07:00
Benjamin Sternthal 3f10f2d1e1 Merge pull request #12 from fmarier/remove-deployment-instructions
Remove deployment instructions
2016-04-05 16:14:42 -07:00
Francois Marier f4c25ab442 Remove deployment instructions
This repo is now automatically deployed when it changes:

  https://bugzilla.mozilla.org/show_bug.cgi?id=1226746

This effectively reverts f1beb31fba.
2016-04-05 15:29:46 -07:00
Tobias Schneider af8c19628a Update CSS for blocked.html. 2016-04-01 19:01:29 -07:00
Tobias Schneider 3eaad8a19c Editorial changes. 2016-04-01 17:25:33 -07:00
Tobias Schneider 4e4605bf84 Add blocking.html to test that plugin content blocking is working 2016-03-15 15:05:44 -07:00
Benjamin Sternthal b8b9d12d44 Merge pull request #10 from fmarier/forbidden
Forbidden test page
2015-11-20 12:26:05 -08:00
Francois Marier 05ad6447f5 Re-indent the file 2015-11-20 10:50:02 -08:00
Francois Marier 5626ffb51a Simplify the CSS 2015-11-19 13:29:42 -08:00
Francois Marier 3d2c13177f Bug 1216727 - Create a http://itisatrap.org/firefox/its-forbidden.html test page
This is a test page for the family-friendly browsing feature in
Fennec.
2015-11-19 13:26:20 -08:00
Benjamin Sternthal 96d07c57a5 Merge pull request #8 from fmarier/3rdparty-resources-over-https
Move third-party scripts to HTTPS
2015-09-03 09:28:20 -07:00
Francois Marier 36630bbe6d Move third-party scripts to HTTPS
This fixes mixed content errors when viewing the test page as
https://itisatrap.org/firefox/its-a-tracker.html.
2015-09-03 09:02:06 -07:00
Benjamin Sternthal 0ea7744bff Merge pull request #7 from fmarier/add-deployment-instructions
Add a README with deployment instructions
2015-09-02 16:42:59 -07:00
Francois Marier f1beb31fba Add a README with deployment instructions 2015-09-02 16:39:48 -07:00
Benjamin Sternthal 968014c89f Merge pull request #6 from fmarier/bug1149825
Add its-a-tracker.html to test that Tracking Protection is working
2015-09-02 16:20:52 -07:00
Francois Marier 949611087e Bold the test results for clarity 2015-09-02 16:20:31 -07:00
Francois Marier 1be6f2f439 Re-indent the whole file and remove unnecessary new lines 2015-09-02 16:16:01 -07:00
Francois Marier a79778fa8b Style the bullets properly
https://github.com/mozilla/itisatrap/pull/6#issuecomment-137268018
2015-09-02 16:13:32 -07:00
Francois Marier f2334e60c4 Change the copy as per Javaun's comments
https://bugzilla.mozilla.org/show_bug.cgi?id=1149825#c14
2015-08-31 17:37:57 -07:00
Francois Marier c837effc73 Wording change suggested by Matej
https://bugzilla.mozilla.org/show_bug.cgi?id=1149825#c10
2015-08-13 17:43:48 -07:00
Francois Marier e9e10ea065 Add its-a-tracker.html to test that Tracking Protection is working (bug 1149825) 2015-08-13 15:45:05 -07:00
Benjamin Sternthal bff416eef2 Merge pull request #4 from fmarier/bug1151279
Fix Bug 1151279 - Create itisatrap.org/firefox/its-unwanted.html
2015-04-10 08:42:51 -07:00
Francois Marier f350e404bc Fix broken link in all pages
https://github.com/mozilla/itisatrap/pull/4#discussion_r27923548
2015-04-10 16:28:14 +12:00
Francois Marier 37de282f5a Small copy changes to all pages as suggested by Matej
https://bugzilla.mozilla.org/show_bug.cgi?id=1151279#c5
2015-04-10 16:19:27 +12:00
Francois Marier 881a6ab4b2 Add Matej's copy changes for the unwanted software page
https://bugzilla.mozilla.org/show_bug.cgi?id=1151279#c5
2015-04-10 16:14:54 +12:00
Francois Marier c849b108e7 Fix Bug 1151279 - Create itisatrap.org/firefox/its-unwanted.html
This is a test page for the new "potentially unwanted software"
list from Google:

  http://googleonlinesecurity.blogspot.com.au/2015/03/even-more-unwanted-software-protection.html
2015-04-07 16:56:10 +12:00
Benjamin Sternthal f7e3ff48fd Merge pull request #3 from bensternthal/981119-Update_Copy
Fix Bug 981119: Update copy.
2014-03-10 09:42:50 -07:00
Benjamin Sternthal a532810169 Fixed 80 char line endings on edited paragraph. 2014-03-10 09:18:19 -07:00
Benjamin Sternthal 6f0bb3fa8f Fix Bug 981119: Update copy. 2014-03-10 09:15:26 -07:00
Benjamin Sternthal f8762adc30 Merge pull request #2 from bensternthal/fix-site-structure-971238
Fix Bug 971238: Change URL Structure & Fix Bug 971354 Replace WT with Go...
2014-02-18 13:13:22 -08:00
Benjamin Sternthal 4f743144cc Fix Bug 971238: Change URL Structure & Fix Bug 971354 Replace WT with Google Analytics 2014-02-12 09:23:41 -08:00
Paul McLanahan dc231b4ee5 Merge pull request #1 from sgarrity/master 2013-07-02 11:59:30 -07:00
Steven Garrity 4fbd3fc1ce Update Firefox logo on itisatrap.org
Bug 871744
2013-06-14 12:14:15 -03:00