Commit graph

2447 commits

Author SHA1 Message Date
Collin M. Barrett
fc4f52b2da re-orgs 2019-04-28 16:11:57 -05:00
Collin M. Barrett
0b33305fdf fix api port 2019-04-28 15:35:00 -05:00
Collin M. Barrett
2398bd76c9 docker API updates 2019-04-28 15:15:12 -05:00
Collin M. Barrett
8180eb9f22 API docker build updates 2019-04-28 14:12:37 -05:00
Collin M. Barrett
1065b9d31a dockerignore patch 2019-04-28 08:11:37 -05:00
Collin M. Barrett
758c5e637b wip misc docker updates 2019-04-28 08:09:06 -05:00
Collin M. Barrett
116279517a compose API now working 2019-04-27 16:12:12 -05:00
Collin M. Barrett
0d70622df3 docker-compose tweaks 2019-04-27 11:30:35 -05:00
Collin M. Barrett
e0acf5c5fd updates to API docker-compose 2019-04-27 11:21:23 -05:00
Collin M. Barrett
ca071962ef update docker comment 2019-04-27 10:46:58 -05:00
Collin M. Barrett
c78cf2cd18 update API build dockerfile 2019-04-27 10:20:41 -05:00
Collin M. Barrett
4a75cea7c4 rm unused pipelines yml, misc clenaup 2019-04-25 19:33:55 -05:00
Collin M. Barrett
009910725d sync w/upstream 2019-04-25 18:59:36 -05:00
Collin M. Barrett
b4a87cecdb data tidy/sync 2019-04-21 16:22:11 -05:00
Collin M. Barrett
048beb659b
add new @DandelionSprout list, closes #762 and #763 (#768)
* Update FilterList.json

* Created 1 new syntax

* Added AdGuard Home

* Update FilterListLanguage.json

* Update FilterListMaintainer.json

* Add files via upload

* Update SoftwareIcon.tsx

* Update index.ts

* Update SoftwareSyntax.json

* Update FilterListTag.json

* Update FilterListMaintainer.json

* Update SoftwareSyntax.json

* Added my even newer list

* Had forgot to assign tags to the lists

