diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index eff578342..2b2b633f4 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,4 +1 @@ -github: organicmaps -liberapay: OrganicMaps -open_collective: organicmaps -custom: ["https://organicmaps.app/donate/", "https://donate.organicmaps.app/"] +open_collective: comaps diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 0c6c0979a..b0eaa8c7d 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -1,6 +1,6 @@ --- name: Bug Report -about: Describe your issue in detail to help us improve Organic Maps +about: Describe your issue in detail to help us improve CoMaps title: '' labels: '' assignees: '' @@ -30,7 +30,7 @@ If applicable, add screenshots or screen recordings to help explain your problem **System information:** - Operating system and its version: [iOS 12, Android 10, Ubuntu 22, MacOS Big Sur, etc.] - - Organic Maps version: [you can find it by tapping the button with the green Organic Maps logo] + - CoMaps version: [you can find it by tapping the button with the CoMaps logo] - Device Model: [e.g. iPhone 6, Samsung S22] diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 5f5eedf70..5cec66533 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,11 +1,8 @@ blank_issues_enabled: true contact_links: - - name: Discussions - url: https://github.com/organicmaps/organicmaps/discussions - about: Discuss the usage of Organic Maps, ask questions, or talk about ideas that aren't yet actionable. - name: Translations - url: https://github.com/organicmaps/organicmaps/blob/master/docs/TRANSLATIONS.md - about: Translate Organic Maps into your language + url: https://codeberg.org/comaps/comaps/blob/master/docs/TRANSLATIONS.md + about: Translate CoMaps into your language - name: News - url: https://organicmaps.app/news/ + url: https://comaps.app/news/ about: Check the latest project news diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 0cf1e1438..3cd87513d 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -1,6 +1,6 @@ --- name: Feature Request -about: Suggest an idea for Organic Maps +about: Suggest an idea for CoMaps title: '' labels: [] assignees: '' @@ -15,11 +15,11 @@ I'm always frustrated when [...] **Describe the ideal solution** -A clear and concise description of what you want to see in Organic Maps. +A clear and concise description of what you want to see in CoMaps. **Describe alternatives you have considered** -- How do you solve this issue now with Organic Maps or other apps? +- How do you solve this issue now with CoMaps or other apps? - Attach any examples, screenshots, or screen recordings from other apps that help us to better understand the idea. diff --git a/README.md b/README.md index e58c7ff9e..e0e6fe9c9 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,15 @@ -
+ +

CoMaps

