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

merge

Browse Source
This commit is contained in:
Peter Maquiran
2023-01-17 12:16:48 +01:00
parent 895b84b586 77e5fadb1f
commit cb9e9f2667
3 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/environments/environment.prod.ts
+9 -8
View File
@@ -1,21 +1,22 @@
import { versionData } from '../../version/git-version'
export const environment = {
// apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
apiURL: 'https://API.DONEIT.CO.AO/api/',
//apiURL: 'https://API.DONEIT.CO.AO/api/',
apiURL: 'https://gd-api.oapr.gov.ao/api/',
//apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',
// apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
// apiChatUrl: 'http://192.168.0.29:3000/api/v1/',
// apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',
//apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',
//apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
apiChatUrl: 'https://CHAT.DONEIT.CO.AO/api/v1/',
apiWsChatUrl: 'wss://CHAT.DONEIT.CO.AO/websocket',
/* apiChatUrl: 'https://CHAT.DONEIT.CO.AO/api/v1/',
apiWsChatUrl: 'wss://CHAT.DONEIT.CO.AO/websocket', */
apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',
apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',
// apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',
// apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
production: true,
domain: 'evandre.dasilva@equilibrium.co.ao',
defaultuser: 'evandre.dasilva@equilibrium.co.ao',//paulo.pinto@gabinetedigital.local
defaultuserpwd: 'Luand@1219', //tabteste@006,06,
domain: '',
defaultuser: '',//paulo.pinto@gabinetedigital.local
defaultuserpwd: '', //tabteste@006,06,
chatOffline: true,
presidencia: false,
version: versionData,
src/environments/environment.ts
+8 -6
View File
@@ -1,20 +1,22 @@
import { versionData } from '../../version/git-version'
export const environment = {
// apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
//apiURL: 'https://gd-api.oapr.gov.ao/api/',
apiURL: 'https://API.DONEIT.CO.AO/api/',
apiURL: 'https://gd-api.oapr.gov.ao/api/',
//apiURL: 'https://API.DONEIT.CO.AO/api/',
//apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',
// apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
// apiChatUrl: 'http://192.168.0.29:3000/api/v1/',
// apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',
//apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',
//apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
apiChatUrl: 'https://CHAT.DONEIT.CO.AO/api/v1/',
apiWsChatUrl: 'wss://CHAT.DONEIT.CO.AO/websocket',
//apiChatUrl: 'https://CHAT.DONEIT.CO.AO/api/v1/',
//apiWsChatUrl: 'wss://CHAT.DONEIT.CO.AO/websocket',
apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',
apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',
production: false,
domain: 'evandre.dasilva@equilibrium.co.ao',
defaultuser: 'evandre.dasilva@equilibrium.co.ao',//paulo.pinto@gabinetedigital.local
defaultuserpwd: 'Luand@1219', //tabteste@006,
defaultuser: 'ppinto@oapr.gov.ao',//paulo.pinto@gabinetedigital.local
defaultuserpwd: 'M@p2022', //tabteste@006,
chatOffline: true,
presidencia: false,
version: versionData,
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "50f2fd39a",
"SHA": "50f2fd39a2f8e3b7ff53abe4b1c93373d1e714fd",
"shortSHA": "895b84b58",
"SHA": "895b84b586c6a927cfb7000fa8bac3fa3a20a22e",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Tue Jan 17 10:47:45 2023 +0100'",
"lastCommitMessage": "fix merge",
"lastCommitNumber": "4633",
"lastCommitTime": "'Tue Jan 17 10:57:26 2023 +0100'",
"lastCommitMessage": "remove clock",
"lastCommitNumber": "4634",
"change": "",
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/chat/messages/messages.page.html\n\tmodified: src/app/shared/chat/messages/messages.page.html",
"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/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts\n\tmodified: version/git-version.ts",
"changeAuthor": "peter.maquiran"
}