JSON adblock resources support #74
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@mihaiplesa some CI script changes will be needed after it gets merged - namely, the properly audited commit of uBlock Origin (currently 978f04219a1f41f3fab7ad5c38ec2a1a021920fe) will need to be checked out as the git submodule. |
|
@antonok-edm sounds good. |
32 tasks
bbondy
force-pushed
the
json_resources
branch
from
d7e1a84 to
e3ec13e
Compare
bbondy
requested changes
Nov 7, 2019
antonok-edm
force-pushed
the
json_resources
branch
from
e3ec13e to
6e114ab
Compare
bbondy
force-pushed
the
json_resources
branch
from
6e114ab to
dcff346
Compare
32 tasks
bbondy
approved these changes
Nov 12, 2019
|
@mihaiplesa this is ready to be merged but it will require these additional commands to be added to the ad-block nightly job. After the clone.... Then proceed with the rest. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Similar to #73, but using the newer
web_accessible_resourcesandscriptlets.jsresources from the uBlock Origin repo.Brave's audited fork of uBlock Origin is added as a submodule.