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

Fix licensing. #489

Merged

rewtd merged 12 commits into master from licensing

May 10, 2024

Collaborator

sydseter commented May 7, 2024

WIP


          Fix licensing.

d79b50c

sydseter requested a review from rewtd

May 7, 2024 18:54


          Fix licensing.

d8d519e

sydseter requested a review from cw-owasp

May 7, 2024 19:08

Collaborator Author

sydseter commented May 7, 2024

Thought I take the initiative here. The current changes that I made is probably wrong. It would be great if you could give me some directions. I understood that part of the content was Apache 2.0 licensed. If so, which part?
Having both the "CC-BY-SA-3.0" and "Apache 2.0" licenses at the base of the repo without any note like now, is not a good idea. If most of the content is licensed under "CC-BY-SA-3.0" we just need to note where that is not the case as these licenses not is considered to be compatible under the CC-BY-SA-3.0 terms.

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_en_1.30_dynamic.docx (d79b5)

c4e8376

Pull request: #489
Commit: d79b50c

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_en_1.30_dynamic.idml (d79b5)

92f8b3c

Pull request: #489
Commit: d79b50c

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_en_1.30_dynamic.pdf (d79b5)

c14bf56

Pull request: #489
Commit: d79b50c

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_en_1.30_leaflet.idml (d79b5)

a6ac955

Pull request: #489
Commit: d79b50c

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_en_1.30_static.docx (d79b5)

3adcec8

Pull request: #489
Commit: d79b50c

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_en_1.30_static.idml (d79b5)

8018aa3

Pull request: #489
Commit: d79b50c

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_en_1.30_static.pdf (d79b5)

043e9de

Pull request: #489
Commit: d79b50c

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_es_1.30_dynamic.docx (d79b5)

485a774

Pull request: #489
Commit: d79b50c

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_es_1.30_dynamic.pdf (d79b5)

910e755

Pull request: #489
Commit: d79b50c

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_es_1.30_dynamic.idml (d79b5)

b7d9a8b

Pull request: #489
Commit: d79b50c

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_es_1.30_leaflet.idml (d79b5)

4dca076

Pull request: #489
Commit: d79b50c

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_es_1.30_static.docx (d79b5)

1ce8f09

Pull request: #489
Commit: d79b50c

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_es_1.30_static.pdf (d79b5)

de76e75

Pull request: #489
Commit: d79b50c

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_es_1.30_static.idml (d79b5)

614ee59

Pull request: #489
Commit: d79b50c

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_fr_1.30_dynamic.docx (d79b5)

be5f62c

Pull request: #489
Commit: d79b50c

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_fr_1.30_dynamic.idml (d79b5)

fb096f9

Pull request: #489
Commit: d79b50c

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_fr_1.30_dynamic.pdf (d79b5)

ca6042d

Pull request: #489
Commit: d79b50c

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_fr_1.30_leaflet.idml (d79b5)

d32d8c9

Pull request: #489
Commit: d79b50c

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_fr_1.30_static.docx (d79b5)

f6d49c9

Pull request: #489
Commit: d79b50c

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_fr_1.30_static.idml (d79b5)

b7aa6d9

Pull request: #489
Commit: d79b50c

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_fr_1.30_static.pdf (d79b5)

c4dc125

Pull request: #489
Commit: d79b50c

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_nl_1.30_dynamic.docx (d79b5)

3c219f9

Pull request: #489
Commit: d79b50c

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_nl_1.30_dynamic.idml (d79b5)

3a7a505

Pull request: #489
Commit: d79b50c

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_nl_1.30_dynamic.pdf (d79b5)

5adffac

Pull request: #489
Commit: d79b50c

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_nl_1.30_leaflet.idml (d79b5)

a038635

Pull request: #489
Commit: d79b50c

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_nl_1.30_static.docx (f2c26)

75f157e

Pull request: #489
Commit: f2c2616

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_nl_1.30_static.idml (f2c26)

1a19db7

Pull request: #489
Commit: f2c2616

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_nl_1.30_static.pdf (f2c26)

Pull request: #489
Commit: f2c2616

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_no-nb_1.30_dynamic.docx (f…

…2c26)

Pull request: #489
Commit: f2c2616

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_no-nb_1.30_dynamic.idml (f…

4ff4a4d

…2c26)

Pull request: #489
Commit: f2c2616

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_no-nb_1.30_dynamic.pdf (f2…

ff80f01

…c26)

Pull request: #489
Commit: f2c2616

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_no-nb_1.30_leaflet.idml (f…

0bae7fc

…2c26)

Pull request: #489
Commit: f2c2616

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_no-nb_1.30_static.docx (f2…

061aaa9

…c26)

Pull request: #489
Commit: f2c2616

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_no-nb_1.30_static.idml (f2…

f97640f

…c26)

Pull request: #489
Commit: f2c2616

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_no-nb_1.30_static.pdf (f2c26)

a7a2688

Pull request: #489
Commit: f2c2616

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_pt-br_1.30_dynamic.docx (f…

d3c2bae

…2c26)

Pull request: #489
Commit: f2c2616

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_pt-br_1.30_dynamic.idml (f…

6afb512

…2c26)

Pull request: #489
Commit: f2c2616

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_pt-br_1.30_dynamic.pdf (f2…

74a4b4f

…c26)

Pull request: #489
Commit: f2c2616

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_pt-br_1.30_leaflet.idml (f…

c157ae7

…2c26)

Pull request: #489
Commit: f2c2616

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_pt-br_1.30_static.docx (f2…

b002eab

…c26)

Pull request: #489
Commit: f2c2616

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_pt-br_1.30_static.idml (f2…

ab2dc28

…c26)

Pull request: #489
Commit: f2c2616

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_webapp_cards_pt-br_1.30_static.pdf (f2c26)

73ac5f1

Pull request: #489
Commit: f2c2616

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_mobileapp_cards_en_1.00_static.idml (f2…

a714a50

…c26)

Pull request: #489
Commit: f2c2616

github-actions bot added a commit that referenced this pull request


          Upload pr489-owasp_cornucopia_mobileapp_cards_en_1.00_leaflet.idml (f…

838a445

…2c26)

Pull request: #489
Commit: f2c2616

OWASP deleted a comment from github-actions bot

rewtd requested changes

View reviewed changes

README.md Outdated Show resolved Hide resolved

rewtd added 4 commits

May 10, 2024 09:58


          Update LICENSE.md

2d7362d


          Update README.md


          Create LICENCE.md

dac2a1c


          Delete source/LICENSE.md

19e4b71

rewtd assigned sydseter

rewtd approved these changes

View reviewed changes

rewtd merged commit 7174fb0 into master

4 checks passed

rewtd deleted the licensing branch

May 10, 2024 09:25

sydseter assigned rewtd

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment