fixup after rebase

Start9Labs · Jul 7, 2023 · 448e8b3 · 448e8b3
1 parent 75d2cde
commit 448e8b3
Show file tree

Hide file tree

Showing 26 changed files with 5 additions and 538 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/patchdb-ui-seed.json b/frontend/patchdb-ui-seed.json
@@ -1,6 +1,6 @@
 {
   "name": null,
-  "ack-welcome": "0.3.4.3",
+  "ack-welcome": "0.4.0",
   "marketplace": {
     "selected-url": "https://registry.start9.com/",
     "known-hosts": {

diff --git a/frontend/projects/shared/src/components/loading/loading.component.html b/frontend/projects/shared/src/components/loading/loading.component.html
diff --git a/frontend/projects/shared/src/components/loading/logs-window/logs-window.component.html b/frontend/projects/shared/src/components/loading/logs-window/logs-window.component.html
diff --git a/frontend/projects/shared/src/components/loading/logs-window/logs-window.component.scss b/frontend/projects/shared/src/components/loading/logs-window/logs-window.component.scss
diff --git a/frontend/projects/shared/src/components/loading/logs-window/logs-window.component.ts b/frontend/projects/shared/src/components/loading/logs-window/logs-window.component.ts
diff --git a/frontend/projects/ui/src/app/app.module.ts b/frontend/projects/ui/src/app/app.module.ts
@@ -33,7 +33,6 @@ import { ConnectionBarComponentModule } from './app/connection-bar/connection-ba
 import { WidgetsPageModule } from 'src/app/apps/ui/pages/widgets/widgets.module'
 import { ServiceWorkerModule } from '@angular/service-worker'
 import { environment } from '../environments/environment'
-import { LoadingModule } from './common/loading/loading.module'
 
 @NgModule({
   declarations: [AppComponent],

diff --git a/...d/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/edit-job/edit-job.page.html b/...d/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/edit-job/edit-job.page.html
diff --git a/...d/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/edit-job/edit-job.page.scss b/...d/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/edit-job/edit-job.page.scss
diff --git a/...end/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/edit-job/edit-job.page.ts b/...end/projects/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/edit-job/edit-job.page.ts
diff --git a/...ui/src/app/apps/ui/pages/backups/pages/backup-jobs/job-options/job-options.component.html b/...ui/src/app/apps/ui/pages/backups/pages/backup-jobs/job-options/job-options.component.html
diff --git a/...ui/src/app/apps/ui/pages/backups/pages/backup-jobs/job-options/job-options.component.scss b/...ui/src/app/apps/ui/pages/backups/pages/backup-jobs/job-options/job-options.component.scss
diff --git a/...s/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/job-options/job-options.component.ts b/...s/ui/src/app/apps/ui/pages/backups/pages/backup-jobs/job-options/job-options.component.ts