From ac805b67ba8c3e80b47b22db4b77151a5ed82ae1 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 27 Jul 2023 16:39:25 +0100 Subject: [PATCH 1/3] change --- .../diplomas-gerar/diplomas-gerar.page.ts | 12 ++++++------ src/app/pages/inactivity/inactivity.page.html | 4 ++-- src/app/tiny-mce/tiny-mce.page.html | 2 +- version/git-version.ts | 14 +++++++------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts index 673b277c8..f6dc278a9 100644 --- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts @@ -105,7 +105,7 @@ export class DiplomasGerarPage implements OnInit { }, 1000); } - async LoadList(){ + async LoadList() { this.skeletonLoader = true @@ -134,10 +134,10 @@ export class DiplomasGerarPage implements OnInit { this.skeletonLoader = false this.showLoader = false; - } + } - goBack() { - this.RouteService.goBack(); - // window.history.back() - } + goBack() { + this.RouteService.goBack(); + // window.history.back() + } } diff --git a/src/app/pages/inactivity/inactivity.page.html b/src/app/pages/inactivity/inactivity.page.html index dca5f5624..37a013051 100644 --- a/src/app/pages/inactivity/inactivity.page.html +++ b/src/app/pages/inactivity/inactivity.page.html @@ -2,9 +2,9 @@
-
+
-
+
-
+
{{Document.Assunto}}
diff --git a/version/git-version.ts b/version/git-version.ts index 8ba4f9951..5403e43ea 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "c8fe85930", - "SHA": "c8fe85930b6576a7ae6656ab2d67f9c2b8091307", + "shortSHA": "e1b1f5e62", + "SHA": "e1b1f5e62a65c7e372dbdde3bc218e15de87701c", "branch": "developer-catch-merge", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Jul 27 13:36:38 2023 +0100'", - "lastCommitMessage": "fix", - "lastCommitNumber": "5117", - "change": "", - "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/view-event/view-event.page.html\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified: src/app/pages/inactivity/inactivity.page.html\n\tmodified: src/app/tiny-mce/tiny-mce.page.scss\n\tmodified: src/app/tiny-mce/tiny-mce.page.ts", + "lastCommitTime": "'Thu Jul 27 15:14:42 2023 +0100'", + "lastCommitMessage": "change", + "lastCommitNumber": "5118", + "change": "diff --git a/src/app/tiny-mce/tiny-mce.page.html b/src/app/tiny-mce/tiny-mce.page.html\nindex 7386845fe..2000e3124 100644\n--- a/src/app/tiny-mce/tiny-mce.page.html\n+++ b/src/app/tiny-mce/tiny-mce.page.html\n@@ -1,6 +1,6 @@\n
\n \n-
\n+
\n
\n \n
", + "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/inactivity/inactivity.page.html\n\tmodified: src/app/tiny-mce/tiny-mce.page.html\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: src/app/tiny-mce/tiny-mce.page.html", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 9bebc1b8b6298ff024c9b7e165a5cab2569447fb Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 28 Jul 2023 16:28:59 +0100 Subject: [PATCH 2/3] fix merge --- .../profile/edit-profile/edit-profile.page.html | 4 ++-- src/app/models/beast-orm.ts | 11 +++++++++++ src/app/pages/chat/messages/messages.page.ts | 2 +- src/app/pages/events/events.page.html | 2 +- .../despachos-pr/despacho-pr/despacho-pr.page.scss | 2 +- .../despachos/despacho/despacho.page.scss | 2 +- .../diploma-assinar/diploma-assinar.page.scss | 2 +- .../diplomas-gerar/diplomas-gerar.page.scss | 2 +- .../diplomas/diploma/diploma.page.scss | 2 +- .../expediente-detail/expediente-detail.page.scss | 2 +- .../expediente-pr/expediente-pr.page.scss | 2 +- .../gabinete-digital/pedidos/pedido/pedido.page.scss | 2 +- src/app/pages/inactivity/inactivity.page.scss | 6 ------ src/app/shared/agenda/edit-event/edit-event.page.ts | 4 +++- src/app/shared/agenda/new-event/new-event.page.ts | 4 +++- src/app/shared/chat/messages/messages.page.ts | 2 +- src/app/tiny-mce/tiny-mce.page.html | 2 +- version/git-version.ts | 12 ++++++------ 18 files changed, 37 insertions(+), 28 deletions(-) diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.html b/src/app/modals/profile/edit-profile/edit-profile.page.html index 1961636eb..af76e36d1 100644 --- a/src/app/modals/profile/edit-profile/edit-profile.page.html +++ b/src/app/modals/profile/edit-profile/edit-profile.page.html @@ -1,6 +1,6 @@ -
-
+
+