From fa13f528006c76a2545adc0cd721caf282fa519b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Mon, 6 Feb 2023 10:10:32 +0100 Subject: [PATCH 1/2] git version --- version/git-version.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/version/git-version.ts b/version/git-version.ts index 24fb5068d..8d1db189b 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "dcff11581", - "SHA": "dcff11581665a569e10ccab0aeaf1dc7f04d3d3a", + "shortSHA": "72bd8ff8c", + "SHA": "72bd8ff8cf78537c976def8a535e32e8cfa76d50", "branch": "no_bug_movemente", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Mon Feb 6 09:44:43 2023 +0100'", - "lastCommitMessage": "Code refactore on pedido mobile", - "lastCommitNumber": "4722", + "lastCommitTime": "'Mon Feb 6 09:45:44 2023 +0100'", + "lastCommitMessage": "pull made", + "lastCommitNumber": "4725", "change": "", - "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 1 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: .gitignore\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/pages/agenda/agenda.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.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/background.service.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/store/eventoaprovacao-store.service.ts\n\tmodified: src/app/store/session.service.ts\n\tmodified: src/assets/firebase-messaging-sw.js\n\tmodified: src/index.html\n\tmodified: version/git-version.ts", + "changeStatus": "On branch no_bug_movemente\nYour branch is behind 'origin/no_bug_movemente' by 3 commits, and can be fast-forwarded.\n (use \"git pull\" to update your local branch)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: version/git-version.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file From 9f13967ae3f2c7986e9c58d14c8501601da77735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Mon, 6 Feb 2023 14:02:38 +0100 Subject: [PATCH 2/2] condintion added to publication details --- .../publication-detail/publication-detail.page.html | 2 +- version/git-version.ts | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html index f84bff5d9..25ccf90b8 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html @@ -69,7 +69,7 @@ - diff --git a/version/git-version.ts b/version/git-version.ts index 9bb75d46f..15cea8322 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "fa13f5280", - "SHA": "fa13f528006c76a2545adc0cd721caf282fa519b", + "shortSHA": "3a23b6554", + "SHA": "3a23b655439b52dcd2e02d5cb516be40f865afec", "branch": "no_bug_movemente", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Mon Feb 6 10:10:32 2023 +0100'", - "lastCommitMessage": "git version", - "lastCommitNumber": "4726", + "lastCommitTime": "'Mon Feb 6 10:11:49 2023 +0100'", + "lastCommitMessage": "onother merger made", + "lastCommitNumber": "4730", "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: angular.json\n\tmodified: package.json\n\tmodified: src/app/app.module.ts\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html\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.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts\n\tnew file: src/combined-sw.js\n\trenamed: src/assets/firebase-messaging-sw.js -> src/firebase-messaging-sw.js\n\tnew file: src/manifest.webmanifest", + "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 2 and 5 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html", "changeAuthor": "eudes.inacio" } \ No newline at end of file