From f29563c9bc80cf0a7771b59171ba54ab99d9bf9b Mon Sep 17 00:00:00 2001 From: schmiedecker Date: Sun, 16 Oct 2016 16:25:00 +0200 Subject: [PATCH 1/6] created rule for dji.com --- src/chrome/content/rules/Dji.com.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/chrome/content/rules/Dji.com.xml diff --git a/src/chrome/content/rules/Dji.com.xml b/src/chrome/content/rules/Dji.com.xml new file mode 100644 index 000000000000..aed4fef4b612 --- /dev/null +++ b/src/chrome/content/rules/Dji.com.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + From 794b2a1780bb40e980350b5d619324e16a31671d Mon Sep 17 00:00:00 2001 From: Jeremy Nation Date: Thu, 3 Nov 2016 22:21:38 +0000 Subject: [PATCH 2/6] Rename Dji.com.xml to DJI.xml and update it --- src/chrome/content/rules/DJI.xml | 122 +++++++++++++++++++++++++++ src/chrome/content/rules/Dji.com.xml | 11 --- 2 files changed, 122 insertions(+), 11 deletions(-) create mode 100644 src/chrome/content/rules/DJI.xml delete mode 100644 src/chrome/content/rules/Dji.com.xml diff --git a/src/chrome/content/rules/DJI.xml b/src/chrome/content/rules/DJI.xml new file mode 100644 index 000000000000..a35e84d95530 --- /dev/null +++ b/src/chrome/content/rules/DJI.xml @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Dji.com.xml b/src/chrome/content/rules/Dji.com.xml deleted file mode 100644 index aed4fef4b612..000000000000 --- a/src/chrome/content/rules/Dji.com.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - From f905612075723737832319d8b0540eb4c128cf02 Mon Sep 17 00:00:00 2001 From: Jeremy Nation Date: Thu, 3 Nov 2016 22:25:14 +0000 Subject: [PATCH 3/6] Add dn-dji-videos.qbox.me to Qbox.me.xml --- src/chrome/content/rules/Qbox.me.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/chrome/content/rules/Qbox.me.xml b/src/chrome/content/rules/Qbox.me.xml index 0231b400bed4..a51f8a72b432 100644 --- a/src/chrome/content/rules/Qbox.me.xml +++ b/src/chrome/content/rules/Qbox.me.xml @@ -19,6 +19,9 @@ + + + From 20b4b532a00cfaf4a7f15908156f826229b4b65e Mon Sep 17 00:00:00 2001 From: Jeremy Nation Date: Fri, 4 Nov 2016 00:15:59 +0000 Subject: [PATCH 4/6] Comment two djicdn.com targets to avoid time outs --- src/chrome/content/rules/DJI.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/rules/DJI.xml b/src/chrome/content/rules/DJI.xml index a35e84d95530..da8b093a33c1 100644 --- a/src/chrome/content/rules/DJI.xml +++ b/src/chrome/content/rules/DJI.xml @@ -111,8 +111,12 @@ - - + + + From 86537ada446250872baf6cacc774a5ff472c1ec1 Mon Sep 17 00:00:00 2001 From: Jeremy Nation Date: Fri, 4 Nov 2016 00:55:22 +0000 Subject: [PATCH 5/6] Fix comment in DJI.xml --- src/chrome/content/rules/DJI.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/DJI.xml b/src/chrome/content/rules/DJI.xml index da8b093a33c1..0f720f645f3f 100644 --- a/src/chrome/content/rules/DJI.xml +++ b/src/chrome/content/rules/DJI.xml @@ -26,7 +26,7 @@ img.videos.dji.net Mixed content: - bbs1.djicdn.net + bbs1.djicdn.com Refused: event.dji.com From 55e6ae08dedf5ee68290ad1d8ed7d1c9646dfd6a Mon Sep 17 00:00:00 2001 From: William Budington Date: Tue, 17 Jan 2017 19:41:29 -0800 Subject: [PATCH 6/6] Removing problematic dji subdomains and replacing djicdn subdomains --- src/chrome/content/rules/DJI.xml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/chrome/content/rules/DJI.xml b/src/chrome/content/rules/DJI.xml index 0f720f645f3f..be7cbd49de81 100644 --- a/src/chrome/content/rules/DJI.xml +++ b/src/chrome/content/rules/DJI.xml @@ -54,16 +54,12 @@ - - - - @@ -74,7 +70,6 @@ - @@ -94,11 +89,10 @@ - - - - - + + + +