diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts index e6c11f299..2e5b06e99 100644 --- a/src/app/shared/agenda/event-list/event-list.page.ts +++ b/src/app/shared/agenda/event-list/event-list.page.ts @@ -40,7 +40,6 @@ export class EventListPage implements OnInit { public eventService: EventsService, ) { this.loggeduser = SessionStore.user; - alert(this.segment) } ngOnInit() { diff --git a/version/git-version.ts b/version/git-version.ts index 7a6dbcd4c..965bcfcfb 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "93f167847", - "SHA": "93f1678472076b95b2b6ea911b92f95c11036ffd", + "shortSHA": "60c9246d3", + "SHA": "60c9246d3dd34f07439a95c552a4202dfc17a260", "branch": "no_bug_movemente", "lastCommitAuthor": "'Eudes InĂ¡cio'", - "lastCommitTime": "'Fri Feb 17 16:53:20 2023 +0100'", - "lastCommitMessage": "Bug solve displaing tabs os event to aprove", - "lastCommitNumber": "4806", - "change": "", - "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 1 and 5 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: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/guards/auth.guard.ts\n\tmodified: src/app/modals/create-process/create-process.page.html\n\tmodified: src/app/modals/create-process/create-process.page.scss\n\tmodified: src/app/modals/dar-parecer/dar-parecer.page.html\n\tmodified: src/app/modals/delegar/delegar.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/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts\n\tmodified: src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\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/expediente/expedient-task-modal/expedient-task-modal.page.scss\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.html\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.scss\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/global.scss", + "lastCommitTime": "'Fri Feb 17 16:54:30 2023 +0100'", + "lastCommitMessage": "Pull made", + "lastCommitNumber": "4812", + "change": "diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts\nindex 53f31b337..38a854fa6 100644\n--- a/src/environments/environment.prod.ts\n+++ b/src/environments/environment.prod.ts\n@@ -3,4 +3,4 @@ import { oaprProd } from './suport/oapr'\n import { doneITProd } from './suport/doneIt'\n \n \n-export const environment: Environment = oaprProd;\n\\ No newline at end of file\n+export const environment: Environment = doneITProd;\n\\ No newline at end of file", + "changeStatus": "On branch no_bug_movemente\nYour branch is up to date with 'origin/no_bug_movemente'.\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: android/app/src/main/AndroidManifest.xml\n\tmodified: src/environments/environment.prod.ts\n\nUntracked files:\n (use \"git add ...\" to include in what will be committed)\n\twww.rar", "changeAuthor": "eudes.inacio" } \ No newline at end of file