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

merge with developer

Browse Source
This commit is contained in:
Eudes Inácio
2023-08-21 11:56:39 +01:00
parent a89b2739c8 823609a948
commit 19393c2147
15 changed files with 162 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
version/git-version.ts
+7 -7
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "fdce8db60",
"SHA": "fdce8db602a0eb8141d95d38600bc5afd23aeb2a",
"shortSHA": "a89b2739c",
"SHA": "a89b2739c8d9b5d320e107b1366017c8e01607f3",
"branch": "developer-prod",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Sun Aug 20 22:00:23 2023 +0100'",
"lastCommitMessage": "update create event from document",
"lastCommitNumber": "5175",
"lastCommitTime": "'Mon Aug 21 11:42:34 2023 +0100'",
"lastCommitMessage": "update fix",
"lastCommitNumber": "5176",
"change": "",
"changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html\n\tmodified: src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/shared/chat/new-group/new-group.page.ts\n\tmodified: src/global.scss",
"changeAuthor": "peter.maquiran"
"changeStatus": "On branch developer-prod\nYour branch is up to date with 'origin/developer-prod'.\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: android/app/src/main/AndroidManifest.xml\n\tmodified: src/app/modals/profile/edit-profile/edit-profile.page.html\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.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/publications/publications.page.html\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/app/shared/header/header.page.scss\n\tmodified: src/app/tiny-mce/tiny-mce.page.html\n\tnew file: src/assets/images/md.webp\n\tnew file: src/assets/images/ministro.png\n\tnew file: src/assets/images/presidente.png\n\tnew file: src/assets/images/secretaria_geral.png\n\tnew file: src/assets/images/sg.jpeg\n\tmodified: version/git-version.ts",
"changeAuthor": "eudes.inacio"
}