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

Add missing dependencies to brave://credits (uplift to 0.71.x) #3955

Merged
merged 13 commits into from
Nov 9, 2019
Merged

Add missing dependencies to brave://credits (uplift to 0.71.x) #3955

merged 13 commits into from
Nov 9, 2019

Conversation

fmarier
Copy link
Member

@fmarier fmarier commented Nov 9, 2019 •
edited by bsclifton
Loading

Uplift of #3899
Fixes brave/brave-browser#6809

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 added 13 commits November 8, 2019 18:02
@fmarier
Add licensing terms for background photos
0e25f93
@fmarier
Note that TheSkyfolk images are used with permission
c281ed1 
We received permission to use these in Brave directly from the
photographer, Will Christiansen.
@fmarier
Add licensing info for the zxing library on Android
d3fa830
@fmarier
Add font licenses
da52c0e
@fmarier
Add PROCHLO license
a033eed
@fmarier
Update brave-intl dependencies to pull in LICENSE files
8838efd 
None of these have any other changes than the license or copyright
notice.
@fmarier
Add license notice for the brave-sync extension
7161fb4
@fmarier
Add Tor and Chromium license notices
9a18827 
We pull in Tor binaries which we build using
https://github.com/brave/tor_build_scripts
@fmarier
Add license notices for the lists used in Shields
2427a23
@fmarier
Add adblock_bg license after confirming with author by email
a1c5c29
@fmarier
Add license notices for node modules
6dfaadc 
This includes all of the dependencies (excluding devDependencies)
in brave-browser and brave-core package.json.
@fmarier
Remove unnecessary copies of the MPL-2.0
171e1aa 
These files were only needed before these separate projects got
merged into the brave-core repo.
@fmarier
Add missing third-party code to brave://credits (fixes brave/brave-br…
fe570ef 
…owser#6809)
@fmarier fmarier added this to the 0.71.x - Release milestone Nov 9, 2019
@fmarier fmarier self-assigned this Nov 9, 2019
@bsclifton bsclifton requested review from a team and removed request for bridiver, bbondy, tmancey, kjozwiak, bsclifton, rebron and srirambv November 9, 2019 05:37
@bsclifton bsclifton added CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS CI/skip-linux labels Nov 9, 2019
@bsclifton
Copy link
Member

Everything passed here 😄👍 CI is good to go

The 6 hour timeout was hit on macOS during create_dist step, which aborted CI (all other platforms finished just fine). Build/tests worked great on macOS

bsclifton
bsclifton approved these changes Nov 9, 2019
View reviewed changes
Copy link
Member

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

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

++

@bsclifton bsclifton merged commit 88c9110 into 0.71.x Nov 9, 2019
@bsclifton bsclifton deleted the francois-add-missing-licenses-6809-0.71.x branch November 9, 2019 17:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bsclifton bsclifton bsclifton approved these changes

Assignees

@fmarier fmarier

Labels
CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS
Projects
None yet
Milestone
1.0.0 - Release
Development

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