peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
Peter Maquiran
2023-07-28 16:28:59 +01:00
parent ac805b67ba
commit 9bebc1b8b6
18 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "e1b1f5e62",
"SHA": "e1b1f5e62a65c7e372dbdde3bc218e15de87701c",
"shortSHA": "ac805b67b",
"SHA": "ac805b67ba8c3e80b47b22db4b77151a5ed82ae1",
"branch": "developer-catch-merge",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Thu Jul 27 15:14:42 2023 +0100'",
"lastCommitTime": "'Thu Jul 27 16:39:25 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 <div >\n <ion-toolbar class=\"d-flex\">\n- <div class=\"d-flex align-items-center px-20 pt-20 font-25\">\n+ <div class=\"d-flex align-items-center px-20 pt-20 font-25-rem\">\n <div class=\"left cursor-pointer\" (click)=\"close()\">\n <fa-icon icon=\"chevron-left\" class=\"menu-icon font-awesome-1\"></fa-icon>\n </div>",
"changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged <file>...\" 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 <file>...\" to update what will be committed)\n (use \"git restore <file>...\" to discard changes in working directory)\n\tmodified: src/app/tiny-mce/tiny-mce.page.html",
"lastCommitNumber": "5119",
"change": "",
"changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/modals/profile/edit-profile/edit-profile.page.html\n\tmodified: src/app/models/beast-orm.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss\n\tmodified: src/app/pages/inactivity/inactivity.page.scss\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/chat/messages/messages.page.ts\n\tmodified: src/app/tiny-mce/tiny-mce.page.html",
"changeAuthor": "peter.maquiran"
}