diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 8f77f73b..dfc4369d 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -8,7 +8,6 @@ List the checks and visual/platform testing performed. ## Contribution and licensing -- [ ] I have read and accept the [Flectar Contributor License Agreement](https://github.com/flectar/mail/blob/main/CLA.md) version 1.0 for this and future contributions submitted under that version. - [ ] I have the right to submit this work. If an employer or another entity owns it, I have obtained the required authorization. - [ ] I identified the source and license of every third-party dependency or asset added by this pull request. - [ ] I disclosed any material generative-tool assistance and reviewed its output for correctness, provenance, and licensing. diff --git a/CLA.md b/CLA.md deleted file mode 100644 index 71df0651..00000000 --- a/CLA.md +++ /dev/null @@ -1,85 +0,0 @@ -# Flectar Contributor License Agreement 1.0 - -This Contributor License Agreement (“Agreement”) is between the person or -entity accepting it (“You”) and Flectar, the steward of the Flectar Mail -project (“Flectar”). It applies to every Contribution You intentionally submit -to a Flectar-managed repository after accepting this Agreement. - -## 1. Definitions - -“Contribution” means any original work of authorship, including code, -documentation, designs, tests, translations, or modifications, intentionally -submitted by You for inclusion in the project. A submission marked in writing -as “Not a Contribution” is excluded. - -“Submit” includes communication through a source-control system, pull request, -issue tracker, code-review system, mailing list, or other channel Flectar uses -to receive project contributions. - -## 2. Copyright license - -You grant Flectar and recipients of software distributed by Flectar a -perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable -copyright license to reproduce, prepare derivative works of, publicly display, -publicly perform, sublicense, and distribute Your Contributions and derivative -works of them as part of Flectar Mail under `AGPL-3.0-only`. - -You retain copyright ownership and may use and license Your Contributions -independently. This Agreement does not authorize Flectar to publish an accepted -client Contribution solely as proprietary software. A different license for a -Contribution requires a separate agreement from its copyright holder. - -## 3. Patent license - -You grant Flectar and recipients of software distributed by Flectar a -perpetual, worldwide, non-exclusive, no-charge, royalty-free patent license to -make, have made, use, offer to sell, sell, import, and otherwise transfer the -Contribution. This grant applies only to patent claims You can license that are -necessarily infringed by Your Contribution alone or by its combination with -the project to which You submitted it. - -If You initiate patent litigation alleging that the project or a Contribution -in it infringes a patent, patent licenses granted to You under this Agreement -for that project terminate as of the filing date. - -## 4. Your assurances - -You represent that: - -- You are legally entitled to grant the licenses in this Agreement; -- each Contribution is Your original creation, except for third-party material - that You clearly identify together with its source and license; -- Your submission does not knowingly violate another person's copyright, - patent, trade secret, contract, privacy, or other rights; -- if an employer or another entity may own the Contribution, You have received - permission to contribute it under this Agreement; and -- You will notify Flectar if any of these statements later becomes inaccurate. - -Flectar may require an authorized representative of an employer or other owner -to execute a separate corporate agreement before accepting the Contribution. - -## 5. No support or warranty - -You are not required to provide support for a Contribution. Unless separately -agreed in writing, Contributions are provided “as is”, without warranties or -conditions of any kind. - -## 6. Public record and personal information - -Flectar may retain and publish Your name, account identifier, contribution -history, and acceptance record as reasonably necessary to administer project -rights and provide attribution. Do not include private credentials, private -mail, or unnecessary personal information in a Contribution. - -## 7. Acceptance and future versions - -You accept this Agreement by affirmatively checking the CLA acceptance box in -a pull request and submitting that pull request. Flectar may also use a CLA -service that records the same acceptance. The repository's contribution -process identifies the version accepted. - -Flectar may publish a new CLA version for future Contributions. A new version -does not apply retroactively unless You accept it. This Agreement is the entire -agreement concerning the licenses granted for Contributions under it and may -be amended for a particular Contribution only in a writing accepted by both -You and Flectar. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c1a09a66..890860cb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,19 +11,13 @@ and safe for a mail client that handles private user data. - Never submit real mailbox contents, credentials, OAuth tokens, signing material, or personal fixture data. Use reserved `.example` domains. -## Contributor License Agreement +## Contribution licensing -Every contributor must accept the -[`Flectar Contributor License Agreement`](CLA.md) before a pull request can be -merged. Contributors retain copyright. The CLA permits Flectar to maintain the -AGPL project and provides an explicit patent grant; it does not make accepted -client contributions proprietary. This purpose is also described in -[`LICENSING.md`](LICENSING.md). - -If an employer or another organization owns your work, an authorized -representative must approve the contribution. A personal checkbox cannot grant -rights owned by your employer. Maintainers may request a separate corporate -agreement before review is completed. +Contributions are licensed under the same license that applies to the files +being changed, usually `AGPL-3.0-only`. Contributors retain copyright and must +have the right to submit their work under that license. If an employer or +another organization owns your work, obtain its authorization before +contributing. ## Pull requests @@ -59,5 +53,4 @@ Icon sources, generation and sizing are documented in Accepted contributions are published as part of Flectar Mail under `AGPL-3.0-only`, unless a file is explicitly identified as third-party material -under another compatible license. The CLA does not remove the AGPL rights that -recipients receive for published releases. +under another compatible license. diff --git a/LICENSING.md b/LICENSING.md index 5ba62d48..28c2381d 100644 --- a/LICENSING.md +++ b/LICENSING.md @@ -39,12 +39,10 @@ own published scope, price, privacy terms, and service terms before launch. ## Contributions -Outside contributions are accepted under the -[`Flectar Contributor License Agreement`](CLA.md). Contributors retain -copyright, and accepted contributions are published as part of Flectar Mail -under `AGPL-3.0-only`. The agreement does not create a proprietary client -edition or remove recipients' AGPL rights. See -[`CONTRIBUTING.md`](CONTRIBUTING.md) for the acceptance process. +Outside contributions are accepted under the license that applies to the files +being changed, usually `AGPL-3.0-only`. Contributors retain copyright and must +have the right to submit their work under that license. See +[`CONTRIBUTING.md`](CONTRIBUTING.md) for the contribution process. ## Trademarks