Skip to content

Commit fee2fa9

Browse files
subscriptions update (#309)
* subscriptions update * link fix * redirects * Update src/manage/workspaces/index.md --------- Co-authored-by: Tomas Mizera <[email protected]>
1 parent 5c19398 commit fee2fa9

29 files changed

+123
-76
lines changed

REDIRECTS

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ https://help.cloudmergin.com/quick-start.html N/A - covered by non-html version
3636
https://help.cloudmergin.com/registration https://merginmaps.com/docs/setup/sign-up-to-mergin-maps/
3737
https://help.cloudmergin.com/registration.html N/A - covered by non-html version
3838
https://help.cloudmergin.com/sharing-project https://merginmaps.com/docs/manage/project-advanced/
39-
https://help.cloudmergin.com/subscriptions https://merginmaps.com/docs/setup/subscriptions/
39+
https://help.cloudmergin.com/subscriptions https://merginmaps.com/docs/manage/subscriptions/
4040
https://help.cloudmergin.com/support https://merginmaps.com/docs/misc/troubleshoot/
4141
https://help.cloudmergin.com/tutorials/data-sync https://merginmaps.com/docs/tutorials/creating-a-project-in-qgis/
4242
https://help.cloudmergin.com/tutorials/data-sync.html N/A - covered by non-html version
@@ -140,7 +140,7 @@ https://merginmaps.com/docs/howto/manage/web/dashboard/ https://merginmaps.com/d
140140
https://merginmaps.com/docs/howto/manage/web/project-advanced/ https://merginmaps.com/docs/manage/project-advanced/
141141
https://merginmaps.com/docs/howto/manage/web/project-details/ https://merginmaps.com/docs/manage/project-details/
142142
https://merginmaps.com/docs/howto/manage/web/register/ https://merginmaps.com/docs/setup/sign-up-to-mergin-maps/
143-
https://merginmaps.com/docs/howto/manage/web/subscriptions/ https://merginmaps.com/docs/setup/subscriptions/
143+
https://merginmaps.com/docs/howto/manage/web/subscriptions/ https://merginmaps.com/docs/manage/subscriptions/
144144
https://merginmaps.com/docs/howto/manage/web/web-create-project/ https://merginmaps.com/docs/manage/create-project/
145145
https://merginmaps.com/docs/howto/manage/web/working-with-organisations/ https://merginmaps.com/docs/setup/working-with-organisations/
146146
https://merginmaps.com/docs/howto/mergince/ https://merginmaps.com/docs/dev/mergince/
@@ -166,3 +166,4 @@ https://merginmaps.com/docs/manage/data_sync/ https://merginmaps.com/docs/manage
166166
https://merginmaps.com/docs/reference/licensing/ https://merginmaps.com/docs/misc/licensing/
167167
https://merginmaps.com/docs/reference/privacy/ https://merginmaps.com/docs/misc/privacy/
168168
https://merginmaps.com/docs/gis/enable_browsing/ https://merginmaps.com/docs/gis/search_data/
169+
https://merginmaps.com/docs/setup/subscriptions/ https://merginmaps.com/docs/manage/subscriptions/

src/.vuepress/sidebar/en.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ module.exports = {
2323
'/setup/sign-up-to-mergin-maps/',
2424
'/setup/install-qgis/',
2525
'/setup/install-mergin-maps-plugin-for-qgis/',
26-
'/setup/subscriptions/'
2726
]
2827
},
2928

