Pramod Mahajan
|
fce9832ea2
|
Merge branch 'Issuses' of https://git.marcoaiot.com/admin/marco.pms.api into Issuses
|
2025-04-02 16:04:24 +05:30 |
|
|
|
5e9dd55a07
|
Added new validation in user login to verify if user is active or not and if user's email is confirmed or not
|
2025-04-02 16:04:12 +05:30 |
|
|
|
368e186e36
|
Fixed bug about UpdatedBy
|
2025-04-02 16:04:11 +05:30 |
|
|
|
97adf8b995
|
Fixed bug regrading passing incorrect tenantId and sending list of active and inactive employees rather than list of active or inc=active employees
|
2025-04-02 16:04:11 +05:30 |
|
|
|
8056247008
|
Fixed project duplicate bug appered due to absence of projectId
|
2025-04-02 16:04:11 +05:30 |
|
|
|
a502be4977
|
Solved time discrepancies in attendance/record
|
2025-04-02 16:04:11 +05:30 |
|
|
|
4936a99e57
|
Added the condition to check if received token for reset password is encoded or not
|
2025-04-02 16:04:11 +05:30 |
|
|
|
587530856a
|
Merge pull request 'Added new validation in user login to verify if user is active or not and if user's email is confirmed or not' (#11) from Ashutosh_User_Validations into Issuses
Reviewed-on: #11
|
2025-04-02 10:26:11 +00:00 |
|
|
|
0674f84a2c
|
Added new validation in user login to verify if user is active or not and if user's email is confirmed or not
|
2025-04-02 10:26:11 +00:00 |
|
|
|
c4dcd589db
|
Merge pull request 'Fixed bug regrading passing incorrect tenantId and sending list of active and inactive employees rather than list of active or inactive employees' (#10) from Ashutosh_Bug#37_Attendance_Issues into Issuses
Reviewed-on: #10
|
2025-04-02 10:25:06 +00:00 |
|
|
|
414bf7ece1
|
Fixed bug about UpdatedBy
|
2025-04-02 13:37:03 +05:30 |
|
|
|
ac6f52ce16
|
Fixed bug regrading passing incorrect tenantId and sending list of active and inactive employees rather than list of active or inc=active employees
|
2025-04-02 13:22:32 +05:30 |
|
|
|
7b0a1b0073
|
Merge branch 'Issuses' of https://git.marcoaiot.com/admin/marco.pms.api into Issuses
|
2025-03-31 17:23:50 +05:30 |
|
|
|
dd75f9a115
|
Fixed project duplicate bug appered due to absence of projectId
|
2025-03-31 17:23:25 +05:30 |
|
|
|
7fcb022ab3
|
Solved time discrepancies in attendance/record
|
2025-03-31 17:23:25 +05:30 |
|
|
|
bea2bcffb7
|
Added the condition to check if received token for reset password is encoded or not
|
2025-03-31 17:23:25 +05:30 |
|
|
|
2e19d2fe54
|
Added Industries table and Column IsActive In tables Tenant and ApplicayionUser
|
2025-03-31 16:31:17 +05:30 |
|
|
|
063441f322
|
Merge branch 'Ashutosh_SCRUM-58_Time_Discrepancies_Attendance' into Issuses
|
2025-03-31 13:11:24 +05:30 |
|
|
|
5a4b46cb4f
|
Merge branch 'Issuses' of https://git.marcoaiot.com/admin/marco.pms.api into Issuses
|
2025-03-31 13:01:44 +05:30 |
|
|
|
58526d5feb
|
Solved time discrepancies in attendance/record
|
2025-03-31 13:01:36 +05:30 |
|
|
|
35da59304d
|
Added the condition to check if received token for reset password is encoded or not
|
2025-03-31 13:01:35 +05:30 |
|
|
|
2c3463b74f
|
Merge pull request 'Fixed project duplicate bug appered due to absence of projectId' (#9) from Ashutosh_Bug#18_Project_Duplicate into Issuses
Reviewed-on: #9
|
2025-03-31 07:30:49 +00:00 |
|
|
|
c701187223
|
resolve merge coflict
|
2025-03-31 12:30:41 +05:30 |
|
|
|
bed58af120
|
resolvev merge coflict
|
2025-03-31 12:27:43 +05:30 |
|
|
|
93a25690f1
|
Fixed project duplicate bug appered due to absence of projectId
|
2025-03-31 11:23:30 +05:30 |
|
PramodMahajan14
|
7a1a4d6bdb
|
added condition for unique role name
|
2025-03-29 11:27:28 +05:30 |
|
|
|
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
Reviewed-on: #4
|
2025-03-28 13:00:56 +00:00 |
|
|
|
65ef5f9a5a
|
Added appsetting.Production.json file and configure cors settings for both development and production environment
|
2025-03-28 17:41:59 +05:30 |
|
|
|
b85bc3d62e
|
Merge pull request 'Solved time discrepancies in attendance/record' (#3) from Ashutosh_SCRUM-58_Time_Discrepancies_Attendance into Issuses
Reviewed-on: #3
|
2025-03-28 09:35:03 +00:00 |
|
|
|
8b4f892edf
|
Solved time discrepancies in attendance/record
|
2025-03-28 09:35:03 +00:00 |
|
|
|
597d86aa27
|
Merge pull request 'Added the condition to check if received token for reset password is encoded or not' (#2) from Ashutosh_SCRUM-62_Decodeing_Token_Reset_password into Issuses
Reviewed-on: #2
|
2025-03-28 09:34:33 +00:00 |
|
|
|
354680d28b
|
Solved time discrepancies in attendance/record
|
2025-03-28 13:45:06 +05:30 |
|
|
|
2a6ab929d9
|
Added the condition to check if received token for reset password is encoded or not
|
2025-03-28 13:08:50 +05:30 |
|
|
|
79753c33d3
|
Reset Migation Files
|
2025-03-26 11:20:48 +05:30 |
|
|
|
0ea14ff112
|
Push user rights branh
|
2025-03-25 13:01:56 +05:30 |
|
|
|
17d42f2cdf
|
Add main version branch
|
2025-03-25 11:53:37 +05:30 |
|
