From 9519f5135e7acfc4e53d9ed072494ae746486f3f Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Date: Sat, 3 May 2025 09:20:10 +0200 Subject: [PATCH] Continue rebranding of the project Signed-off-by: jeanbaptisteC --- .forgejo/CODEOWNERS | 4 ++-- .forgejo/workflows/android-beta.yaml | 4 ++-- .forgejo/workflows/android-check.yaml | 4 ++-- .forgejo/workflows/android-release.yaml | 4 ++-- .forgejo/workflows/appstream-check.yaml | 2 +- .forgejo/workflows/desktop-file-check.yaml | 2 +- .forgejo/workflows/ios-beta.yaml | 4 ++-- .forgejo/workflows/ios-check-metadata.yaml | 2 +- .forgejo/workflows/ios-check.yaml | 4 ++-- .forgejo/workflows/macos-check.yaml | 4 ++-- CONTRIBUTORS | 5 +++++ data/faq.html | 10 +++++----- docs/COMMIT_MESSAGES.md | 2 +- docs/COMMUNICATION.md | 10 +++------- docs/CONTRIBUTING.md | 22 ++++++++++------------ docs/CREDENTIALS.md | 2 +- docs/DCO.md | 2 +- gcovr.cfg | 2 +- package.json | 4 ++-- 19 files changed, 46 insertions(+), 47 deletions(-) diff --git a/.forgejo/CODEOWNERS b/.forgejo/CODEOWNERS index a831f18e4..5be18ad90 100644 --- a/.forgejo/CODEOWNERS +++ b/.forgejo/CODEOWNERS @@ -49,13 +49,13 @@ /docs/STYLES.md /tools/kothic/ @organicmaps/styles # DevOps. -/.github/workflows @organicmaps/devops +/.forgejo/workflows @organicmaps/devops /android/*gradle* @organicmaps/devops /docs/RELEASE_MANAGEMENT.md @organicmaps/devops /xcode/fastlane/ @organicmaps/devops # Growth. README.md @organicmaps/growth -/.github/FUNDING.yml @organicmaps/growth +/.forgejo/FUNDING.yml @organicmaps/growth /android/app/src/fdroid/play/ @organicmaps/growth /android/app/src/google/play/ @organicmaps/growth /iphone/metadata/ @organicmaps/growth diff --git a/.forgejo/workflows/android-beta.yaml b/.forgejo/workflows/android-beta.yaml index ae4b3ef48..016c0fb27 100644 --- a/.forgejo/workflows/android-beta.yaml +++ b/.forgejo/workflows/android-beta.yaml @@ -6,8 +6,8 @@ on: - master paths-ignore: - .gitignore - - .github/** - - '!.github/workflows/android-beta.yaml' # Run check on self change + - .forgejo/** + - '!.forgejo/workflows/android-beta.yaml' # Run check on self change - '**/*_tests/**' - '**/CMakeLists.txt' - CONTRIBUTORS diff --git a/.forgejo/workflows/android-check.yaml b/.forgejo/workflows/android-check.yaml index dcff58bab..be87b3cd7 100644 --- a/.forgejo/workflows/android-check.yaml +++ b/.forgejo/workflows/android-check.yaml @@ -7,8 +7,8 @@ on: pull_request: paths-ignore: - .gitignore - - .github/** - - '!.github/workflows/android-check.yaml' # Run check on self change + - .forgejo/** + - '!.forgejo/workflows/android-check.yaml' # Run check on self change - '**/*_tests/**' - CONTRIBUTORS - LICENSE diff --git a/.forgejo/workflows/android-release.yaml b/.forgejo/workflows/android-release.yaml index fe2a2c999..09e42cff9 100644 --- a/.forgejo/workflows/android-release.yaml +++ b/.forgejo/workflows/android-release.yaml @@ -156,7 +156,7 @@ jobs: cat ${{ env.RELEASE_NOTES }} echo "" echo "See [a detailed announce](https://organicmaps.app/news/) on our website when app updates are published in all stores." - echo "You can get automatic app updates from GitHub [using Obtainium](https://github.com/organicmaps/organicmaps/wiki/Installing-Organic-Maps-from-GitHub-using-Obtainium)." + echo "You can get automatic app updates from Codeberg [using Obtainium](https://codeberg.com/comaps/comaps/wiki/Installing-Organic-Maps-from-GitHub-using-Obtainium)." echo "" echo "sha256sum:" echo -e '\n```' @@ -164,7 +164,7 @@ jobs: echo -e '\n```' } > ${{ runner.temp }}/release-notes.txt - - name: Upload universal APK to GitHub + - name: Upload universal APK to Codeberg uses: softprops/action-gh-release@v1 if: ${{ matrix.flavor == 'web' }} with: diff --git a/.forgejo/workflows/appstream-check.yaml b/.forgejo/workflows/appstream-check.yaml index 04ab42d42..212c5c43f 100644 --- a/.forgejo/workflows/appstream-check.yaml +++ b/.forgejo/workflows/appstream-check.yaml @@ -4,7 +4,7 @@ on: pull_request: paths: - packaging/app.organicmaps.desktop.metainfo.xml - - .github/workflows/appstream-check.yaml # Run check on self change + - .forgejo/workflows/appstream-check.yaml # Run check on self change jobs: validate-appstream: diff --git a/.forgejo/workflows/desktop-file-check.yaml b/.forgejo/workflows/desktop-file-check.yaml index 2b4a3e29c..006ef8981 100644 --- a/.forgejo/workflows/desktop-file-check.yaml +++ b/.forgejo/workflows/desktop-file-check.yaml @@ -4,7 +4,7 @@ on: pull_request: paths: - qt/res/app.organicmaps.desktop.desktop - - .github/workflows/desktop-file-check.yaml # Run check on self change + - .forgejo/workflows/desktop-file-check.yaml # Run check on self change jobs: validate-desktop-file: diff --git a/.forgejo/workflows/ios-beta.yaml b/.forgejo/workflows/ios-beta.yaml index 5699ce0e3..2decec81f 100644 --- a/.forgejo/workflows/ios-beta.yaml +++ b/.forgejo/workflows/ios-beta.yaml @@ -6,8 +6,8 @@ on: - master paths-ignore: - .gitignore - - .github/** - - '!.github/workflows/ios-beta.yaml' # Run check on self change + - .forgejo/** + - '!.forgejo/workflows/ios-beta.yaml' # Run check on self change - '**/*_tests/**' - '**/CMakeLists.txt' - CONTRIBUTORS diff --git a/.forgejo/workflows/ios-check-metadata.yaml b/.forgejo/workflows/ios-check-metadata.yaml index ad69ccefa..768839292 100644 --- a/.forgejo/workflows/ios-check-metadata.yaml +++ b/.forgejo/workflows/ios-check-metadata.yaml @@ -3,7 +3,7 @@ on: workflow_dispatch: # Manual trigger pull_request: paths: - - .github/workflows/ios-check-metadata.yaml # Run check on self change + - .forgejo/workflows/ios-check-metadata.yaml # Run check on self change - iphone/metadata/** - tools/python/check_store_metadata.py diff --git a/.forgejo/workflows/ios-check.yaml b/.forgejo/workflows/ios-check.yaml index db9af68c1..608272c19 100644 --- a/.forgejo/workflows/ios-check.yaml +++ b/.forgejo/workflows/ios-check.yaml @@ -7,8 +7,8 @@ on: pull_request: paths-ignore: - .gitignore - - .github/** - - '!.github/workflows/ios-check.yaml' # Run check on self change + - .forgejo/** + - '!.forgejo/workflows/ios-check.yaml' # Run check on self change - '**/*_tests/**' - '**/CMakeLists.txt' - CONTRIBUTORS diff --git a/.forgejo/workflows/macos-check.yaml b/.forgejo/workflows/macos-check.yaml index 3d6c5232e..6afdde57d 100644 --- a/.forgejo/workflows/macos-check.yaml +++ b/.forgejo/workflows/macos-check.yaml @@ -7,8 +7,8 @@ on: pull_request: paths-ignore: - .gitignore - - .github/** - - '!.github/workflows/macos-check.yaml' # Run check on self change + - .forgejo/** + - '!.forgejo/workflows/macos-check.yaml' # Run check on self change - CONTRIBUTORS - LICENSE - NOTICE diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 4c177e7ed..bc434e7fe 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2,6 +2,11 @@ This file contains a list of people who have contributed to this project. Its not neccesarily comprehensive. Feel free to add yourself here along with your first contribution! +-------------------------------------------------------------------------------- +CoMaps contributors: +(in alphabetic order) +-------------------------------------------------------------------------------- + -------------------------------------------------------------------------------- Organic Maps (formerly OMaps) contributors: (in alphabetic order) diff --git a/data/faq.html b/data/faq.html index 5422a4388..f97ef3e29 100644 --- a/data/faq.html +++ b/data/faq.html @@ -1048,7 +1048,7 @@ CoMaps 的地理位置数据共享应该是启用的。

  • Format SD card and re-download maps.
  • Buy a new SD card (recommended)
    • -

    If the app still crashes, please check our GitHub for similar issues, and contact us and provide the following:

    +

    If the app still crashes, please check our Codeberg for similar issues, and contact us and provide the following: