Skip to content

Commit b7a569a

Browse files
authored
Merge pull request #652 from MerginMaps/iss_638-supported-server-versions
supported server version for mobile and plugin
2 parents 5954cf0 + 0162af0 commit b7a569a

File tree

4 files changed

+20
-6
lines changed

4 files changed

+20
-6
lines changed

src/.vitepress/components/CommunityPlatformNameLink.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<a :href="`https://merginmaps.com/pricing-for-ce-and-ee`" target="_blank" class="nospellcheck">
2+
<a :href="`https://github.com/MerginMaps`" target="_blank" class="nospellcheck">
33
<span v-if="desc" v-html="desc"></span>
44
<span v-else class="nospellcheck">Mergin Maps CE</span>
55
</a>

src/.vitepress/components/EnterprisePlatformNameLink.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<a :href="`https://merginmaps.com/pricing-for-ce-and-ee`" target="_blank" class="nospellcheck">
2+
<a :href="`https://merginmaps.com/pricing`" target="_blank" class="nospellcheck">
33
<span v-if="desc" v-html="desc"></span>
44
<span v-else class="nospellcheck">Mergin Maps EE</span>
55
</a>

src/server/index.md

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,16 @@
22

33
SaaS <MainPlatformName /> service is a web platform for storage and synchronisation of data between mobile devices, <MainPlatformNameLink /> service and QGIS Desktop.
44

5-
There is also **<MainPlatformName /> Community Edition** (<CommunityPlatformNameLink />) that is licensed as open source software. The source code for <CommunityPlatformName /> can be modified and used for custom deployments. You can contribute your code to <GitHubRepo id="MerginMaps/server" />.
5+
There are also custom server deployments:
6+
[[toc]]
7+
8+
You can read more about them in our blog [<MainPlatformName /> Community and Enterprise Editions](https://merginmaps.com/blog/introducing-mergin-maps-community-and-enterprise-editions).
9+
10+
## Mergin Maps CE
11+
12+
**<MainPlatformName /> Community Edition** (<CommunityPlatformNameLink />) is licensed as open source software. The source code for <CommunityPlatformName /> can be modified and used for custom deployments. You can contribute your code to <GitHubRepo id="MerginMaps/server" />.
13+
14+
## Mergin Maps EE
615

716
**Mergin Maps Enterprise Edition** (<EnterprisePlatformNameLink />) provides an enterprise environment with additional features such as multiple [workspaces](../manage/workspaces/) or [webmaps](../manage/dashboard-maps/). There are three types of <EnterprisePlatformNameLink />:
817
- *Cloud* that uses <AppDomainNameLink /> (the same server as is used by other <MainPlatformName /> users)
@@ -11,8 +20,8 @@ There is also **<MainPlatformName /> Community Edition** (<CommunityPlatformName
1120

1221
This section of documentation is relevant for the **On-Premises <EnterprisePlatformName />** and **<CommunityPlatformName />**.
1322

14-
:::tip
15-
**Interested in using <EnterprisePlatformName />?** Information about <EnterprisePlatformName />, its features and pricing can be found on our [website](https://merginmaps.com/pricing-for-ce-and-ee). Contact our <MerginMapsEmail id="sales" desc="sales team" /> for more details.
23+
:::tip Interested in using <EnterprisePlatformName />?
24+
<EnterprisePlatformName /> features and pricing can be found on our [website](https://merginmaps.com/pricing).
1625

17-
You can read more about <CommunityPlatformName /> and <EnterprisePlatformName /> in our blog [<MainPlatformName /> Community and Enterprise Editions](https://merginmaps.com/blog/introducing-mergin-maps-community-and-enterprise-editions).
26+
Contact our <MerginMapsEmail id="sales" desc="sales team" /> for more details.
1827
:::

src/server/plugin-mobile-app/index.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ There is a default server <AppDomainNameLink /> which is configured in <QGISPlug
55

66
To do this, we need to set up the custom server in the [plugin](#custom-server-configuration-in-mergin-maps-qgis-plugin) as well as in the [mobile app](#custom-server-configuration-in-mergin-maps-mobile-app).
77

8+
::: warning Server version compatibility
9+
Please note that the <MobileAppName /> and <QGISPluginName /> require the server version 2023.2 or higher.
10+
11+
See how to [upgrade](../upgrade/) your server if needed.
12+
:::
813

914
## Custom server configuration in Mergin Maps QGIS plugin
1015
To configure a custom <MainPlatformName /> server in the <QGISPluginNameShort />:

0 commit comments

Comments
 (0)