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

merge

Browse Source
This commit is contained in:
Peter Maquiran
2023-08-30 17:14:59 +01:00
parent 0379b722cf 71ab74974d
commit f472d5ac0b
43 changed files with 70 additions and 54 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": "7ee834558",
"SHA": "7ee834558ce74ba7341b794ce916853ce0ffdd39",
"shortSHA": "0379b722c",
"SHA": "0379b722cf410a9a53b892b968d6ef44a0dafedf",
"branch": "developer-prod",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Wed Aug 30 14:39:27 2023 +0100'",
"lastCommitMessage": "improve action on mobile",
"lastCommitNumber": "5238",
"lastCommitTime": "'Wed Aug 30 17:11:31 2023 +0100'",
"lastCommitMessage": "change icons",
"lastCommitNumber": "5239",
"change": "",
"changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/publications/publications.page.html\n\tmodified: src/app/shared/agenda/view-event/view-event.page.scss\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.html\n\tmodified: src/assets/icon/theme/gov/icons-chat-record-audio.svg\n\tmodified: src/assets/icon/theme/gov/icons-chat-send.svg\n\tmodified: src/assets/icon/theme/gov/icons-most-searched-words-open.svg\n\tdeleted: src/assets/images/icons-menu.svg\n\tdeleted: src/assets/images/icons-nav-agenda-active.svg\n\tdeleted: src/assets/images/icons-profile-calendar-md.svg\n\tmodified: src/assets/images/icons-received-event.svg\n\tmodified: src/assets/images/theme/gov/advance-search-show-modal.svg\n\tnew file: src/assets/images/theme/gov/icon-reload.svg\n\tmodified: src/assets/images/theme/gov/icons-arrow-circle-arrow-right.svg\n\tmodified: src/assets/images/theme/gov/icons-attach-doc.svg\n\tmodified: src/assets/images/theme/gov/icons-chat-new-conversation.svg\n\tmodified: src/assets/images/theme/gov/icons-chat-new-group.svg\n\trenamed: src/assets/images/theme/gov/icons-chat-record-audio.svg -> src/assets/images/theme/gov/icons-chat-record-audio1.svg\n\tmodified: src/assets/images/theme/gov/icons-chat-send.svg\n\tmodified: src/assets/images/theme/gov/icons-collaps-down.svg\n\tmodified: src/assets/images/theme/gov/icons-collaps-up.svg\n\tmodified: src/assets/images/theme/gov/icons-edit.svg\n\tmodified: src/assets/images/theme/gov/icons-received-event.svg\n\tmodified: src/assets/images/theme/gov/icons-search-close.svg\n\tmodified: src/assets/images/theme/gov/icons-search.svg\n\tmodified: src/theme/variables.scss",
"changeStatus": "On branch developer-prod\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/create-process/create-process.page.html\n\tmodified: src/app/modals/delegar/delegar.page.html\n\tmodified: src/app/modals/document-detail/document-detail.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/modals/forward/forward.page.html\n\tmodified: src/app/modals/profile/edit-profile/edit-profile.page.ts\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/modals/view-event/view-event.page.html\n\tmodified: src/app/pages/agenda/agenda.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/agenda/view-event/view-event.page.html\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/events/edit-event/edit-event.page.html\n\tmodified: src/app/pages/events/event-detail-modal/event-detail-modal.page.html\n\tmodified: src/app/pages/events/event-detail/event-detail.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-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/expedient-task-modal/expedient-task-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified: src/app/services/events/edit-event/edit-event.page.html\n\tmodified: src/app/services/events/event-detail-modal/event-detail-modal.page.html\n\tmodified: src/app/services/events/event-detail/event-detail.page.html\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/services/processes.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.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/event-list/event-list.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.html\n\tmodified: src/app/shared/agenda/view-event/view-event.page.html\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html\n\tmodified: src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.html\n\tmodified: src/app/shared/gabinete-digital/generic/task-details/task-details.page.html\n\tmodified: src/app/shared/header/header.page.ts",
"changeAuthor": "peter.maquiran"
}