-[Organic Maps](https://organicmaps.app) is a free Android & iOS offline maps app for travellers, tourists, drivers, hikers, and cyclists. -It uses crowd-sourced [OpenStreetMap](https://www.openstreetmap.org) data and is developed with love by the creators of **MapsWithMe** (later renamed to **Maps.Me**) and by our community. -No ads, no tracking, no data collection, no crapware. Your [donations](https://organicmaps.app/donate/) and positive reviews motivate and inspire us, thanks ❤️! +[CoMaps](https://comaps.app) is a free Android & iOS offline maps app for travellers, tourists, drivers, hikers, and cyclists. +It uses crowd-sourced [OpenStreetMap](https://www.openstreetmap.org) data, and is developed with love s developed with love by our community and former **Organic Maps** contributors (Forked from **Maps.Me**). +No ads, no tracking, no data collection, no crapware. Your [donations](https://comaps.app/donate/) and positive reviews motivate and inspire us, thanks ❤️! -[App Store](https://apps.apple.com/app/organic-maps/id1567437057) -[Google Play](https://play.google.com/store/apps/details?id=app.organicmaps) -[AppGallery](https://appgallery.huawei.com/#/app/C104325611) -[Obtainium](https://github.com/organicmaps/organicmaps/wiki/Installing-Organic-Maps-from-GitHub-using-Obtainium) -[F-Droid](https://f-droid.org/en/packages/app.organicmaps/) +[App Store](https://apps.apple.com/app/comaps/id1567437057) +[Google Play](https://play.google.com/store/apps/details?id=app.comaps) +[F-Droid](https://f-droid.org/en/packages/app.comaps/)

@@ -22,7 +20,7 @@ No ads, no tracking, no data collection, no crapware. Your [donations](https://o ## Features -Organic Maps is the ultimate companion app for travellers, tourists, hikers, and cyclists: +CoMaps is the ultimate companion app for travellers, tourists, hikers, and cyclists: - Detailed offline maps with places that don't exist on other maps, thanks to [OpenStreetMap](https://openstreetmap.org) - Cycling routes, hiking trails, and walking paths @@ -33,16 +31,15 @@ Organic Maps is the ultimate companion app for travellers, tourists, hikers, and - Dark Mode to protect your eyes - Countries and regions don't take a lot of space - Free and open-source +- Developed by a passionate community -## Why Organic? - -Organic Maps is pure and organic, made with love: +## Why CoMaps? - Respects your privacy - Saves your battery - No unexpected mobile data charges -Organic Maps is free from trackers and other bad stuff: +CoMaps is free from trackers and other bad stuff: - No ads - No tracking @@ -53,42 +50,36 @@ Organic Maps is free from trackers and other bad stuff: - No noisy email spam - No push notifications - No crapware -- ~~No pesticides~~ Purely organic! -The Android application is verified by the Exodus Privacy Project: +
-Organic Maps doesn't request excessive permissions to spy on you: +CoMaps doesn't request excessive permissions to spy on you. -

- - -

+At CoMaps, we believe that privacy is a fundamental human right: -At Organic Maps, we believe that privacy is a fundamental human right: - -- Organic Maps is an indie community-driven open-source project +- CoMaps is an indie community-driven open-source project - We protect your privacy from Big Tech's prying eyes - Stay safe no matter where you are Reject surveillance - embrace your freedom. -[**Give Organic Maps a try!**](#install) +[**Give CoMaps a try!**](#install) ## Who is paying for the development? -The app is free for everyone, so we rely on donations. Please donate at [organicmaps.app/donate](https://organicmaps.app/donate) to support us! +The app is free for everyone, so we rely on donations. Please donate at [comaps.app/donate](https://comaps.app/donate) to support us! -Please consider [donating](https://organicmaps.app/donate) if you want to see this open-source project thriving, not dying. There are [other ways how to support the project](#contributing). No coding skills required. +Please consider [donating](https://comaps.app/donate) if you want to see this open-source project thriving, not dying. There are [other ways how to support the project](#contributing). No coding skills required. ## Copyrights @@ -107,29 +98,19 @@ Check the [Governance repository](https://codeberg.org/comaps/governance). ## Contributing If you want to build the project, check [docs/INSTALL.md](docs/INSTALL.md). If you want to help the project, -see [docs/CONTRIBUTING.md](docs/CONTRIBUTING.md). You can [help in many ways](https://organicmaps.app/support-us/), the ability to code is not necessary. - -## Beta - -Please join our beta program, suggest your features, and report bugs: - -- [iOS Beta (TestFlight)](https://testflight.apple.com/join/lrKCl08I) -- [Android Beta (Firebase)](https://appdistribution.firebase.dev/i/2f0fee463107b137) +see [docs/CONTRIBUTING.md](docs/CONTRIBUTING.md). You can [help in many ways](https://comaps.app/support-us/), the ability to code is not necessary. ## Feedback -- **Rate us on the [App Store](https://apps.apple.com/app/organic-maps/id1567437057) -and [Google Play](https://play.google.com/store/apps/details?id=app.organicmaps)**. +- **Rate us on the [App Store](https://apps.apple.com/app/comaps/id1567437057) +and [Google Play](https://play.google.com/store/apps/details?id=app.comaps)**. - **Star us on Codeberg**. -- Report bugs or issues to [the issue tracker](https://git.omaps.dev/organicmaps/organicmaps/issues). +- Report bugs or issues to [the issue tracker](https://codeberg.org/comaps/comaps/issues). - Subscribe to our [Telegram Channel](https://t.me/CoMapsApp) or to the [[matrix] space](https://matrix.to/#/#comaps:matrix.org) for updates. - Join our [Telegram Chat](https://t.me/CoMaps_EN) to discuss with other users. - Присоединяйтесь к нашей [русскоязычной группе в Telegram](https://t.me/CoMaps_RU) для обратной связи и помощи. -- Contact us by [email](mailto:hello@organicmaps.app). +- Contact us by [email](mailto:hello@comaps.app). - Follow our updates in -[Mastodon](https://fosstodon.org/@CoMaps), -[Facebook](https://facebook.com/OrganicMaps), -[X (Twitter)](https://x.com/OrganicMapsApp), -[Instagram](https://instagram.com/organicmaps.app/). +[Mastodon](https://fosstodon.org/@CoMaps). -The Organic Maps community abides by the CNCF [code of conduct](https://github.com/organicmaps/organicmaps/blob/master/docs/CODE_OF_CONDUCT.md). +The CoMaps community abides by the CNCF [code of conduct](docs/CODE_OF_CONDUCT.md). diff --git a/docs/CODE_OF_CONDUCT.md b/docs/CODE_OF_CONDUCT.md index 039d0a887..a0418065d 100644 --- a/docs/CODE_OF_CONDUCT.md +++ b/docs/CODE_OF_CONDUCT.md @@ -11,4 +11,4 @@ Here is an excerpt: > and other activities._ Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported via . +reported via . diff --git a/docs/COMMIT_MESSAGES.md b/docs/COMMIT_MESSAGES.md index f719b9d8a..9fe74da69 100644 --- a/docs/COMMIT_MESSAGES.md +++ b/docs/COMMIT_MESSAGES.md @@ -1,6 +1,6 @@ # How to write a commit message -Any commit needs a helpful message. Mind the following guidelines when committing to any of Organic Maps repositories at GitHub. +Any commit needs a helpful message. Mind the following guidelines when committing to any of CoMaps repositories at Codeberg. 1. Separate subject from body with a blank line. 2. Limit the subject line to **72 characters**.