diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html index 23a5b78f3..fd8294ba2 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -62,13 +62,13 @@ {{msg.msg}} - Enviado + Enviado - Lido -
Tentar
+ Lido +
Tentar
{{last ? scrollToBottom() : ''}} @@ -103,13 +103,13 @@ image - Enviado + Enviado - Lido -
Tentar
+ Lido +
Tentar
@@ -159,13 +159,13 @@ - Enviado + Enviado - Lido -
Tentar
+ Lido +
Tentar
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index f626c951b..2a6e6dc2e 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -60,13 +60,13 @@ - Enviado + Enviado - Lido -
Tentar
+ Lido +
Tentar
{{last ? scrollToBottom() : ''}} @@ -99,13 +99,13 @@ image - Enviado + Enviado - Lido -
Tentar
+ Lido +
Tentar
@@ -165,13 +165,13 @@ - Enviado + Enviado - Lido -
Tentar
+ Lido +
Tentar
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html index 36dbc6172..2c6854b6e 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -59,13 +59,13 @@ - Enviado + Enviado - Lido -
Tentar
+ Lido +
Tentar
{{last ? scrollToBottom() : ''}} @@ -108,13 +108,13 @@ - Enviado + Enviado - Lido -
Tentar
+ Lido +
Tentar
@@ -165,13 +165,13 @@ - Enviado + Enviado - Lido -
Tentar
+ Lido +
Tentar
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index 0662e54b7..884abe7a0 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -60,13 +60,13 @@ - Enviado + Enviado - Lido -
Tentar
+ Lido +
Tentar
{{last ? scrollToBottom() : ''}} @@ -106,13 +106,13 @@ image - Enviado + Enviado - Lido -
Tentar
+ Lido +
Tentar
@@ -174,13 +174,13 @@ - Enviado + Enviado - Lido -
Tentar
+ Lido +
Tentar
diff --git a/version/git-version.ts b/version/git-version.ts index 0fd6e82ab..5db8b7b08 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "b1160a179", - "SHA": "b1160a179cd14a4f291f872e1144ffad74215b9c", + "shortSHA": "b21a3350e", + "SHA": "b21a3350ec5135e0be63566be04f5599127044fd", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Feb 13 19:34:00 2023 +0100'", - "lastCommitMessage": "plura worlds", - "lastCommitNumber": "4775", + "lastCommitTime": "'Mon Feb 13 19:35:16 2023 +0100'", + "lastCommitMessage": "merge", + "lastCommitNumber": "4778", "change": "", - "changeStatus": "On branch no_bug_movemente\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/add-note/add-note.page.html\n\tmodified: src/app/modals/create-process/create-process.page.html\n\tmodified: src/app/modals/dar-parecer/dar-parecer.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.html\n\tmodified: version/git-version.ts", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.html\n\tmodified: src/app/pages/chat/messages/messages.page.html\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.html\n\tmodified: src/app/shared/chat/messages/messages.page.html", "changeAuthor": "peter.maquiran" } \ No newline at end of file