Skip to content

Commit 95e5b49

Browse files
authored
Iss 639 clarify contributors (#651)
1 parent b7a569a commit 95e5b49

File tree

14 files changed

+111
-81
lines changed

14 files changed

+111
-81
lines changed

REDIRECTS

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ https://merginmaps.com/docs/field/input_features/ https://merginmaps.com/docs/fi
121121
https://merginmaps.com/docs/field/input_ui/ https://merginmaps.com/docs/field/mobile-app-ui/
122122
https://merginmaps.com/docs/gis/enable_browsing/ https://merginmaps.com/docs/gis/search_data/
123123
https://merginmaps.com/docs/howto/attach-multiple-photos-to-features/ https://merginmaps.com/docs/layer/attach-multiple-photos-to-features/
124-
https://merginmaps.com/docs/howto/contribute/ https://merginmaps.com/docs/misc/contribute/
124+
https://merginmaps.com/docs/howto/contribute/ https://merginmaps.com/docs/misc/get-involved/
125125
https://merginmaps.com/docs/howto/create-an-organization/ https://merginmaps.com/docs/manage/workspaces/
126126
https://merginmaps.com/docs/howto/create-project/ https://merginmaps.com/docs/manage/create-project/
127127
https://merginmaps.com/docs/howto/customapp/ https://merginmaps.com/docs/dev/customapp/
@@ -178,6 +178,7 @@ https://merginmaps.com/docs/manage/project-details/ https://merginmaps.com/docs/
178178
https://merginmaps.com/docs/manage/plugin-multi-server-use/ https://merginmaps.com/docs/server/plugin-mobile-app/
179179
https://merginmaps.com/docs/manage/plugin-sync-project/ https://merginmaps.com/docs/manage/plugin/
180180
https://merginmaps.com/docs/misc/privacy/ N/A -- handled by https://merginmaps.com/privacy-policy/
181+
https://merginmaps.com/docs/misc/contribute/ https://merginmaps.com/docs/misc/get-involved/
181182
https://merginmaps.com/docs/reference/licensing/ https://merginmaps.com/docs/misc/licensing/
182183
https://merginmaps.com/docs/reference/privacy/ N/A -- handled by https://merginmaps.com/privacy-policy/
183184
https://merginmaps.com/docs/server/administer/environment/ https://merginmaps.com/docs/server/environment/
@@ -189,7 +190,7 @@ https://merginmaps.com/docs/setup/working-with-organisations/ https://merginmaps
189190
https://merginmaps.com/docs/components/mobile/ https://merginmaps.com/docs/
190191
https://www.merginmaps.com/docs/components/web/ https://merginmaps.com/docs/
191192
https://www.merginmaps.com/docs/concepts/ https://merginmaps.com/docs/
192-
https://www.merginmaps.com/docs/contribute/ https://merginmaps.com/docs/misc/contribute/
193+
https://www.merginmaps.com/docs/contribute/ https://merginmaps.com/docs/misc/get-involved/
193194
https://merginmaps.com/docs/faq/ https://merginmaps.com/docs/
194195
https://www.merginmaps.com/docs/guides/datum-shift/ https://merginmaps.com/docs/gis/proj/
195196
https://www.merginmaps.com/docs/guides/mergin-tour/ https://merginmaps.com/docs/
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<template>
2+
<a :href="`https://merginmaps.com/${id}`" target="_blank" class="nospellcheck">
3+
<span v-if="desc" v-html="desc"></span>
4+
<span v-else class="nospellcheck">Mergin Maps Cloud</span>
5+
</a>
6+
</template>
7+
8+
<script>
9+
export default {
10+
name: "server-cloud-name-link",
11+
props: {
12+
id: {
13+
type: String,
14+
default: ''
15+
},
16+
desc: String
17+
}
18+
}
19+
</script>

src/.vitepress/sidebar/en.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ export default {
138138
collapsed: true,
139139
items: [
140140
{ text: 'Licensing', link: '/misc/licensing/' },
141+
{ text: 'Get Involved', link: '/misc/get-involved/' },
141142
{ text: 'Troubleshoot', link: '/misc/troubleshoot/' },
142-
{ text: 'Contribute', link: '/misc/contribute/' },
143143
{ text: 'Write Documentation', link: '/misc/write-docs/' }
144144
]
145145
}

src/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ The ecosystem consist of various components:
121121

122122
## Support & Legal
123123
- [Licensing](./misc/licensing/)
124+
- [Get Involved](./misc/get-involved/)
124125
- [Troubleshoot](./misc/troubleshoot/)
125-
- [Contribute](./misc/contribute/)
126126
- [Write Documentation](./misc/write-docs/)
127127

src/manage/dashboard/index.md

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,22 @@ In **Settings**, you can:
6868

6969

7070
## Members
71-
The **Members** tab provides the overview of the [members and guests](../permissions/#workspace-members-and-guests) of the workspace, as well as pending invitations.
72-
Here, you can [**invite**](../project-advanced/#add-users-to-a-workspace) users to the workspace and manage the [roles](../permissions/#workspace-member-roles-and-project-permissions) of your workspace members. If needed, users can be also removed from the workspace.
71+
The **Members** tab provides the overview of the [members and guests](../permissions/#workspace-members-and-guests) of the workspace, as well as pending invitations. You can use the [**invite**](../project-advanced/#add-users-to-a-workspace) option to add users to the workspace.
72+
73+
This tab is only available to [owners and admins](../permissions/#workspace-member-roles-and-project-permissions) of a workspace.
74+
75+
Here, you can:
76+
- see the email addresses, usernames and names of your workspace users
77+
- see and change the [roles](../permissions/#workspace-member-roles-and-project-permissions) of your workspace members
78+
- see the **Member type**, whether the user is a [contributor](../subscriptions/#contributors) or a read-only guest. Only contributors are counting towards your [subscription](../subscriptions/).
79+
- remove users from the workspace
80+
81+
7382

7483
![Mergin Maps dashboard workspace members](./mergin-maps-dashboard-members.jpg "Mergin Maps dashboard workspace members")
7584

7685
## Subscriptions
77-
The **Subscriptions** tab contains information about your [subscription plan](../subscriptions/).
86+
The **Subscriptions** tab contains information about your [subscription plan](../subscriptions/). This tab is only available to [owners](../permissions/#workspace-member-roles-and-project-permissions) of a workspace.
7887

7988
Here, you can find the current usage of storage, number of users (members and guests) and number of projects in your workspace.
8089

189 KB
Loading
Binary file not shown.
291 KB
Loading
Binary file not shown.

src/manage/permissions/index.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,22 @@
44
Permissions control access to your <MainPlatformName /> projects. They can be defined for the whole workspace or for a specific project.
55

66
## Workspace members and guests
7-
People invited to a workspace can be invited as **members** or as **guests**.
7+
People invited to a workspace can be invited as **members** or as **guests**. See [How to share projects and manage user access](../project-advanced/#share-projects-and-manage-user-access) for detailed step.
88

99
**Members** have access to *all* projects in a workspace. If a new project is created, they will be able to access it immediately. This means you do not have to grant them permissions to new projects manually. The level of access to the workspace is defined by their member roles. There are 5 [member roles](#workspace-member-roles-and-project-permissions) available: *reader*, *editor*, *writer*, *admin* and *owner*.
1010

1111
**Guests** have access only to projects they are invited to. If you want to only share specific projects with someone, you should invite them to your workspace as a guest. The level of access to a project is defined by project permissions. There are 4 [permission](#workspace-member-roles-and-project-permissions) levels: *reader*, *editor*, *writer*, and *owner*.
1212

13-
:::tip
14-
You can find detailed steps on how to invite users to your workspace in [How to share projects and manage user access](../project-advanced/#share-projects-and-manage-user-access).
13+
:::tip Members, guests and contributors
14+
Subscriptions are based on the number of *contributors* on the workspace. *Contributors* are members or guests with writer, editor, admin or owner access.
15+
16+
*Readers* do not count as contributors. The number of read-only users in your workspace does not affect your subscription.
1517
:::
1618

1719
## Workspace member roles and project permissions
1820
Member roles and project permissions present similar options in terms of what a user can or cannot do. The difference is whether these options are defined on a workspace or on a project level. Compare the overview of [workspace member roles](#workspace-member-roles-overview) and of [project permissions](#project-permissions-overview) for more details.
1921

20-
- **Reader**: Users with **Read** permission are able to see projects, projects data and [history](../project-history/), but can not make any changes.
22+
- **Reader**: Users with **Read** permission are able to see projects, projects data and [history](../project-history/), but can not make any changes. *Readers* do not count as [contributors](../subscriptions/#contributors) in your subscription.
2123
- **Editor** (available on <MainPlatformNameLink /> Cloud and <EnterprisePlatformNameLink />): In addition to the **Read** access, users can [add/remove/update features](../../field/mobile-features/), but *cannot* make changes in the project properties, add/remove fields in GeoPackage layers or remove GeoPackage files from the project. We recommend using this role for surveyors - users who collect data in the field.
2224
Editors can:
2325
- *add* files such as photos, shapefiles, GeoPackage files - any file except for `*.qgs`, `*.qgz`, `mergin-config.json`

0 commit comments

Comments
 (0)