Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Use GitHub Pull Requests to propose changes, we will review and merge your chang
- Check official [vuepress documentation](https://vuepress.vuejs.org/)
- Check the [Mergin Maps Documentation Guidelines](https://merginmaps.com/docs/misc/write-docs/)

<div><img align="left" width="45" height="45" src="https://raw.githubusercontent.com/MerginMaps/docs/main/src/public/slack.svg"><a href="https://merginmaps.com/community/join">Join our community chat</a><br/>and ask questions!</div>
- [Join our community](https://community.merginmaps.com) and ask questions!

# Development

Expand All @@ -31,7 +31,7 @@ Use GitHub Pull Requests to propose changes, we will review and merge your chang
- Double check that [staging deployment](https://dev.merginmaps.com/docs) is what you want
- Create [Docs Release](https://github.com/MerginMaps/docs/releases)
- Ask sys-admin to manually deploy REDIRECTS to njinx
- Check that [live](https://merginmaps.com/docs) is what you want and announce the news on Slack
- Check that [live](https://merginmaps.com/docs) is what you want and announce the news on the community


## Dynamic server (for local development)
Expand Down
2 changes: 1 addition & 1 deletion scripts/broken-link-exceptions.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
--exclude=https://de.merginmaps.com/* --exclude=https://es.merginmaps.com/* --exclude=https://fr.merginmaps.com/* --exclude=https://it.merginmaps.com/* --exclude=https://pt.merginmaps.com/* --exclude=.*twitter.com/* --exclude=.*x.com/* --exclude=https://www.fauna-flora.org* --exclude=https://download.geofabrik.de* --exclude=https://www.linkedin.com/* --exclude=https://docs.github.com* --exclude=.*openstreetmap.org.* --exclude=.*sqlite.org.* --exclude=.*gnu.org.* --exclude=.*github.com/merginmaps/docs/edit/.* --exclude=.*libtiff.org.* --exclude=https://gis.stackexchange.com/* --exclude=https://www.stackexchange.com/* --exclude=https://www.stackoverflow.com/* --exclude=https://ocw.un-ihe.org/* --exclude=https://merginmaps.com/case-studies/* --exclude=https://merginmaps.com/support/* --exclude=https://merginmaps.com/glossary/* --exclude=https://merginmaps.com/community/join --exclude=https://merginmaps.com/blog/* --exclude=https://apps.apple.com/us/app/input/* --exclude=https://www.maplango.com* --exclude=https://apps.apple.com/* --exclude=https://www.mobilegis.at/* --exclude=https://fonts.googleapis.com* --exclude=https://fonts.gstatic.com* --exclude=https://gispro.com.au/* --exclude=http://www.mobilegis.at* --exclude=http://linkedin.com/* --exclude=https://www.verticalgeo.com/* --exclude=https://mappinggis.com/* --exclude=https://app.termly.io/* --exclude=https://www.apple.com/* --exclude=https://play.google.com/* --exclude=https://www.nginx.com/* --exclude=https://proj.org/* --exclude=https://www.burdgis.com* --exclude=https://www.docker.com* --exclude=https://www.googletagmanager.com* --exclude=https://assets-global.website-files.com --exclude=https://uploads-ssl.webflow.com --exclude=https://www.institut-agro-montpellier.fr/* --exclude=http://bad-elf.com* --exclude=https://bad-elf.com/* --exclude=https://merginmaps.com/hardware-partners --exclude=https://merginmaps.com/partners --exclude=https://merginmaps.com/use-case/* --exclude=https://www.otter.org/ --exclude=https://docs.sqlalchemy.org* --exclude=https://www.facebook.com/* --exclude=.*gdal.org/* --exclude=.*spatialised.net/* --exclude=https://cdn.prod.website-files.com/* --exclude=https://aws.amazon.com/* --exclude=https://support.apple.com/* --exclude=https://www.ordnancesurvey.co.uk/* --exclude=https://www.ardusimple.com/* --exclude=https://exiftool.org/* --exclude=https://pro.arcgis.com/* --exclude=https://www.esri.com/* --exclude=https://api.merginmaps.com/logs --exclude=https://en.wikipedia.org/wiki/* --exclude=https://www.reddit.com/* --exclude=https://github.com/MerginMaps/python-api-client/blob/634237890afd9f28f03953e5a01376b56f5abf5c/mergin/client.py#L572 --exclude=https://github.com/MerginMaps/python-api-client/blob/634237890afd9f28f03953e5a01376b56f5abf5c/mergin/client.py#L641 --exclude=https://merginmaps.com/ngo-form --exclude=https://merginmaps.com/academia-form --exclude=https://merginmaps.com/eudr-geolocation-data-collection --exclude=https://exiftool.sourceforge.net/TagNames/EXIF.html --exclude=https://emlid.com/emlid-flow/
--exclude=https://de.merginmaps.com/* --exclude=https://es.merginmaps.com/* --exclude=https://fr.merginmaps.com/* --exclude=https://it.merginmaps.com/* --exclude=https://pt.merginmaps.com/* --exclude=.*twitter.com/* --exclude=.*x.com/* --exclude=https://www.fauna-flora.org* --exclude=https://download.geofabrik.de* --exclude=https://www.linkedin.com/* --exclude=https://docs.github.com* --exclude=.*openstreetmap.org.* --exclude=.*sqlite.org.* --exclude=.*gnu.org.* --exclude=.*github.com/merginmaps/docs/edit/.* --exclude=.*libtiff.org.* --exclude=https://gis.stackexchange.com/* --exclude=https://www.stackexchange.com/* --exclude=https://www.stackoverflow.com/* --exclude=https://ocw.un-ihe.org/* --exclude=https://merginmaps.com/case-studies/* --exclude=https://merginmaps.com/support/* --exclude=https://merginmaps.com/glossary/* --exclude=https://merginmaps.com/blog/* --exclude=https://apps.apple.com/us/app/input/* --exclude=https://www.maplango.com* --exclude=https://apps.apple.com/* --exclude=https://www.mobilegis.at/* --exclude=https://fonts.googleapis.com* --exclude=https://fonts.gstatic.com* --exclude=https://gispro.com.au/* --exclude=http://www.mobilegis.at* --exclude=http://linkedin.com/* --exclude=https://www.verticalgeo.com/* --exclude=https://mappinggis.com/* --exclude=https://app.termly.io/* --exclude=https://www.apple.com/* --exclude=https://play.google.com/* --exclude=https://www.nginx.com/* --exclude=https://proj.org/* --exclude=https://www.burdgis.com* --exclude=https://www.docker.com* --exclude=https://www.googletagmanager.com* --exclude=https://assets-global.website-files.com --exclude=https://uploads-ssl.webflow.com --exclude=https://www.institut-agro-montpellier.fr/* --exclude=http://bad-elf.com* --exclude=https://bad-elf.com/* --exclude=https://merginmaps.com/hardware-partners --exclude=https://merginmaps.com/partners --exclude=https://merginmaps.com/use-case/* --exclude=https://www.otter.org/ --exclude=https://docs.sqlalchemy.org* --exclude=https://www.facebook.com/* --exclude=.*gdal.org/* --exclude=.*spatialised.net/* --exclude=https://cdn.prod.website-files.com/* --exclude=https://aws.amazon.com/* --exclude=https://support.apple.com/* --exclude=https://www.ordnancesurvey.co.uk/* --exclude=https://www.ardusimple.com/* --exclude=https://exiftool.org/* --exclude=https://pro.arcgis.com/* --exclude=https://www.esri.com/* --exclude=https://api.merginmaps.com/logs --exclude=https://en.wikipedia.org/wiki/* --exclude=https://www.reddit.com/* --exclude=https://github.com/MerginMaps/python-api-client/blob/634237890afd9f28f03953e5a01376b56f5abf5c/mergin/client.py#L572 --exclude=https://github.com/MerginMaps/python-api-client/blob/634237890afd9f28f03953e5a01376b56f5abf5c/mergin/client.py#L641 --exclude=https://merginmaps.com/ngo-form --exclude=https://merginmaps.com/academia-form --exclude=https://merginmaps.com/eudr-geolocation-data-collection --exclude=https://exiftool.sourceforge.net/TagNames/EXIF.html --exclude=https://emlid.com/emlid-flow/
25 changes: 4 additions & 21 deletions src/.vitepress/components/CommunityJoin.vue
Original file line number Diff line number Diff line change
@@ -1,34 +1,17 @@
<template>
<div>
<img :src="withBase('/slack.svg')" alt="Join Community">
<span>
<a href='https://merginmaps.com/community/join' target="_blank" rel="noopener noreferrer">
Join our community chat
<a href='https://community.merginmaps.com' target="_blank" rel="noopener noreferrer">
Join our community
</a>
and ask questions!
</span>
</div>
</template>

<script lang="ts" setup>
import { withBase } from 'vitepress';
</script>

<style scoped>
div {
margin-left: 20px;
margin-left: 0;
width: 100%;
display: flex;
}

img {
border: none;
height: 48px;
}

span {
margin-top: 15px;
margin-left: 10px;
}

</style>
</style>
2 changes: 1 addition & 1 deletion src/.vitepress/components/WishListLink.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<a :href="`https://wishlist.merginmaps.com/${id}`" target="_blank" class="nospellcheck">
<a :href="`https://community.merginmaps.com/b/wishlist/${id}`" target="_blank" class="nospellcheck">
<span v-if="desc" v-html="desc"></span>
<span v-else class="nospellcheck">wishlist</span>
</a>
Expand Down
5 changes: 4 additions & 1 deletion src/.vitepress/theme/components/PageFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<div class="page-footer__center">
<div>
<SocialIconsLink icon="bluesky" class="page-footer__icon" />
<SocialIconsLink icon="slack" class="page-footer__icon" />
<SocialIconsLink icon="linkedin" class="page-footer__icon" />
<SocialIconsLink icon="facebook" class="page-footer__icon" />
<SocialIconsLink icon="github" class="page-footer__icon" />
Expand All @@ -49,6 +48,10 @@
target="__blank"
>Terms of service</a
>
&#x2022;
<a href="https://community.merginmaps.com" target="__blank"
>Community</a
>
</div>
</div>
</div>
Expand Down
3 changes: 0 additions & 3 deletions src/.vitepress/theme/components/SocialIconsLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { defineComponent } from "vue";

import githubSvg from "/socials/github.svg?raw";
import linkedinSvg from "/socials/linkedin.svg?raw";
import slackSvg from "/socials/slack.svg?raw";
import blueskySvg from "/socials/bluesky.svg?raw";
import facebookSvg from "/socials/facebook.svg?raw";
import youtubeSvg from "/socials/youtube.svg?raw";
Expand All @@ -23,7 +22,6 @@ export default defineComponent({
github: "https://github.com/MerginMaps",
linkedin: "https://www.linkedin.com/company/mergin-maps/",
bluesky: "https://bsky.app/profile/merginmaps.bsky.social",
slack: "https://merginmaps.com/community/join",
facebook: "https://www.facebook.com/profile.php?id=61564969364057",
youtube: "https://www.youtube.com/@merginmaps",
mastodon: "https://fosstodon.org/@merginmaps",
Expand All @@ -35,7 +33,6 @@ export default defineComponent({
const icons = {
github: githubSvg,
linkedin: linkedinSvg,
slack: slackSvg,
facebook: facebookSvg,
bluesky: blueskySvg,
youtube: youtubeSvg,
Expand Down
2 changes: 1 addition & 1 deletion src/manage/webmaps-applications/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,4 @@ Tip: `<map_link>` is generated only once the map is made public ("Share map" in

```

We are keen to see what you've built! Please do not hesitate to share your results with us on our [community](https://merginmaps.com/community/join)!
We are keen to see what you've built! Please do not hesitate to share your results with us on our [community](https://community.merginmaps.com)!
2 changes: 1 addition & 1 deletion src/misc/troubleshoot/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Please see the <MainDomainNameLink id="support" desc="support packages"/> availa
If you have an active <MainPlatformNameLink /> subscription or during the trial period, we also offer free fair-use support on <MerginMapsEmail id="support" />.

### Community support
- Join our [community chat on Slack](https://merginmaps.com/community/join) and ask questions!
- Join our [community](https://community.merginmaps.com) and ask questions!
- See [GIS Stack Exchange](https://gis.stackexchange.com/questions/tagged/mergin-maps) with "<NoSpellcheck id="mergin-maps" />" tag to ask questions and see other users' answers.
- See <QGISHelp ver="latest" link="user_manual/index.html" text="QGIS documentation" /> for QGIS Desktop related problems.

Expand Down
6 changes: 3 additions & 3 deletions src/misc/write-docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: Mergin Maps documentation system overview of writing new content, u

# Write Documentation

Thank you for your interest in helping out with writing [<MainPlatformName /> Documentation](https://merginmaps.com/docs). The documentation framework is based on [VitePress](https://vitepress.dev/). We welcome any contributions as <GitHubRepo id="MerginMaps/docs/pulls" desc="GitHub Pull Requests" />. If you are unsure how to contribute or what tasks are best to start with, join us on our [community chat](https://merginmaps.com/community/join) and ask in the `#dev` channel. We are happy to get you up to speed!
Thank you for your interest in helping out with writing [<MainPlatformName /> Documentation](https://merginmaps.com/docs). The documentation framework is based on [VitePress](https://vitepress.dev/). We welcome any contributions as <GitHubRepo id="MerginMaps/docs/pulls" desc="GitHub Pull Requests" />. If you are unsure how to contribute or what tasks are best to start with, join us on our [community](https://community.merginmaps.com) and ask. We are happy to get you up to speed!

The version of the documentation you see on [<MainPlatformName /> Documentation](https://merginmaps.com/docs) is the <GitHubRepo id="MerginMaps/docs/tags" desc="latest tagged release" /> on the main branch. The latest commit on the main branch can be seen on [<MainPlatformName /> Staging Documentation](https://dev.merginmaps.com/docs).

Expand All @@ -18,7 +18,7 @@ If you are a (web) *developer*, you can skip all and just look at <GitHubRepo id

Otherwise, it is best to run the local development on your machine. The similar steps as described can be done on (almost) any operation system with slight modifications (e.g. using `brew` or `apt` on macOS or Linux for installation).

If you are not a part of the <MainPlatformName /> core documentation team, you will need to work with a [fork](https://docs.github.com/en/get-started/quickstart/fork-a-repo). Follow the instructions in the section [When fork is needed](#when-fork-is-needed). We are happy to include more people into the team, so if you consider writing more documentation, let us know on our [community chat](https://merginmaps.com/community/join).
If you are not a part of the <MainPlatformName /> core documentation team, you will need to work with a [fork](https://docs.github.com/en/get-started/quickstart/fork-a-repo). Follow the instructions in the section [When fork is needed](#when-fork-is-needed). We are happy to include more people into the team, so if you consider writing more documentation, let us know on our [community](https://community.merginmaps.com).

### Prepare local repository

Expand Down Expand Up @@ -78,7 +78,7 @@ Now go to <GitHubRepo id="MerginMaps/docs" desc="GitHub" /> and create a pull re

Check the automatic tests in the pull requests for [spellcheck](#spellcheck), [Markdown](#using-markdown), broken links or [redirects](#redirects) and, if needed, fix the issues in your code.

To ensure your pull request will be reviewed and merged, it is nice to ping the <MainPlatformName /> docs team on the [community chat](https://merginmaps.com/community/join) in the `#dev` channel.
To ensure your pull request will be reviewed and merged, it is nice to ping the <MainPlatformName /> docs team on the [community](https://community.merginmaps.com).

### When fork is needed
::: warning
Expand Down
17 changes: 0 additions & 17 deletions src/public/slack.svg

This file was deleted.

6 changes: 0 additions & 6 deletions src/public/socials/slack.svg

This file was deleted.

Loading