From 41be5c8120218f000f06b70abc97028d4d2e1851 Mon Sep 17 00:00:00 2001 From: Adam Monsen Date: Mon, 25 Nov 2024 10:43:29 -0800 Subject: [PATCH 1/5] document multi-user usage of same budget file --- docs-sidebar.js | 1 + docs/experimental/multi-user.md | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 docs/experimental/multi-user.md diff --git a/docs-sidebar.js b/docs-sidebar.js index 1642167dd..49b191fc3 100644 --- a/docs-sidebar.js +++ b/docs-sidebar.js @@ -226,6 +226,7 @@ const sidebars = { items: [ 'experimental/goal-templates', 'experimental/monthly-cleanup', + 'experimental/multi-user', 'experimental/tracking-budget', ], }, diff --git a/docs/experimental/multi-user.md b/docs/experimental/multi-user.md new file mode 100644 index 000000000..2d4ee0a69 --- /dev/null +++ b/docs/experimental/multi-user.md @@ -0,0 +1,9 @@ +# Multi-user + +:::warning +This is an **experimental feature**. That means we’re still working on finishing it. There may be bugs, missing functionality or incomplete documentation, and we may decide to remove the feature in a future release. If you have any feedback, please [open an issue](https://github.com/actualbudget/actual/issues) or post a message in the Discord. +::: + +## Multi-user Support + +The same budget file may be open and edited simultaneously from two separate browsers, even by two different people on different client computers. This should work unless the edits conflict. To be safe, avoid simultaneous usage of the same budget file. From 4543577b5055b97c084b9de3240032be42a853be Mon Sep 17 00:00:00 2001 From: Adam Monsen Date: Tue, 26 Nov 2024 09:06:21 -0800 Subject: [PATCH 2/5] mention multi-user use on joint accounts page --- docs/budgeting/joint-accounts.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/budgeting/joint-accounts.md b/docs/budgeting/joint-accounts.md index 50112ee24..e88ea0eeb 100644 --- a/docs/budgeting/joint-accounts.md +++ b/docs/budgeting/joint-accounts.md @@ -11,6 +11,7 @@ One approach is maintaining a common budget where both partners share a single b This method promotes transparency and ensures both parties agree regarding financial goals, expenses, and income. A shared budget fosters collaboration but requires consistent communication to keep everything current. It will help you both set clear boundaries for individual and shared expenses while working together toward common financial objectives. +See [Multi-user](/docs/experimental/multi-user) regarding simultaneous edits. Alternatively, you can track your partner’s contributions within your personal Actual Budget file. This allows you to maintain individual control over your finances while still acknowledging and accounting for your partner’s financial From 27e8f89c86af3fdaafd77bf1f89bbd1b7a3a1bfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ruben=20Olsen=20L=C3=A6rk?= Date: Wed, 27 Nov 2024 12:30:07 -0800 Subject: [PATCH 3/5] grammatical improvements --- docs/experimental/multi-user.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/experimental/multi-user.md b/docs/experimental/multi-user.md index 2d4ee0a69..70b295aa6 100644 --- a/docs/experimental/multi-user.md +++ b/docs/experimental/multi-user.md @@ -6,4 +6,4 @@ This is an **experimental feature**. That means we’re still working on finishi ## Multi-user Support -The same budget file may be open and edited simultaneously from two separate browsers, even by two different people on different client computers. This should work unless the edits conflict. To be safe, avoid simultaneous usage of the same budget file. +The same budget file may be opened and edited simultaneously from two separate browsers, even by two different people on different client computers. This should work unless the edits conflict. To be safe, avoid simultaneous usage of the same budget file. From 17e60a4170b1782b0b041040ebe0b3565346e2ec Mon Sep 17 00:00:00 2001 From: Adam Monsen Date: Wed, 27 Nov 2024 12:44:12 -0800 Subject: [PATCH 4/5] move multi-user info to existing sync page --- docs-sidebar.js | 1 - docs/experimental/multi-user.md | 9 --------- docs/getting-started/sync.md | 4 ++++ 3 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 docs/experimental/multi-user.md diff --git a/docs-sidebar.js b/docs-sidebar.js index 49b191fc3..1642167dd 100644 --- a/docs-sidebar.js +++ b/docs-sidebar.js @@ -226,7 +226,6 @@ const sidebars = { items: [ 'experimental/goal-templates', 'experimental/monthly-cleanup', - 'experimental/multi-user', 'experimental/tracking-budget', ], }, diff --git a/docs/experimental/multi-user.md b/docs/experimental/multi-user.md deleted file mode 100644 index 70b295aa6..000000000 --- a/docs/experimental/multi-user.md +++ /dev/null @@ -1,9 +0,0 @@ -# Multi-user - -:::warning -This is an **experimental feature**. That means we’re still working on finishing it. There may be bugs, missing functionality or incomplete documentation, and we may decide to remove the feature in a future release. If you have any feedback, please [open an issue](https://github.com/actualbudget/actual/issues) or post a message in the Discord. -::: - -## Multi-user Support - -The same budget file may be opened and edited simultaneously from two separate browsers, even by two different people on different client computers. This should work unless the edits conflict. To be safe, avoid simultaneous usage of the same budget file. diff --git a/docs/getting-started/sync.md b/docs/getting-started/sync.md index c7e3792f5..925bab97f 100644 --- a/docs/getting-started/sync.md +++ b/docs/getting-started/sync.md @@ -90,3 +90,7 @@ Unfortunately, Actual detected an inconsistency in your synced data. This only h ### Update required While syncing, your device received data that it couldn't apply because your version of Actual is out-of-date. You need to update Actual and it will then sync successfully. + +## Multi-user Support + +The same budget file may be opened and edited simultaneously from two separate browsers, even by two different people on different client computers. This should work unless the edits conflict. To be safe, avoid simultaneous usage of the same budget file. From 9b6012f3530edc8f794967a8b7aaeb96371e14bd Mon Sep 17 00:00:00 2001 From: Adam Monsen Date: Wed, 27 Nov 2024 12:49:45 -0800 Subject: [PATCH 5/5] fix broken link to multi-user info --- docs/budgeting/joint-accounts.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/budgeting/joint-accounts.md b/docs/budgeting/joint-accounts.md index e88ea0eeb..9663e9414 100644 --- a/docs/budgeting/joint-accounts.md +++ b/docs/budgeting/joint-accounts.md @@ -11,7 +11,7 @@ One approach is maintaining a common budget where both partners share a single b This method promotes transparency and ensures both parties agree regarding financial goals, expenses, and income. A shared budget fosters collaboration but requires consistent communication to keep everything current. It will help you both set clear boundaries for individual and shared expenses while working together toward common financial objectives. -See [Multi-user](/docs/experimental/multi-user) regarding simultaneous edits. +See [Multi-user](/docs/getting-started/sync#multi-user-support) regarding simultaneous edits. Alternatively, you can track your partner’s contributions within your personal Actual Budget file. This allows you to maintain individual control over your finances while still acknowledging and accounting for your partner’s financial