Skip to content

Commit a9c64d1

Browse files
committed
Update collaboration assets to match new UX
1 parent 8f1ef34 commit a9c64d1

File tree

6 files changed

+11
-113
lines changed

6 files changed

+11
-113
lines changed

docs/resources/projects/how-to-collaborate-on-projects.md

Lines changed: 10 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@ ability to manage the collaboration through permissions.
1313

1414
## Sharing a Project with a User
1515

16-
You can also invite users to your project who are not part of your organization.
16+
You can invite users to your project who are not part of your organization.
1717
For instance, you might want to share your work with clients, stakeholders, or
1818
team members of the client.
1919

20+
![](imgs/invite-users.avif)
21+
2022
When you invite users to your project, you have the flexibility to assign them
2123
different roles depending on their level of involvement. For example, you can
2224
grant **editing** privileges to collaborators who are actively working on the
@@ -32,86 +34,18 @@ control.
3234
- Read-only users added to *Teams*/*Organization* will not count against your
3335
*Teams* seat count.
3436
- You must verify your email before inviting users.
35-
:::
36-
37-
### How to Invite Users
38-
39-
<div class="arcade-container" style={{
40-
position: 'relative',
41-
paddingBottom: 'calc(56.67989417989418% + 41px)', // Keeps the aspect ratio and additional padding
42-
height: 0,
43-
width: '100%'
44-
}}>
45-
<iframe
46-
src="https://demo.arcade.software/9XkpLuC3tpiFFapWi7ao?embed&show_copy_link=true"
47-
title="Sharing a Project with a User"
48-
style={{
49-
position: 'absolute',
50-
top: 0,
51-
left: 0,
52-
width: '100%',
53-
height: '100%',
54-
colorScheme: 'light',
55-
}}
56-
frameborder="0"
57-
loading="lazy"
58-
webkitAllowFullScreen
59-
mozAllowFullScreen
60-
allowFullScreen
61-
allow="clipboard-write">
62-
</iframe>
63-
</div>
64-
65-
66-
:::info
67-
6837
- If a user isn't already a FlutterFlow user, we will send them an invite email.
6938
Their status will be shown as **Pending** until they create an account.
7039
- FlutterFlow subscriptions are seat based. A user added to your project will
7140
only have access to the features of their account plan.
7241
:::
7342

74-
## Branching Permissions
75-
76-
The owner of a project can manage permissions related to branching. Owners can
77-
control two types of branching permissions:
78-
79-
- **Editing Permissions:** Determines who is allowed to edit branching permissions.
80-
- **Merging into Main:** Specifies who is allowed to merge branches into the main
81-
branch.
82-
83-
<div style={{
84-
position: 'relative',
85-
paddingBottom: 'calc(56.67989417989418% + 41px)', // Correctly maintaining the aspect ratio with additional padding
86-
height: 0,
87-
width: '100%'
88-
}}>
89-
<iframe
90-
src="https://demo.arcade.software/P5MgPJuBBeaIm7dfEjqI?embed&show_copy_link=true"
91-
title="Branching Permissions"
92-
style={{
93-
position: 'absolute',
94-
top: 0,
95-
left: 0,
96-
width: '100%',
97-
height: '100%',
98-
colorScheme: 'light'
99-
}}
100-
frameBorder="0"
101-
loading="lazy"
102-
webkitAllowFullScreen
103-
mozAllowFullScreen
104-
allowFullScreen
105-
allow="clipboard-write">
106-
</iframe>
107-
</div>
10843

10944
## Sharing a Project with an Organization
11045

111-
To share a project with all team members in your organization, enable the "Share
112-
with my organization" option.
46+
To share a project with all current and future team members in your organization, enable the **Grant team members access** option.
11347

114-
![share-project-with-organization.avif](../../../static/img/share-project-with-organization.avif)
48+
![share-with-team](imgs/share-with-team.avif)
11549

11650
## Real-Time Collaboration
11751

@@ -124,24 +58,10 @@ interfering with the work of others.
12458
This increases efficiency and productivity, as multiple builders can work on
12559
various aspects of the project or together on the same page at the same time.
12660

127-
To enable real-time collaboration, navigate to **Settings & Integrations (from the
128-
left Navigation Menu) > Project Setup > Collaboration > click Enable Updated
129-
Collaboration**.
130-
131-
![realtime-collaboration-setup.png](../../../static/img/realtime-collaboration-setup.png)
132-
133-
Now when multiple builders are on the same page, it looks like this:
61+
When multiple builders are on the same page, it looks like this:
13462

13563
![real-time-collaboration.gif](../../../static/img/real-time-collaboration.gif)
13664

137-
To disable this feature anytime, click the **Disable Updated Collaboration** button.
138-
139-
:::caution
140-
141-
This feature is still in Beta, and unexpected issues may occur. Ensure you
142-
regularly create **[project versions](../../testing-deployment-publishing/branching-collaboration/saving-versioning.md)** as a backup.
143-
:::
144-
14565
:::info
14666

14767
Real-Time collaboration is a feature of our Teams and Enterprise plans.
@@ -154,31 +74,9 @@ This step can not be undone. If you want to regain project ownership, the new
15474
project owner will need to transfer ownership back to you.
15575
:::
15676

157-
<div class ="arcade-container" style={{
158-
position: 'relative',
159-
paddingBottom: 'calc(56.67989417989418% + 41px)', // Maintain aspect ratio plus extra padding
160-
height: 0,
161-
width: '100%'
162-
}}>
163-
<iframe
164-
src="https://demo.arcade.software/hUnKMJ7eqD81SRHkxEmt?embed&show_copy_link=true"
165-
title="Transferring Project"
166-
style={{
167-
position: 'absolute',
168-
top: 0,
169-
left: 0,
170-
width: '100%',
171-
height: '100%',
172-
colorScheme: 'light'
173-
}}
174-
frameBorder="0"
175-
loading="lazy"
176-
webkitAllowFullScreen
177-
mozAllowFullScreen
178-
allowFullScreen
179-
allow="clipboard-write">
180-
</iframe>
181-
</div>
77+
To transfer ownership to another user, navigate to **Settings & Integrations > Project Setup > Collaboration > Project-Level Access**, click on the current role and select **Owner**.
78+
79+
![transfer-ownership.avif](imgs/transfer-ownership.avif)
18280

18381
## Project Activity
18482

@@ -187,7 +85,7 @@ track progress and stay up to date on project changes. This feature allows team
18785
members to see all the updates made to a project in real-time, enabling them to
18886
understand how the project is evolving and collaborate more efficiently.
18987

190-
![flutterflow-project-activity.avif](../../../static/img/flutterflow-project-activity.avif)
88+
![project-activity](imgs/project-activity.avif)
19189

19290
:::info
19391
Teams users can access the last 7 days of project edits, while FlutterFlow
72.8 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

docs/testing-deployment-publishing/branching-collaboration/branching.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ If the visual editor doesn't display something in the split screen UI that you n
307307
## Branch-level Permissions
308308
In your project, you have the ability to assign specific roles such as **Editors** and **Mergers** to project members for each branch.
309309

310-
To configure these permissions, navigate to **Settings & Integrations > Project Setup > Collaboration > Branch Permissions**.
310+
To configure these permissions, navigate to **Settings & Integrations > Project Setup > Collaboration > Branch-Level Access**.
311311

312312
![branch-permission](../imgs/branch-permission.png)
313313

0 commit comments

Comments
 (0)