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

Browse Source
This commit is contained in:
Peter Maquiran
2023-08-24 22:25:33 +01:00
parent 3451e74c90 7302918ed8
commit 774178108c
24 changed files with 217 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files
version/git-version.ts
+8 -8
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "10ca45b8a",
"SHA": "10ca45b8a0ad7ad7f9167faa7963905a99c98bc0",
"branch": "developer-prod",
"shortSHA": "3451e74c9",
"SHA": "3451e74c90fe8c3346bf27fe75b00e30a29cf608",
"branch": "developer-prod-2",
"lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Wed Aug 23 13:34:03 2023 +0100'",
"lastCommitMessage": "buttons: save is first, cancel is second",
"lastCommitNumber": "5210",
"lastCommitTime": "'Thu Aug 24 18:39:31 2023 +0100'",
"lastCommitMessage": "prepare for presantation",
"lastCommitNumber": "5213",
"change": "",
"changeStatus": "On branch developer-prod\nYour branch and 'origin/developer-prod' have diverged,\nand have 6 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/view-document/view-document.page.ts\n\tmodified: src/app/pages/agenda/agenda.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.scss\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.html\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts\n\tdeleted: src/app/shared/chat/new-group/group-contacts/group-contacts-routing.module.ts\n\tdeleted: src/app/shared/chat/new-group/group-contacts/group-contacts.module.ts\n\tdeleted: src/app/shared/chat/new-group/group-contacts/group-contacts.page.html\n\tdeleted: src/app/shared/chat/new-group/group-contacts/group-contacts.page.scss\n\tdeleted: src/app/shared/chat/new-group/group-contacts/group-contacts.page.spec.ts\n\tdeleted: src/app/shared/chat/new-group/group-contacts/group-contacts.page.ts\n\tmodified: src/app/shared/chat/new-group/new-group-routing.module.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/popover/chat-popover/chat-popover.page.html\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/store/publication-folder.service.ts",
"changeAuthor": "eudes.inacio"
"changeStatus": "On branch developer-prod-2\nYour branch is up to date with 'origin/developer-prod-2'.\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/profile/edit-profile/edit-profile.page.html\n\tmodified: src/app/modals/view-media/view-media.page.html\n\tmodified: src/app/modals/view-media/view-media.page.scss\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/pages/publications/publications.page.html\n\tmodified: src/app/pages/publications/publications.page.ts\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.html\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.scss\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.ts\n\tmodified: src/app/pipes/publication.pipe.ts\n\tmodified: src/app/services/functions/file.service.ts\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/app/shared/header/header.page.scss\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.scss\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.html\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.scss\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.ts\n\tmodified: src/app/store/publication-folder.service.ts\n\tnew file: src/assets/images/camera.png",
"changeAuthor": "peter.maquiran"
}