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

git version

Browse Source
This commit is contained in:
Eudes Inácio
2023-01-30 22:01:07 +01:00
parent 7b4105ef1d 49142391e9
commit bbddcf223e
10 changed files with 48 additions and 33 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": "32fb80f1b",
"SHA": "32fb80f1bb3ab1f94c9ae0c4f2f1987ae6dda323",
"shortSHA": "7b4105ef1",
"SHA": "7b4105ef1d19efc75dd17b0cde15d2efac4d2c1f",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Mon Jan 30 15:08:00 2023 +0100'",
"lastCommitMessage": "Notificaion from chat added",
"lastCommitNumber": "4691",
"lastCommitTime": "'Mon Jan 30 18:01:29 2023 +0100'",
"lastCommitMessage": "post notification edit",
"lastCommitNumber": "4693",
"change": "",
"changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 1 and 3 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\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/document-detail/document-detail.page.html\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html\n\tmodified: src/app/shared/popover/request-options/request-options.page.html\n\tmodified: src/app/shared/popover/searched-document-options/searched-document-options.page.html\n\tmodified: src/environments/suport/oapr.ts",
"changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 2 and 2 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/pages/chat/chat.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.html\n\tmodified: src/app/store/despacho-store.service.ts\n\tmodified: src/app/store/despachospr-store.service.ts\n\tmodified: src/app/store/expedientegd-store.service.ts",
"changeAuthor": "eudes.inacio"
}