From b4ae3f26e91edffd5071384a96ce04624902856b Mon Sep 17 00:00:00 2001 From: Jaggob <37583151+Jaggob@users.noreply.github.com> Date: Thu, 11 Jun 2026 15:19:31 +0200 Subject: [PATCH 1/2] docs: prepare repo for the move into the Etherpad org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - README: drop the affiliation/community acknowledgements that no longer fit a first-party Etherpad-org repo (the "not affiliated with … the Etherpad project" disclaimer and the Nextcloud/Etherpad community thanks); keep the Ownpad acknowledgement. - Remove THIRD_PARTY_NOTICES.md: it framed the Etherpad logo assets as third-party and "not an official Etherpad product", which no longer fits. The icons' Apache-2.0 license text stays in LICENSES/Apache-2.0.txt; README and img/README now point there directly so the attribution isn't lost. - Add SECURITY.md mirroring the etherpad-lite policy: report privately via contact@etherpad.org or GitHub private vulnerability reporting. Intended to land together with the org transfer. --- README.md | 4 +--- SECURITY.md | 12 ++++++++++++ THIRD_PARTY_NOTICES.md | 22 ---------------------- img/README.md | 1 - 4 files changed, 13 insertions(+), 26 deletions(-) create mode 100644 SECURITY.md delete mode 100644 THIRD_PARTY_NOTICES.md diff --git a/README.md b/README.md index 6e29c84..2800f00 100644 --- a/README.md +++ b/README.md @@ -209,10 +209,8 @@ PHP checks and optional E2E checks are described in [docs/release-process.md](do ## License - App code: AGPL-3.0-or-later (full text: [LICENSES/AGPL-3.0.txt](LICENSES/AGPL-3.0.txt)) -- Etherpad logo assets in `img/etherpad-icon-*.svg`: Apache-2.0 (see [THIRD_PARTY_NOTICES.md](THIRD_PARTY_NOTICES.md)) +- Etherpad logo assets in `img/etherpad-icon-*.svg`: Apache-2.0 (full text: [LICENSES/Apache-2.0.txt](LICENSES/Apache-2.0.txt)) ## Acknowledgements - Thanks to the Ownpad project for the groundwork, ideas, and lessons learned that inspired and shaped this plugin. -- Thanks to the Nextcloud and Etherpad communities for the underlying platforms and documentation. -- This project is not affiliated with, endorsed by, or operated by the Ownpad, Nextcloud, or Etherpad projects. diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000..ab0f064 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,12 @@ +# Security Policy + +SPDX-License-Identifier: AGPL-3.0-or-later + +## Reporting a Vulnerability + +Please report security issues privately rather than opening a public issue: + +- Email contact@etherpad.org, or +- Use GitHub's private vulnerability reporting (the **Report a vulnerability** button on the repository's **Security** tab). + +We'll acknowledge your report and keep you posted on the fix. diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md deleted file mode 100644 index f9c1a0f..0000000 --- a/THIRD_PARTY_NOTICES.md +++ /dev/null @@ -1,22 +0,0 @@ -# Third-Party Notices - -This project includes third-party assets. - -## Etherpad Logo Assets - -The logo files used by this plugin are based on Etherpad branding assets: - -- `img/etherpad-icon-black.svg` -- `img/etherpad-icon-color.svg` -- `img/etherpad-icon-white.svg` -- `img/filetypes/etherpad-nextcloud-pad.svg` - -- Upstream project: Etherpad -- Upstream repository: https://github.com/ether/etherpad-lite -- License: Apache License 2.0 - -The full Apache License 2.0 text is provided in: - -- `LICENSES/Apache-2.0.txt` - -This project is an independent integration and is not an official Etherpad product. diff --git a/img/README.md b/img/README.md index 7192453..9d47f21 100644 --- a/img/README.md +++ b/img/README.md @@ -16,7 +16,6 @@ This folder contains icon assets used by the app UI and filetype integration. - Source: Etherpad branding assets - License: Apache License 2.0 - License text: `../LICENSES/Apache-2.0.txt` - - Attribution: `../THIRD_PARTY_NOTICES.md` - `pad-debug.svg` - Local debug/development icon From d129466c9767187b18dc165c364f9508fc549ba5 Mon Sep 17 00:00:00 2001 From: Jaggob <37583151+Jaggob@users.noreply.github.com> Date: Thu, 11 Jun 2026 22:36:31 +0200 Subject: [PATCH 2/2] docs: point hardcoded repo URLs at the Etherpad org Update the website/bugs/repository URLs in appinfo/info.xml and the issue link in tests/e2e/README.md from github.com/Jaggob/... to github.com/ether/... ahead of the org transfer (repo name unchanged). --- appinfo/info.xml | 6 +++--- tests/e2e/README.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 717b9da..4e0cc46 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -11,9 +11,9 @@ John McLear EtherpadNextcloud office - https://github.com/Jaggob/etherpad-integration-for-nextcloud - https://github.com/Jaggob/etherpad-integration-for-nextcloud/issues - https://github.com/Jaggob/etherpad-integration-for-nextcloud.git + https://github.com/ether/etherpad-integration-for-nextcloud + https://github.com/ether/etherpad-integration-for-nextcloud/issues + https://github.com/ether/etherpad-integration-for-nextcloud.git diff --git a/tests/e2e/README.md b/tests/e2e/README.md index 6ace789..ac154b5 100644 --- a/tests/e2e/README.md +++ b/tests/e2e/README.md @@ -14,7 +14,7 @@ The specs are **target-agnostic** — they drive whatever Nextcloud instance `E2E_BASE_URL` points at. For local development that's easiest against an existing test instance (your own NC, or the shared test server). A reproducible Docker NC+Etherpad target for CI is a later -phase ([#112](https://github.com/Jaggob/etherpad-integration-for-nextcloud/issues/112)); +phase ([#112](https://github.com/ether/etherpad-integration-for-nextcloud/issues/112)); because the specs only depend on `E2E_BASE_URL` and the documented env vars, adding it won't require rewriting tests.