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

pull made

Browse Source
This commit is contained in:
Eudes Inácio
2023-08-30 11:20:13 +01:00
parent bf1337f5db 8030e4e53f
commit 95e24aa1e4
9 changed files with 23 additions and 163 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": "3d986e864",
"SHA": "3d986e864cc30706b5022aa59325cfe2b8c466ab",
"shortSHA": "bf1337f5d",
"SHA": "bf1337f5dbfbd28acef03ae1e02cf2086c126075",
"branch": "developer-prod",
"lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Tue Aug 29 16:05:32 2023 +0100'",
"lastCommitMessage": "profile picture done",
"lastCommitNumber": "5230",
"lastCommitTime": "'Wed Aug 30 11:17:17 2023 +0100'",
"lastCommitMessage": "PR have the same actions that MD have on events to aprove",
"lastCommitNumber": "5231",
"change": "",
"changeStatus": "On branch developer-prod\nYour branch is behind 'origin/developer-prod' by 4 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 <file>...\" to unstage)\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/header/header.page.ts",
"changeStatus": "On branch developer-prod\nYour branch and 'origin/developer-prod' have diverged,\nand have 1 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/agenda.page.html\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.scss\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.scss\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.scss\n\tmodified: src/app/shared/gabinete-digital/generic/task-list/task-list.page.scss\n\tmodified: src/global.scss",
"changeAuthor": "eudes.inacio"
}