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

Improve licensing of external components (uplift to 1.1.x) #4128

Merged
merged 10 commits into from
Dec 5, 2019
Merged

Improve licensing of external components (uplift to 1.1.x) #4128

merged 10 commits into from
Dec 5, 2019

Conversation

fmarier
Copy link
Member

@fmarier fmarier commented Dec 3, 2019 •
edited
Loading

Uplift of #4103 .

Approved, please ensure that before merging:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.
  • You have tested your change on Nightly.
  • The PR milestones match the branch they are landing to.

After you merge:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@fmarier fmarier added this to the 1.1.x - Beta milestone Dec 3, 2019
@fmarier fmarier self-assigned this Dec 3, 2019
@fmarier fmarier mentioned this pull request Dec 3, 2019
Merged
4 tasks
@rebron rebron requested review from a team and removed request for bbondy, kjozwiak, bsclifton, rebron and srirambv December 3, 2019 21:25
@fmarier
Move the EasyList license to common/licenses
af057a0 
That license is used by several adblock lists.
@fmarier
Remove duplicate copies of GPL-3.0 and CC-BY-SA-3.0 licenses in EasyL…
2f4e2ea 
…ist license

This is the license text as it appears on the EasyList website:

https://easylist.to/pages/licence.html
@fmarier
Create adblock component to hold third-party lists licensing info
afad9fd 
The LICENSE file of that component is generated as part of the
build process by lib/licensing.js in brave/brave-browser.
@fmarier
Add is-abp license based on email from author (fixes brave/brave-brow…
dfe4ad8 
…ser#7148)
@fmarier
Move Tor licensing information to components/third_party
3dc1d3d 
Clarify that Tor is a separate component that may be downloaded
by the Brave Browser.
@fmarier
Move HTTPS Everywhere licensing information to components/third_party
778d51f 
Clarify that the HTTPS Everywhere license applies to a list that
is downloaded at run time and is separate from the Brave Browser.
@fmarier
Add the Brave Ethereum Remote Client licensing information
efabdff 
This is related to an extension that is not downloaded until users
open the Crypto Wallets sections of brave://settings.
@fmarier
Create local-data component to hold licensing info of data files
58aaf41 
The LICENSE file of that component is generated as part of the
build process by lib/licensing.js in brave/brave-browser.
@fmarier
Add abp-xfiles license (fixes brave/brave-browser#6910)
76af77d
@fmarier
Reuse common licenses in adblock and local-data copyright statements
62cdaeb 
This is a partial fix for brave/brave-browser#6856.
@fmarier fmarier force-pushed the francois-non-bundled-third-parties-7150-1.1.x branch from bdc3c2a to 62cdaeb Compare December 5, 2019 00:46
kjozwiak
kjozwiak approved these changes Dec 5, 2019
View reviewed changes
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uplift into 1.1.x approved after deliberating with @brave/uplift-approvers. We also agreed that the following should be uplifted in the weekly b-c triage meeting. Both CI/Travis and CI/Jenkins passed without any issues.

@kjozwiak kjozwiak merged commit 950ca60 into 1.1.x Dec 5, 2019
@kjozwiak kjozwiak deleted the francois-non-bundled-third-parties-7150-1.1.x branch December 5, 2019 07:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

Assignees

@fmarier fmarier

Labels
None yet
Projects
None yet
Milestone
1.1.x - Release
Development

Successfully merging this pull request may close these issues.
2 participants
@fmarier @kjozwiak