build: rebase patches onto v0.21.6
This commit is contained in:
1 parent
0a80cadbc0
commit
47aeca9b20
29 files changed
+733
-597
No files matched your search
@@ -50,10 +50,10 @@ which offered Microsoft and nothing else:
|
||||
create mode 100644 apps/app-frontend/src/components/ui/OfflineAccountModal.vue
|
||||
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 28231e3..f94d0fe 100644
|
||||
index a3ffa8f..e17ace5 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -12361,6 +12361,7 @@ dependencies = [
|
||||
@@ -12376,6 +12376,7 @@ dependencies = [
|
||||
"indicatif",
|
||||
"itertools 0.14.0",
|
||||
"json5",
|
||||
@@ -62,10 +62,10 @@ index 28231e3..f94d0fe 100644
|
||||
"notify",
|
||||
"notify-debouncer-mini",
|
||||
diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
|
||||
index 447f636..d750a5f 100644
|
||||
index 4cd09f9..c5d4703 100644
|
||||
--- a/apps/app-frontend/src/App.vue
|
||||
+++ b/apps/app-frontend/src/App.vue
|
||||
@@ -2467,15 +2467,17 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
|
||||
@@ -2486,15 +2486,17 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
|
||||
>
|
||||
<OnboardingChecklist
|
||||
@create-instance="installationModal?.show()"
|
||||
@@ -426,7 +426,7 @@ index 94bd13e..cb7319a 100644
|
||||
* Retrieves the default user
|
||||
* @return {Promise<UUID | undefined>}
|
||||
diff --git a/apps/app/build.rs b/apps/app/build.rs
|
||||
index 926cab4..68a02aa 100644
|
||||
index 653f423..7806b4b 100644
|
||||
--- a/apps/app/build.rs
|
||||
+++ b/apps/app/build.rs
|
||||
@@ -14,6 +14,7 @@ fn main() {
|
||||
|
||||
Reference in new issue
Block a user