@@ -33,6 +32,7 @@ module.exports = {
3332
sidebarDepth: 0, // optional, defaults to 1
3433
children: [
3534
'/manage/workspaces/',
35+
'/manage/subscriptions/',
3636
'/manage/permissions',
3737
'/manage/synchronisation',
3838
'/manage/project/',

src/dev/dbsync.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# PostgreSQL DB Sync
22

3-
DB Sync is a tool that takes care of two-way synchronisation between <MainPlatformNameLink /> and PostGIS databases. The synchronisation works both ways: changes made in a PostGIS database are automatically pushed to a configured <MainPlatformName /> project and changes made in a GeoPackage in the <MainPlatformName /> project are pushed to the PostGIS database.
3+
**DB Sync** is a tool that takes care of two-way synchronisation between <MainPlatformNameLink /> and PostGIS databases. The synchronisation works both ways: changes made in a PostGIS database are automatically pushed to a configured <MainPlatformName /> project and changes made in a GeoPackage in the <MainPlatformName /> project are pushed to the PostGIS database.
44

55
**Interested in using DB Sync?** Go to <GitHubRepo id="MerginMaps/mergin-db-sync" /> repository for the source code and more details. Here, you will also find the Quick start guide that will show you how to set up one way synchronisation between your PostGIS database and a new <MainPlatformName /> project.
6+
7+
:::tip Usage details
8+
DB Sync can be used with *Team*, *Academia* and *Non-profit* <MainDomainNameLink id="pricing" desc="subscription plans"/>, as well as in [<CommunityPlatformName />](./mergince/) and [<EnterprisePlatformName />](./merginmaps-ee/).
9+
10+
It is not available in *Individual* or *Professional* subscriptions.
11+
12+
You can try DB Sync for free during the trial period.
13+
:::

src/dev/integration.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
# Integrate Mergin Maps
22
[[toc]]
33

4-
<MainPlatformNameLink /> is an open platform that aims to be developer friendly and it has been designed to allow easy integration with other software.
4+
Do you want to integrate <MainPlatformNameLink />? <MainPlatformName /> is an open platform that aims to be developer friendly and it has been designed to allow easy integration with other software.
5+
6+
:::tip Usage details
7+
Python client module and C++ standalone client can be used with *Team*, *Academia* and *Non-profit* <MainDomainNameLink id="pricing" desc="subscription plans"/>, as well as in [<CommunityPlatformName />](./mergince/) and [<EnterprisePlatformName />](./merginmaps-ee/).
8+
9+
They are not available in *Individual* or *Professional* subscriptions.
10+
11+
You can try these tools for free during the trial period.
12+
:::
513

614
## Python client module
715
The Python client module is the easiest way to programmatically use <MainPlatformNameLink />. You can use Python API or a command-line tool to easily work with <MainPlatformName /> projects, such as to get project status, push and pull changes, or to download, create and delete projects.

src/dev/media-sync/index.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
# Media Sync
22
[[toc]]
33

4-
Media Sync enables to synchronise media files from <MainPlatformNameLink /> project to other storage back-ends, such as Amazon S3 or <NoSpellcheck id="MinIO" />.
4+
**Media Sync** enables to synchronise media files from <MainPlatformNameLink /> project to other storage back-ends, such as Amazon S3 or <NoSpellcheck id="MinIO" />.
55

66
Media Sync has two sync modes: in copy mode, media files are only copied the external drive, while in the move mode, the files are copied and subsequently removed from <MainPlatformName /> project.
77

88
**Interested in using Media Sync?** Go to <GitHubRepo id="MerginMaps/mergin-media-sync" /> repository for the source code and more details. Here, you will also find the Quick start guide that will show you how to set up one way synchronisation between a new <MainPlatformName /> project and your existing bucket (<NoSpellcheck id="MinIO" /> or S3).
9+
10+
:::tip Usage details
11+
Media Sync can be used with *Team*, *Academia* and *Non-profit* <MainDomainNameLink id="pricing" desc="subscription plans"/>, as well as in [<CommunityPlatformName />](../mergince/) and [<EnterprisePlatformName />](../merginmaps-ee/).
12+
13+
It is not available in *Individual* or *Professional* subscriptions.
14+
15+
You can try Media Sync for free during the trial period.
16+
:::

src/dev/work-packages/index.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11
# Work Packages
22
[[toc]]
33

4-
The <MainPlatformNameLink/> Work Packages tool is designed to manage field surveys for multiple teams. This tool allows to create <MainPlatformName /> *work packages projects* that contain a subset of data of the main <MainPlatformNameLink/> project and set up two-way synchronisation between the main project and the dependent projects as illustrated here:
5-
![work packages](./wp-high-level.png)
4+
The **Work Packages** tool is designed to manage field surveys for multiple teams. This tool allows to create <MainPlatformName /> *work packages projects* that contain a subset of data of the main <MainPlatformNameLink/> project and set up two-way synchronisation between the main project and the dependent projects as illustrated here:
5+
![Mergin Maps Work Packages](./wp-high-level.jpg "Mergin Maps Work Packages")
66

77
The main <MainPlatformNameLink/> project (*Survey*) contains all data. The admin of the main project can assign some of the data to working package projects (*Survey Team A*, *Survey Team B*). The teams can see and modify only the data that are assigned to them.
88

99
**Interested in using Work Packages?** Go to <GitHubRepo id="MerginMaps/mergin-work-packages" /> repository for the source code, more details and a quick start with a simple project.
10+
11+
:::tip Usage details
12+
Work Packages can be used with *Team*, *Academia* and *Non-profit* <MainDomainNameLink id="pricing" desc="subscription plans"/>, as well as in [<CommunityPlatformName />](../mergince/) and [<EnterprisePlatformName />](../merginmaps-ee/).
13+
14+
It is not available in *Individual* or *Professional* subscriptions.
15+
16+
You can try Work Packages for free during the trial period.
17+
:::
55.1 KB
Loading
-137 KB
Binary file not shown.
247 KB
Binary file not shown.

src/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ The ecosystem consist of various components:
3434
- [How to Sign Up to Mergin Maps](./setup/sign-up-to-mergin-maps/)
3535
- [How to Install QGIS](./setup/install-qgis/)
3636
- [How to Install QGIS Plugin](./setup/install-mergin-maps-plugin-for-qgis/)
37-
- [Subscriptions and Invoicing](./setup/subscriptions/)
3837

3938
## Manage Account & Project
4039
- [Workspaces](./manage/workspaces/)
40+
- [Subscriptions and Invoicing](./manage/subscriptions/)
4141
- [Permissions](./manage/permissions/)
4242
- [Behind Data Synchronisation](./manage/synchronisation/)
4343
- [Mergin Maps Project](./manage/project/)

0 commit comments

Comments
 (0)