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 licensing info #1848

Merged
merged 4 commits into from
May 11, 2023
Merged

Add licensing info #1848

merged 4 commits into from
May 11, 2023

Conversation

Steve-Mcl
Copy link
Contributor

Description

Adds initial licensing info to docs

Related Issue(s)

#1745

Checklist

  • I have read the contribution guidelines
  • Suitable unit/system level tests have been added and they pass
  • Documentation has been updated
    • Upgrade instructions
    • Configuration details
    • Concepts
  • [-] Changes flowforge.yml?
    • Issue/PR raised on flowforge/helm to update ConfigMap Template
    • Issue/PR raised on flowforge/CloudProject to update values for Staging/Production

Labels

  • [-] Backport needed? -> add the backport label
  • Includes a DB migration? -> add the area:migration label

@Steve-Mcl
Copy link
Contributor Author

@knolleary first stab at adding licensing info.

I am more than certain much of this will need rewording, restructuring, improving - this 1st iteration should be considered more of a placeholder for the final doc improvements.

ZJvandeWeg
ZJvandeWeg reviewed Apr 11, 2023
View reviewed changes
docs/admin/licensing.md Outdated Show resolved Hide resolved
docs/admin/licensing.md Show resolved Hide resolved
Steve-Mcl and others added 2 commits April 12, 2023 16:44
@Steve-Mcl @ZJvandeWeg
Update docs/admin/licensing.md
601a26d 
Co-authored-by: Zeger-Jan van de Weg <ZJvandeWeg@users.noreply.github.com>
@Steve-Mcl
add link to online pricing for up-to-date info
dcded45
knolleary
knolleary reviewed May 11, 2023
View reviewed changes
docs/admin/README.md Outdated Show resolved Hide resolved
knolleary
knolleary approved these changes May 11, 2023
View reviewed changes
Copy link
Member

@knolleary knolleary left a comment

Choose a reason for hiding this comment

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

Approving to get this into 1.7. Made a fix to a broken link, but otherwise, we can iterate if any further changes are needed. Better to have something in than nothing.

@knolleary knolleary merged commit 5e50430 into main May 11, 2023
1 check passed
@knolleary knolleary deleted the license-info-1745 branch May 11, 2023 08:40
@github-actions github-actions bot mentioned this pull request May 11, 2023
Merged
9 tasks
hardillb added a commit that referenced this pull request May 11, 2023
@hardillb
Merge pull request #2126 from flowforge/backport-1848
e0f26d8 
Add licensing info (backport #1848)
This was referenced May 11, 2023
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flecoufle flecoufle flecoufle left review comments

@knolleary knolleary knolleary approved these changes

@ZJvandeWeg ZJvandeWeg Awaiting requested review from ZJvandeWeg

Assignees
No one assigned
Labels
backport
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Steve-Mcl @knolleary @ZJvandeWeg @flecoufle