Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mid-June pull 2 #1708

Merged
merged 11 commits into from
Jun 19, 2020
Merged

Mid-June pull 2 #1708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3dc3acd
Update License.json
DandelionSprout Jun 19, 2020
a5108bd
Update License.json
DandelionSprout Jun 19, 2020
9fcd86e
Update License.json
DandelionSprout Jun 19, 2020
8178ce4
Update FilterListLanguage.json
DandelionSprout Jun 19, 2020
9bac5a9
Add files via upload
DandelionSprout Jun 19, 2020
1f17649
Update Maintainer.json
DandelionSprout Jun 19, 2020
a36203d
Update FilterListMaintainer.json
DandelionSprout Jun 19, 2020
e11db8b
Update FilterListTag.json
DandelionSprout Jun 19, 2020
504bfd4
Update FilterListTag.json
DandelionSprout Jun 19, 2020
6f24708
Add files via upload
DandelionSprout Jun 19, 2020
3e4eb08
migrate PR #1708
collinbarrett Jun 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
408 changes: 340 additions & 68 deletions data/FilterList.json
View file
Open in desktop

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions data/FilterListLanguage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3025,7 +3025,7 @@
},
{
"filterListId": 818,
"languageId": 171
"languageId": 175
},
{
"filterListId": 1547,
Expand Down Expand Up @@ -3057,71 +3057,71 @@
},
{
"filterListId": 1547,
"languageId": 171
"languageId": 175
},
{
"filterListId": 2215,
"filterListId": 2115,
"languageId": 8
},
{
"filterListId": 2215,
"filterListId": 2115,
"languageId": 32
},
{
"filterListId": 2215,
"filterListId": 2115,
"languageId": 41
},
{
"filterListId": 2215,
"filterListId": 2115,
"languageId": 84
},
{
"filterListId": 2215,
"filterListId": 2115,
"languageId": 85
},
{
"filterListId": 2215,
"filterListId": 2115,
"languageId": 134
},
{
"filterListId": 2215,
"filterListId": 2115,
"languageId": 170
},
{
"filterListId": 2215,
"languageId": 171
"filterListId": 2115,
"languageId": 175
},
{
"filterListId": 2217,
"filterListId": 2117,
"languageId": 8
},
{
"filterListId": 2217,
"filterListId": 2117,
"languageId": 32
},
{
"filterListId": 2217,
"filterListId": 2117,
"languageId": 41
},
{
"filterListId": 2217,
"filterListId": 2117,
"languageId": 84
},
{
"filterListId": 2217,
"filterListId": 2117,
"languageId": 85
},
{
"filterListId": 2217,
"filterListId": 2117,
"languageId": 134
},
{
"filterListId": 2217,
"filterListId": 2117,
"languageId": 170
},
{
"filterListId": 2217,
"languageId": 171
"filterListId": 2117,
"languageId": 175
},
{
"filterListId": 2246,
Expand Down Expand Up @@ -3153,7 +3153,7 @@
},
{
"filterListId": 2246,
"languageId": 171
"languageId": 175
},
{
"filterListId": 2269,
Expand Down Expand Up @@ -3185,7 +3185,7 @@
},
{
"filterListId": 2269,
"languageId": 171
"languageId": 175
},
{
"filterListId": 2282,
Expand Down
32 changes: 32 additions & 0 deletions data/FilterListMaintainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5402,5 +5402,37 @@
{
"filterListId": 2018,
"maintainerId": 154
},
{
"filterListId": 1523,
"maintainerId": 155
},
{
"filterListId": 1524,
"maintainerId": 155
},
{
"filterListId": 1525,
"maintainerId": 155
},
{
"filterListId": 2151,
"maintainerId": 155
},
{
"filterListId": 2152,
"maintainerId": 155
},
{
"filterListId": 2315,
"maintainerId": 155
},
{
"filterListId": 2316,
"maintainerId": 155
},
{
"filterListId": 2317,
"maintainerId": 155
}
]
144 changes: 140 additions & 4 deletions data/FilterListTag.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2955,10 +2955,6 @@
"filterListId": 712,
"tagId": 2
},
{
"filterListId": 713,
"tagId": 2
},
{
"filterListId": 715,
"tagId": 12
Expand Down Expand Up @@ -6183,6 +6179,10 @@
"filterListId": 1523,
"tagId": 3
},
{
"filterListId": 1523,
"tagId": 6
},
{
"filterListId": 1523,
"tagId": 7
Expand Down Expand Up @@ -10671,6 +10671,10 @@
"filterListId": 2151,
"tagId": 6
},
{
"filterListId": 2151,
"tagId": 7
},
{
"filterListId": 2152,
"tagId": 2
Expand All @@ -10683,6 +10687,10 @@
"filterListId": 2152,
"tagId": 6
},
{
"filterListId": 2152,
"tagId": 7
},
{
"filterListId": 2155,
"tagId": 2
Expand Down Expand Up @@ -11414,5 +11422,133 @@
{
"filterListId": 2292,
"tagId": 12
},
{
"filterListId": 2293,
"tagId": 19
},
{
"filterListId": 2294,
"tagId": 19
},
{
"filterListId": 2295,
"tagId": 7
},
{
"filterListId": 2296,
"tagId": 2
},
{
"filterListId": 2297,
"tagId": 2
},
{
"filterListId": 2298,
"tagId": 2
},
{
"filterListId": 2299,
"tagId": 2
},
{
"filterListId": 2300,
"tagId": 19
},
{
"filterListId": 2301,
"tagId": 6
},
{
"filterListId": 2302,
"tagId": 19
},
{
"filterListId": 2303,
"tagId": 6
},
{
"filterListId": 2304,
"tagId": 7
},
{
"filterListId": 2305,
"tagId": 7
},
{
"filterListId": 2306,
"tagId": 6
},
{
"filterListId": 2307,
"tagId": 7
},
{
"filterListId": 2308,
"tagId": 7
},
{
"filterListId": 2309,
"tagId": 7
},
{
"filterListId": 2310,
"tagId": 7
},
{
"filterListId": 2311,
"tagId": 7
},
{
"filterListId": 2312,
"tagId": 6
},
{
"filterListId": 2313,
"tagId": 6
},
{
"filterListId": 2314,
"tagId": 6
},
{
"filterListId": 2315,
"tagId": 2
},
{
"filterListId": 2315,
"tagId": 3
},
{
"filterListId": 2315,
"tagId": 6
},
{
"filterListId": 2315,
"tagId": 7
},
{
"filterListId": 2316,
"tagId": 2
},
{
"filterListId": 2316,
"tagId": 3
},
{
"filterListId": 2316,
"tagId": 6
},
{
"filterListId": 2316,
"tagId": 7
},
{
"filterListId": 2317,
"tagId": 3
},
{
"filterListId": 2318,
"tagId": 7
}
]
13 changes: 10 additions & 3 deletions data/License.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,14 +275,14 @@
},
{
"id": 41,
"descriptionUrl": "http://www.affero.org/oagpl.html",
"descriptionUrl": "https://directory.fsf.org/wiki/License:AGPL-1.0",
"name": "AGPLv1",
"permissiveAdaptation": true,
"permissiveCommercial": true
},
{
"id": 42,
"descriptionUrl": "http://www.affero.org/agpl2.html",
"descriptionUrl": "https://www.vicidial.com/?page_id=260",
"name": "AGPLv2",
"permissiveAdaptation": true,
"permissiveCommercial": true
Expand All @@ -293,5 +293,12 @@
"name": "AGPLv3",
"permissiveAdaptation": true,
"permissiveCommercial": true
},
{
"id": 44,
"descriptionUrl": "https://opensource.org/licenses/CPAL-1.0",
"name": "CPAL-1.0",
"permissiveAdaptation": true,
"permissiveCommercial": true
}
]
]
5 changes: 5 additions & 0 deletions data/Maintainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,5 +811,10 @@
"id": 154,
"homeUrl": "https://blocklist.site/",
"name": "Block Lists Project"
},
{
"id": 155,
"homeUrl": "https://github.com/bongochong",
"name": "Chongo Bong"
}
]
Loading