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

changes from peter

Browse Source
This commit is contained in:
Eudes Inácio
2023-06-09 13:55:32 +01:00
parent 9470de5307 3bf5bfa75b
commit 05265f2442
8 changed files with 55 additions and 40 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": "2e88ed290",
"SHA": "2e88ed2902f0acd0958bc1075bddc28ef60b2edd",
"shortSHA": "9470de530",
"SHA": "9470de5307453466d052581c315d4283d921d3be",
"branch": "feature/gabinete-search",
"lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Wed Jun 7 16:18:36 2023 +0100'",
"lastCommitMessage": "envirement change to oapr",
"lastCommitNumber": "4960",
"lastCommitTime": "'Thu Jun 8 16:04:00 2023 +0100'",
"lastCommitMessage": "chnages and changes",
"lastCommitNumber": "4963",
"change": "",
"changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 9 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\tnew file: cypress.config.js\n\tnew file: cypress/.gitignore\n\tnew file: cypress/fixtures/example.json\n\tnew file: cypress/support/commands.js\n\tnew file: cypress/support/e2e.js\n\tmodified: jest.config.js\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/services/toast.service.ts\n\tmodified: src/environments/environment.ts\n\tmodified: src/environments/suport/dev.ts\n\tmodified: src/environments/suport/doneIt.ts",
"changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 10 and 4 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/pages/agenda/event-actions-popover/event-actions-popover.page.ts\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/event-list/event-list.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts",
"changeAuthor": "eudes.inacio"
}