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.

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

add AGPL v3.0 (or later) license #636

Merged
merged 92 commits into from
Nov 6, 2023
Merged
Show file tree
Hide file tree
Changes from 86 commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
e9ce28a
add license (proposal)
anonym-HPI Jan 31, 2023
c246052
Merge branch 'dev' into licensing/add-license-594
anonym-HPI Jan 31, 2023
3cd1a89
Apply suggestions from code review
anonym-HPI Feb 2, 2023
fbdcf71
exception rewriting and including "datasets"
anonym-HPI Feb 3, 2023
9b89db2
lines added and example removed and needing CUSTOM-LICENSE file
anonym-HPI Feb 3, 2023
9a5e2df
apply feedback plus change license files to markdown (.md) files
anonym-HPI Feb 9, 2023
5e374e2
Merge branch 'dev' into licensing/add-license-594
anonym-HPI Feb 9, 2023
bb97eba
add feedback
anonym-HPI Feb 9, 2023
652cd69
Merge branch 'licensing/add-license-594' of https://github.com/hpi-sa…
anonym-HPI Feb 9, 2023
0c91bd0
feedback, etc., rename licenses images file, add license.html
anonym-HPI Mar 1, 2023
bb29b46
Apply suggestions from code review
anonym-HPI Mar 2, 2023
cd07b65
added markdown file links and made singular/plural (TODO: better word…
anonym-HPI Mar 2, 2023
e5af7fe
README.md
anonym-HPI Mar 2, 2023
e660688
Merge branch 'dev' into licensing/add-license-594
anonym-HPI Mar 16, 2023
8977e4b
Merge branch 'dev' into licensing/add-license-594
benn02 Apr 21, 2023
00c7648
Merge branch 'dev' into licensing/add-license-594
anonym-HPI May 3, 2023
08916c6
trying to make it more clear about exports and imports and compression
anonym-HPI May 3, 2023
12125b0
run prettier
anonym-HPI May 3, 2023
6046c7c
subfolders also allowed in frontend/src/assets for images
anonym-HPI May 3, 2023
14947ab
add THIRD-PARTY-LICENSE-ACKNOLDGEMENTS.json and pipeline check
anonym-HPI May 3, 2023
26dbd9b
try license acknoledgement with npm run deployment and with omitVersion
anonym-HPI May 3, 2023
1cdb6f7
try only with setup:ci
anonym-HPI May 3, 2023
632069e
try github to create the THIRD-PARTY-LICENSE-ACKNOWLEDGEMENTS.json file
anonym-HPI May 3, 2023
8457256
move it into pipeline.yml and use build job
anonym-HPI May 3, 2023
4d9a7cb
use npm run setup:ci
anonym-HPI May 3, 2023
5350595
run setup instead of setup:ci
anonym-HPI May 3, 2023
fced592
update-third-party-license-acknowledgments
web-flow May 3, 2023
a00cedf
create THIRD-PARTY-LICENSE-ACKNOWLEDGEMENTS.json after all tests are …
anonym-HPI May 3, 2023
075a49f
workflow in seperate .yml
anonym-HPI May 3, 2023
0d2399a
needs: tests-done
anonym-HPI May 3, 2023
dc0ad20
try to run commit only when anything changed in THIRD-PARTY-LICENSE-A…
anonym-HPI May 3, 2023
05357ae
change something to see if a new one will be created
anonym-HPI May 3, 2023
142894d
downloadable source code zip
anonym-HPI May 4, 2023
b788ac9
commit THIRD-PARTY-LICENSE-ACKNOWLEDGEMENTS.json at least once for gi…
anonym-HPI May 4, 2023
d5a62b6
everything in in one line
anonym-HPI May 4, 2023
451061b
ignore git commit exiting with error (see https://github.com/simonw/t…
anonym-HPI May 4, 2023
7910f4f
update-third-party-license-acknowledgments
web-flow May 4, 2023
5e90375
add git to comment and move git archive zip for download down
anonym-HPI May 4, 2023
be44dcc
npm run setup
anonym-HPI May 4, 2023
0bd09f3
Merge branch 'licensing/add-license-594' of https://github.com/hpi-sa…
anonym-HPI May 4, 2023
d910860
Merge branch 'dev' into licensing/add-license-594
anonym-HPI May 4, 2023
84dfa04
update-third-party-license-acknowledgments
web-flow May 4, 2023
3b2a053
testing if npm run setup:package-lock-only is enough
anonym-HPI May 4, 2023
3984cfa
Merge branch 'licensing/add-license-594' of https://github.com/hpi-sa…
anonym-HPI May 4, 2023
588d89d
try with setup:ci if it changes
anonym-HPI May 4, 2023
607eff5
commit third party license acknowledgements on pr release (signed off…
anonym-HPI May 4, 2023
922ed8a
prettier and prettierignore and add <p></p>s in license.thmls
anonym-HPI May 4, 2023
b810483
Merge branch 'dev' into licensing/add-license-594
anonym-HPI May 4, 2023
8ebf35f
add period in license.html
anonym-HPI May 4, 2023
068d52e
Merge branch 'licensing/add-license-594' of https://github.com/hpi-sa…
anonym-HPI May 4, 2023
342561f
edit CHANGELOG.md
anonym-HPI May 4, 2023
d1b9107
Merge branch 'dev' into licensing/add-license-594
anonym-HPI May 4, 2023
aa21371
Merge branch 'dev' into licensing/add-license-594
anonym-HPI May 5, 2023
2de53e6
Apply suggestions from code review
anonym-HPI May 9, 2023
d3ee3d7
Merge branch 'dev' into licensing/add-license-594
anonym-HPI May 23, 2023
8157c94
Merge branch 'dev' into licensing/add-license-594
anonym-HPI Jun 12, 2023
4fd48ea
updat package-locks
anonym-HPI Jun 12, 2023
6370cfc
use license-reporter instead of npm-license-crawler
anonym-HPI Jun 20, 2023
fdd0b6b
update a lot for license PR
anonym-HPI Jul 7, 2023
3f32a3e
include THIRD-PARTY-LICENSE-ACKNOWLEDGEMENT (html + json)
anonym-HPI Jul 7, 2023
4b84be4
update third party acknowledgments html file and creation
anonym-HPI Jul 7, 2023
878a3e9
add source-code zip file
anonym-HPI Jul 7, 2023
1ebd4a6
add license information about some images + change license text in LI…
anonym-HPI Jul 8, 2023
d782522
git archive export-ignore the repo zip file
anonym-HPI Jul 8, 2023
5a8ad58
updated source code zip file
anonym-HPI Jul 8, 2023
f020c39
add explaination to .gitattributes
anonym-HPI Jul 8, 2023
e678509
trying to fix .prettierignore
anonym-HPI Jul 8, 2023
0bd3c4e
trying to fix prettierignore again
anonym-HPI Jul 8, 2023
85e121f
trying to fix prettierignore again
anonym-HPI Jul 10, 2023
17eea46
prettierignore was not the correct place, eslint ignorePatterns was
anonym-HPI Jul 10, 2023
e149037
Merge branch 'dev' of https://github.com/hpi-sam/digital-fuesim-manv …
anonym-HPI Jul 10, 2023
cb59407
update CHANGELOG.md
anonym-HPI Jul 10, 2023
ff178b7
licenses-images.md removed german link (english link should be enough)
anonym-HPI Jul 10, 2023
db802b9
remove files in source-code folder + add README.md file instead and r…
anonym-HPI Jul 10, 2023
a912a57
add npm-run-all to package.json
anonym-HPI Jul 10, 2023
d33acd5
apply feedback to third-party-license-json-to-html.cjs
anonym-HPI Jul 10, 2023
5c7b20f
Update LICENSE-README.md (apply feedback)
anonym-HPI Jul 10, 2023
285603d
fix CHANGELOG.md
anonym-HPI Jul 10, 2023
01f6a17
add .gitkeep file instead of README.md in source-code folder
anonym-HPI Jul 12, 2023
2f04d6f
add source-code to gitignore
anonym-HPI Jul 12, 2023
f952d52
remove duplication ignore (as eslint uses .gitignore in frontend folder)
anonym-HPI Jul 12, 2023
6ee1f76
Merge branch 'dev' into licensing/add-license-594
anonym-HPI Jul 31, 2023
e4c6122
add white-spcae:pre-wrap to license texts (apply feedback)
anonym-HPI Aug 15, 2023
ca1109d
apply feedback to PR template and include list of inspired by or copi…
anonym-HPI Aug 17, 2023
10ee581
Add tutorial on how to center a div reference
benn02 Aug 22, 2023
332d851
prettierignore inspired-by-or-copied-from-list.html
anonym-HPI Sep 19, 2023
f83d7cd
Update pull_request_template.md
anonym-HPI Nov 6, 2023
4b7c99e
Update pull_request_template.md
anonym-HPI Nov 6, 2023
81a060a
Update pull_request_template.md
anonym-HPI Nov 6, 2023
018a8bf
Update pull_request_template.md
anonym-HPI Nov 6, 2023
24256e6
Update pull_request_template.md
anonym-HPI Nov 6, 2023
4c50796
Update README.md
anonym-HPI Nov 6, 2023
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
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
* text=auto
# docker-entrypoint.sh needs LF (see https://github.com/hpi-sam/digital-fuesim-manv/issues/479)
docker/docker-entrypoint.sh eol=lf
# with this export-ignore the zip file won't include itself when using git archive
frontend/src/assets/source-code/digital-fuesim-manv.zip export-ignore
2 changes: 2 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ Please make sure to fulfil the following conditions before marking this PR ready

- [ ] If this PR adds or changes features or fixes bugs, this has been added to the changelog
- [ ] If this PR adds new actions or other ways to alter the state, [test scenarios](https://github.com/hpi-sam/digital-fuesim-manv-public-test-scenarios) have been added
- [ ] I have the right to license the code submitted with this Pull Request (i.e., this is my own code or code licensed under a license compatible to AGPL v3.0 or later, for exceptions look into [LICENSE-README.md](LICENSE-README.md). In case of using third party code, I have given appropriate credit.
- [ ] If I have used third party code and I mentioned it in the code, I also updated the[inspired-by-or-copied-from-list.html](inspired-by-or-copied-from-list.html) list to include the links.
2 changes: 1 addition & 1 deletion .github/workflows/create-release-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Commit updated version and changelog
id: create-commit
run: |
git commit -a --message "Prepare release v${{ github.event.inputs.versionName }}"
git commit -a --signoff --message "Prepare release v${{ github.event.inputs.versionName }}"
echo "commit=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
- name: Push new branch
run: git push origin release/v${{ github.event.inputs.versionName }}
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,6 @@ benchmark/data/*
.vscode/*
!.vscode/*.example
!.vscode/extensions.json

# mitigate accidental commit of files in source-code
frontend/src/assets/source-code/*
9 changes: 9 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,12 @@ docker-compose.yml
benchmark/data

test-scenarios/

# custom html files in about
frontend/src/assets/about

# custom files in source-code
frontend/src/assets/source-code

# custom html files
inspired-by-or-copied-from-list.html
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,15 @@ and this project does **not** adhere to [Semantic Versioning](https://semver.org

## [Unreleased]

### Added

- this software has now a license (with some exceptions), see LICENSE-README.md
- the software includes a file with third party acknoledgments, a license.html and the docker container will include a git archive of the source code downloadable in zip format
- new npm run commands for licensing (third party acknowledgements) and creating source code archive

## [0.7.1] - 2023-07-10

## Added
### Added

- Patients can be identified with an unique ID
- The ID is assigned to every patient automatically
Expand Down
22 changes: 22 additions & 0 deletions LICENSE-README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Copyright (c) 2023 See the [README.md](README.md#contributors) for authors/contributors (bottom of the document).

This software is a digital implementation of the "FüSim MANV"/"FueSim MANV" (Führungssimulation Massenanfall von Verletzen), a German paper-based simulation game for training emergency medical services leadership personnel in managing Mass Casualty Incidents.

The software is licensed under the [GNU Affero General Public License](LICENSE.md) as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
Exceptions apply to image files in the frontend/src/assets folder (or subfolders), which may be covered by and therefore distributed under different licenses.
The individual license for each image can be found in [frontend/src/assets/LICENSES-IMAGES.md](frontend/src/assets/LICENSES-IMAGES.md), it is also possible to link to a publically free available webpage, where the license can be easily read from (this could be the source of an image, for example). Files added to this project may only use this exception if these files serve the only purpose of being displayed and will only be parsed for the purpose of displaying them.
Another exception to the default licence exists for datasets. Datasets are files that include no new features and just contain different compositions allowed through template classes given in the source code. Datasets must always be in a publically free available human readable formats (for example csv, JSON, txt). Compressed datasets are allowed, but every user of this software must be able to decompress it again into a publically free available human readable format with the help of this software. Datasets licenses must be mentioned in a LICENSES-DATASETS.md file in the respective folder where the dataset is placed (same applies if only one dataset is in the respective folder). All license files must state explicitly which file (or files) they refer to, who the authors are and which license applies (or licenses apply).
Datasets are not allowed to create any new features or enhance the software in any way, as to create elements that can be part of an export and are importable into this software, with its source code being under the [GNU Affero General Public License](LICENSE.md) as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Especially, you must not use this exception for source code files.
All exceptions can be part of another license chosen by the author of these images or datasets.

Digital FueSim MANV is free software: you can redistribute it and/or modify
it under the terms of the [GNU Affero General Public License](LICENSE.md) as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. Exceptions are mentioned in this file [LICENSE-README.md](LICENSE-README.md).

Digital FueSim MANV is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.

The GNU Affero General Public License can be found in the file named [LICENSE.md](LICENSE.md). If not, see <http://www.gnu.org/licenses/>.
Loading
Loading