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

pull made

Browse Source
This commit is contained in:
Eudes Inácio
2023-02-13 19:46:44 +01:00
parent b21a3350ec
commit 5a90b21252
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/environments/environment.prod.ts
+1 -1
View File
@@ -3,4 +3,4 @@ import { oaprProd } from './suport/oapr'
import { doneITProd } from './suport/doneIt' import { doneITProd } from './suport/doneIt'
export const environment: Environment = doneITProd; export const environment: Environment = oaprProd;
src/environments/environment.ts
+1 -1
View File
@@ -3,4 +3,4 @@ import { oaprDev } from './suport/oapr'
import { doneITDev } from './suport/doneIt' import { doneITDev } from './suport/doneIt'
export const environment: Environment = doneITDev; export const environment: Environment = oaprDev;
version/git-version.ts
+7 -7
View File
@@ -1,12 +1,12 @@
export let versionData = { export let versionData = {
"shortSHA": "b1160a179", "shortSHA": "b21a3350e",
"SHA": "b1160a179cd14a4f291f872e1144ffad74215b9c", "SHA": "b21a3350ec5135e0be63566be04f5599127044fd",
"branch": "no_bug_movemente", "branch": "no_bug_movemente",
"lastCommitAuthor": "'Peter Maquiran'", "lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Mon Feb 13 19:34:00 2023 +0100'", "lastCommitTime": "'Mon Feb 13 19:35:16 2023 +0100'",
"lastCommitMessage": "plura worlds", "lastCommitMessage": "merge",
"lastCommitNumber": "4775", "lastCommitNumber": "4778",
"change": "", "change": "",
"changeStatus": "On branch no_bug_movemente\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/add-note/add-note.page.html\n\tmodified: src/app/modals/create-process/create-process.page.html\n\tmodified: src/app/modals/dar-parecer/dar-parecer.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.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/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.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/new-event/new-event.page.html\n\tmodified: version/git-version.ts", "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 <file>...\" to unstage)\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts",
"changeAuthor": "peter.maquiran" "changeAuthor": "eudes.inacio"
} }