From c4653df3fb56701788e45b80f7ef9bf474bc3bcf Mon Sep 17 00:00:00 2001 From: Hugo Xu Date: Wed, 24 May 2017 02:31:10 +0000 Subject: [PATCH 01/12] Update README.MD --- README.MD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.MD b/README.MD index efff698..90e13ba 100644 --- a/README.MD +++ b/README.MD @@ -31,8 +31,8 @@ TODO: #### Step 2: Add Filter List * [Subscribe to Core filter - Broken]() -* [Subscribe to Adguard extension - Broken]() -* [Subscribe to uBlock Origin FireFox extension - Broken]() +* [Subscribe to Adguard extension filter - Broken]() +* [Subscribe to uBlock Origin FireFox extension filter - Broken]() > ##### Note: Please first check your Adblocker settings page to see if the filter is listed. > ##### Note: Extension filters runs alongside core. From 0e13cecac291bdb7bb5771ad46d081adf59da58b Mon Sep 17 00:00:00 2001 From: Hugo Xu Date: Wed, 24 May 2017 02:34:00 +0000 Subject: [PATCH 02/12] Update README.MD --- README.MD | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.MD b/README.MD index 90e13ba..ad94700 100644 --- a/README.MD +++ b/README.MD @@ -16,6 +16,8 @@ TODO: 2. Patch Userscript vulnerabilities and break it into two parts so community rules can be inserted in between 3. Make compilers so community rules can be nicely and safely compiled +Can you help with any of these? Bring in those Merge Requests! + ## Instruction #### Are you using Chrome, uBlock Origin, and Violentmonkey? Check out [AdBlock Protector](https://github.com/jspenguin2017/AdBlockProtector)! From 95235ccff34bb55ec9da46837ff5135d634bbe1b Mon Sep 17 00:00:00 2001 From: Hugo Xu Date: Wed, 24 May 2017 02:36:46 +0000 Subject: [PATCH 03/12] Update README.MD --- README.MD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.MD b/README.MD index ad94700..b49b467 100644 --- a/README.MD +++ b/README.MD @@ -20,7 +20,7 @@ Can you help with any of these? Bring in those Merge Requests! ## Instruction -#### Are you using Chrome, uBlock Origin, and Violentmonkey? Check out [AdBlock Protector](https://github.com/jspenguin2017/AdBlockProtector)! +#### Are you using Chrome, uBlock Origin, and Violentmonkey? Check out [AdBlock Protector](https://jspenguin2017.github.io/AdBlockProtector/)! #### Step 1: Install Script Host * ![Chrome](images/browsers/chrome.png) [Tampermonkey](https://chrome.google.com/webstore/detail/tampermonkey/dhdgffkkebhmkfjojejmpbldmpobfkfo) From 4a29f3d064b0a883511a1d290ae3992132d301db Mon Sep 17 00:00:00 2001 From: Hugo Xu Date: Wed, 24 May 2017 03:00:01 +0000 Subject: [PATCH 04/12] Add new file --- public/index.html | 1 + 1 file changed, 1 insertion(+) create mode 100644 public/index.html diff --git a/public/index.html b/public/index.html new file mode 100644 index 0000000..30d74d2 --- /dev/null +++ b/public/index.html @@ -0,0 +1 @@ +test \ No newline at end of file From d4e51d288f7eed1b477d0220b970767799937107 Mon Sep 17 00:00:00 2001 From: Hugo Xu Date: Wed, 24 May 2017 03:01:44 +0000 Subject: [PATCH 05/12] Update index.html --- {public => html}/index.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {public => html}/index.html (100%) diff --git a/public/index.html b/html/index.html similarity index 100% rename from public/index.html rename to html/index.html From 21e683d4852a202dbd76e809510a44350330989c Mon Sep 17 00:00:00 2001 From: Hugo Xu Date: Wed, 24 May 2017 03:01:52 +0000 Subject: [PATCH 06/12] Add new file --- .gitlab-ci.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..bf6a8dc --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,10 @@ +pages: + stage: deploy + script: + - mkdir public + - cp -r html/* public + artifacts: + paths: + - public + only: + - master From d05d249b773b61a1890757191053583d7417dd52 Mon Sep 17 00:00:00 2001 From: Hugo Xu Date: Wed, 24 May 2017 03:34:06 +0000 Subject: [PATCH 07/12] Update index.html --- {html => public}/index.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {html => public}/index.html (100%) diff --git a/html/index.html b/public/index.html similarity index 100% rename from html/index.html rename to public/index.html From c18d8e73f20f8f37d1166245545b0d151a7a6eeb Mon Sep 17 00:00:00 2001 From: Hugo Xu Date: Wed, 24 May 2017 03:34:23 +0000 Subject: [PATCH 08/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bf6a8dc..6962414 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,5 @@ pages: stage: deploy - script: - - mkdir public - - cp -r html/* public artifacts: paths: - public From 7f92e0b0041ed49adabc4c000add1e5482cd0b3b Mon Sep 17 00:00:00 2001 From: Hugo Xu Date: Wed, 24 May 2017 03:35:05 +0000 Subject: [PATCH 09/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6962414..2b8eeeb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,6 @@ pages: stage: deploy + script: artifacts: paths: - public From d02cde7822d5d06a34821f7138a842f922b9e83f Mon Sep 17 00:00:00 2001 From: Hugo Xu Date: Wed, 24 May 2017 03:36:09 +0000 Subject: [PATCH 10/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b8eeeb..662dc4c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ pages: stage: deploy script: + - : artifacts: paths: - public From e4e51ec485f92e55e6b45c5dc9491bcebe1961b3 Mon Sep 17 00:00:00 2001 From: Hugo Xu Date: Wed, 24 May 2017 03:37:18 +0000 Subject: [PATCH 11/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 662dc4c..27133c1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ pages: stage: deploy script: - - : + - echo " " artifacts: paths: - public From 39ec3bef7b161948d7533969205db35cf4ad118b Mon Sep 17 00:00:00 2001 From: Hugo Xu Date: Wed, 24 May 2017 03:38:28 +0000 Subject: [PATCH 12/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 27133c1..f3ca01f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ pages: stage: deploy script: - - echo " " + - echo "There is nothing to do..." artifacts: paths: - public