closes #762 and #763
2019-04-21 15:59:49 -05:00
Collin M. Barrett
8994ca7e96
add "Yet another small uBlock filter list" (#767)
* Update FilterList.json

* Update FilterListLanguage.json

* Update Maintainer.json

* Update FilterList.json

* Update FilterListMaintainer.json

* Update FilterListTag.json

* update syntax

per https://github.com/collinbarrett/FilterLists/pull/764#issuecomment-485259708
2019-04-21 15:40:34 -05:00
Collin M. Barrett
1e18829b42
bump dist and SDK to fix Travis build (#766)
* try bumping .NET SDK ver

* try xenial

per https://travis-ci.community/t/dotnet-core-2-2/1216/11
2019-04-21 15:21:48 -05:00
Imre Kristoffer Eilertsen
ced20ac890 Mid-April pull (#761)
* Added 2 new tags: 'newsletters' and 'helpprompt'

* Various small changes + 3 new lists

* Update FilterListTag.json

* Added 1 new syntax

* Update FilterListLanguage.json

* Update FilterListMaintainer.json
2019-04-15 01:47:18 +00:00
Collin M. Barrett
917425408d de-dup COC
closes #760
2019-04-14 19:28:42 -05:00
bogachenko
1b91a194fe Update (#759)
* DataMaster Android AdBlock Hosts

* Fuck fuckadblock

* Update FilterList.json
2019-04-14 20:12:25 +00:00
Collin M. Barrett
3a1a43fb8e
Create CODE_OF_CONDUCT.md 2019-04-13 01:48:23 +00:00
bogachenko
846cc02fdf wrong names (#756)
* Update FilterList.json

* Update FilterList.json
2019-04-13 01:02:38 +00:00
Imre Kristoffer Eilertsen
95f34a0e2b Acknowledging that IE support is a goner (#753)
* Update _Layout.cshtml

* Update README.md

* Update README.md
2019-04-09 20:03:17 +00:00
ColumWalsh
aaf4411d1f add unsullied filter (#750)
* add unsullied filter

* PR comments. Set list id to next sequential value, add unconventional tag.
2019-04-07 20:05:32 +00:00
Imre Kristoffer Eilertsen
e04bfd3705 Reverting the date formatting (#749)
* Date formatting, part 6

* Update UpdatedDate.tsx

* This is a long-shot for the ages

* I'm beginning to run out of options

* Update UpdatedDate.tsx

* One last shot. If this fails, I'll give up.

* Reverting to the October 2018 file
2019-04-07 20:04:09 +00:00
Imre Kristoffer Eilertsen
9bc4ceede8 Date formatting, take 5 (#748) 2019-04-06 15:47:11 +00:00
Imre Kristoffer Eilertsen
3a03d28cd9 Date formatting, take 4 (#747) 2019-04-06 14:36:49 +00:00
Imre Kristoffer Eilertsen
f8ed0f4aeb Date formatting, take 3 (#746) 2019-04-06 01:09:00 +00:00
Imre Kristoffer Eilertsen
498b4a8820 Polishing of UI changes (#745)
* Moving on to another date format possibility

* Corrected TPL subscription links

* Update site.css

* This can't be a good sign
2019-04-06 00:38:20 +00:00
Imre Kristoffer Eilertsen
1708826e4d More button stuff (#744)
* Preparing a pull

Preparing for https://github.com/collinbarrett/FilterLists/issues/743.

* Attempting for international date support

* Let's see how well this goes

* Removing mentions of momentjs

* Update SubscribeButton.tsx

* Take 2

* Update ViewButton.tsx

* Update ViewButton.tsx

* Update ViewButton.tsx

* Update ViewButton.tsx

* Create FilterListsVendor.css

* Update _Layout.cshtml

* Delete FilterListsVendor.css

* Update _Layout.cshtml

* What could possibly go wrong with this

* Update site.css

* Desperately looking for a place to insert the polyfill script

* I can just as well try with additional compressed formats

* Update UpdatedDate.tsx

* Update UpdatedDate.tsx

* Update UpdatedDate.tsx

* Update UpdatedDate.tsx
2019-04-05 23:36:28 +00:00
Imre Kristoffer Eilertsen
c1eb75e4bc Attempting to make better subscription buttons for TPL and .onion lists (#742)
* Update SubscribeButton.tsx

* Update SubscribeButton.tsx

* Added an Onion-button test link

* Corrected 1 link

* Added 1 missing paranthesis

* Coding is greek to me

* Adding comparison numbers or something

* Realised that -1 would reverse a statement

* Update SubscribeButton.tsx

* Had forgot to remove leftover code

* Paranthesises are difficult to keep track of
2019-04-01 15:05:42 -05:00
Imre Kristoffer Eilertsen
eb731a1d6f April non-fools pull (#741)
* Update FilterList.json

* Update FilterListTag.json

* Update FilterListLanguage.json

* Update FilterListMaintainer.json

* Assigned Catalan to EasyList Spanish

Seeing as that list has ~15 entries for Catalan websites.

* Assigned "userstyle" to MeWe Pink Theme

* Adding a Indonesian proxy hosts file

* Update FilterListTag.json

* Update FilterListLanguage.json
2019-04-01 14:59:56 -05:00
Imre Kristoffer Eilertsen
63945ca204 Created my 50th adblock list! 🥳 (#739)
* Created my 50th adblock list! 🥳

* Update Maintainer.json

* Added 1 new tag for userstyles

* Update FilterListTag.json

* Assigned my 3 newest lists to me

* Update FilterList.json
2019-03-30 17:10:41 +00:00
Imre Kristoffer Eilertsen
dc83cf7746 Late March pull 2 (#738)
* Added 7 new colours

* Changed the Vortex lists to "Domains with wildcards"

* Added 13 new lists

* Update FilterListTag.json

* Update FilterListLanguage.json

* Added some more lists

* Corrected the TPL assistent link

* Corrected various tags

* Update FilterListMaintainer.json

* Update FilterListTag.json

* Hoping that uppercase letters resolves the problem

* Added missing commas
2019-03-28 22:28:55 +00:00
bogachenko
dfa3d6da0b Update (#737)
* Update FilterList.json

https://github.com/collinbarrett/FilterLists/issues/736

* SNAFU

https://github.com/collinbarrett/FilterLists/issues/735
2019-03-28 08:21:22 -05:00
Imre Kristoffer Eilertsen
872ea2d57f Late March pull (#734)
* Update FilterList.json

* Assigned languages to 34 lists

* Update FilterListTag.json

* Improving the names of 2 lists

* Update FilterListTag.json

* Added 3 new tags

* Update FilterList.json

* Update FilterListTag.json

* Update FilterListMaintainer.json

* Update FilterListTag.json

* Changed 1 more title

* Added 'The Hosts File Project IPs'

* Update FilterListTag.json

* Added 1 new maintainer

* Update FilterListMaintainer.json

* Assigned 2 lists to the EasyList authors

* Update FilterListLanguage.json

* Update FilterListTag.json

* Added my newest list

* Update FilterListMaintainer.json

* Update FilterListTag.json

* Created a way to let IE users subscribe to TPL lists

* Update README.md

* Update README.md

* Major info correction for 'Peter Lowe's List (TPL)'

After 8 years, Peter Lowe provides a fix for his TPL List! Problem was it didn't work, but now the blame has shifted onto Microsoft instead.

* A working fix was found!!!

* Added an even better fix
2019-03-27 06:47:20 -05:00
Philippe Girolami
71eb7db24e Remove duplicate entries (same name, same viewUrl) (#733)
* 690 = 1488
* 692 = 1489
* 1491 = 1492
2019-03-25 15:45:17 -05:00
Rory O’Kane
b69686b374 Add license and syntax of “Hello, Goodbye!” list (#732)
License #4 = GPLv3
Syntax #3 = Adblock Plus
2019-03-22 11:39:30 +00:00
bogachenko
13057b376a kano lists scrip (#731)
* upd

* Since I made PR, I will take the opportunity to change my description
2019-03-21 07:03:53 -05:00
bogachenko
bb1301184b some update (#730)
* some update

* Update Merge.json

* Update FilterList.json

* Update FilterList.json

* д

* ы

* ш

* и

* Update FilterList.json
2019-03-19 07:05:34 -05:00
Rory O’Kane
48c318ab42 Add filter list “Hello, Goodbye!” (#729)
The tags referenced in FilterListTag.json are 9=annoyances and 16=overlay.
2019-03-18 15:53:49 -05:00
bogachenko
0621221f3c Update FilterList.json (#728) 2019-03-18 14:40:21 -05:00
bogachenko
7e6b880ce7 Update FilterList.json (#726) 2019-03-18 13:46:50 +00:00
Imre Kristoffer Eilertsen
a585c57c63 Corrected 2 numbers (#724) 2019-03-18 13:46:27 +00:00
Imre Kristoffer Eilertsen
3df9fc79f9 Mid-March pull, encore (#723)
* Added the EasyList-lacking version of AdGuard English

How this hasn't been done before, is anyone's guess.

* Update FilterListMaintainer.json

* Update FilterListLanguage.json

* Update FilterListLanguage.json

* Update FilterListLanguage.json

* Adding KoreanList

* Update FilterListLanguage.json

* Update FilterListMaintainer.json

* Update FilterListTag.json

* Copying over a commit from part 2 to avoid conflicts

* Update Language.json

* Corrected the names of five lists

* Added 2 new tags

* Changed the tags of 22 lists
2019-03-17 18:29:37 +00:00
Imre Kristoffer Eilertsen
6c08143988 Mid-March pull, part 2/2 (#722)
* Update SoftwareIcon.tsx

* Delete 15-uBlock.svg

* Added 2 logos and narrowed 9 others

Plus some optimalisation of said files

* Update index.ts

* Testing if restoring img15 makes the build pass

* Added SVG versions of 5 icons

* Update index.ts

* Replaced "width" with "height"

For the sake of the thinner icons.

* Removing uncroppable Samsung Knox SVG icon

* Update index.ts

* Update Dependent.json

* Added one last compressed icon

* Combined 3 language tags into one

* Assigned languages to >50 lists
2019-03-17 18:28:49 +00:00
Imre Kristoffer Eilertsen
6587cb5690 Mid-March pull, part 1/2 (#721)
* Added 2 new softwares

* Added 3 new syntaxes

* Added 1 more syntax

* Update SoftwareSyntax.json

* Added syntax IDs and 2 new lists

* Update FilterListTag.json

* Assigned 2 lists to Peter Lowe

* Added a missing comma
2019-03-16 14:39:11 +00:00
bogachenko
4519fa52af again update? (#718)
* again update?

* 719

* added email

* changed email
2019-03-15 13:21:45 +00:00
bogachenko
0d238209a8 Chin choppa chin choppa (#716)
closes #709 

Thanks, @bogachenko !!!!
2019-03-14 07:30:25 -05:00
Imre Kristoffer Eilertsen
c0e376de26 Patch 68 (#714)
* Update Syntax.json

* Update README.md
2019-03-08 18:43:07 -06:00