Vikas Nale vikas.nale
  • Joined on 2025-03-19
vikas.nale pushed to vikas_deploy at admin/marco.pms.web 2025-03-31 11:29:50 +00:00
8ff2167088 remove image path
281527ef69 Changes fo environment variable for docker container
Compare 2 commits »
vikas.nale created branch vikas_deploy in admin/marco.pms.web 2025-03-31 11:29:50 +00:00
vikas.nale deleted branch Ashutosh_Task#15_SuspendTenant from admin/marco.pms.api 2025-03-31 07:44:06 +00:00
vikas.nale pushed to Issuses at admin/marco.pms.api 2025-03-31 07:41:41 +00:00
063441f322 Merge branch 'Ashutosh_SCRUM-58_Time_Discrepancies_Attendance' into Issuses
354680d28b Solved time discrepancies in attendance/record
Compare 2 commits »
vikas.nale pushed to main at admin/marco.pms.web 2025-03-31 07:37:52 +00:00
959e4dd7dd removed unwanted handeling on login page
899dac5afd replased env url
0cfd60dbe4 Resolved toast issue occured on the login page, added flag for axios
Compare 3 commits »
vikas.nale pushed to vikas_16_dockerdeployment at admin/marco.pms.web 2025-03-31 07:37:21 +00:00
8fc9cc2d2d chnages for background env variables
vikas.nale pushed to Issuses at admin/marco.pms.api 2025-03-31 07:31:51 +00:00
5a4b46cb4f Merge branch 'Issuses' of https://git.marcoaiot.com/admin/marco.pms.api into Issuses
58526d5feb Solved time discrepancies in attendance/record
35da59304d Added the condition to check if received token for reset password is encoded or not
c701187223 resolve merge coflict
bed58af120 resolvev merge coflict
Compare 8 commits »
vikas.nale pushed to Issuses at admin/marco.pms.api 2025-03-31 07:30:50 +00:00
2c3463b74f Merge pull request 'Fixed project duplicate bug appered due to absence of projectId' (#9) from Ashutosh_Bug#18_Project_Duplicate into Issuses
93a25690f1 Fixed project duplicate bug appered due to absence of projectId
Compare 2 commits »
vikas.nale merged pull request admin/marco.pms.api#9 2025-03-31 07:30:50 +00:00
Fixed project duplicate bug appered due to absence of projectId
vikas.nale closed pull request admin/marco.pms.api#8 2025-03-31 07:30:17 +00:00
Created a new API to delete tenant
vikas.nale commented on pull request admin/marco.pms.api#8 2025-03-31 07:30:17 +00:00
Created a new API to delete tenant

Resolved PR manually

vikas.nale pushed to TeanantManagement at admin/marco.pms.api 2025-03-31 07:29:55 +00:00
24c283559f Created a new API to delete tenant
vikas.nale closed pull request admin/marco.pms.api#7 2025-03-31 07:19:44 +00:00
Created a new API to update tenant infromation
vikas.nale commented on pull request admin/marco.pms.api#7 2025-03-31 07:19:44 +00:00
Created a new API to update tenant infromation

reolved manually

vikas.nale pushed to TeanantManagement at admin/marco.pms.api 2025-03-31 07:18:20 +00:00
053391ae44 merge conflict
636a6aab7b Removing the conflictes between Tenantmanagement and Ashutosh_Task#16_UpdateTenant branches
c69226c83e Removing the conflictes between Tenantmanagement and Ashutosh_Task#16_UpdateTenant branches
6ee508645a Created a new API to update tenant infromation
Compare 4 commits »
vikas.nale pushed to TeanantManagement at admin/marco.pms.api 2025-03-31 07:16:43 +00:00
5f345c69b9 merge confilct
01e88c7ee0 Created a new API to get Tenant Profile
1b0f0b831d Changed ActivityTime field in AttendanceLog Table and Remove Bugs from CreateTenant API
26e2de4e0e Created new API for creating new tenant
Compare 4 commits »
vikas.nale pushed to TeanantManagement at admin/marco.pms.api 2025-03-31 07:04:49 +00:00
cb370b97ea Resolve merge conflict with rebase
c701187223 resolve merge coflict
bed58af120 resolvev merge coflict
7a1a4d6bdb added condition for unique role name
cdd67c1137 Merge pull request 'Added appsetting.Production.json file and configure cors settings for both development and production environment' (#4) from Ashutosh_Bug#1_Cors_Configuration into main
Compare 6 commits »
vikas.nale closed pull request admin/marco.pms.api#5 2025-03-31 07:01:49 +00:00
added condition for unique role name
vikas.nale commented on pull request admin/marco.pms.api#5 2025-03-31 07:01:49 +00:00
added condition for unique role name

Merged PR manually

vikas.nale pushed to main at admin/marco.pms.api 2025-03-31 07:00:44 +00:00
c701187223 resolve merge coflict
bed58af120 resolvev merge coflict
7a1a4d6bdb added condition for unique role name
Compare 3 commits »