Block a user
9c4b1639fe
Merge branch 'Feature_Task_management' of https://git.marcoaiot.com/admin/marco.pms.api into Feature_Task_management
04d6c03b05
Merge pull request 'Ashutosh_Employee_Update_Validation' (#13) from Ashutosh_Employee_Update_Validation into Issuses
e50eedc7e6
Added validation in Employee Create and update api to check Whether this email and Id belongs to same employee
04d6c03b05
Merge pull request 'Ashutosh_Employee_Update_Validation' (#13) from Ashutosh_Employee_Update_Validation into Issuses
e50eedc7e6
Added validation in Employee Create and update api to check Whether this email and Id belongs to same employee
04d6c03b05
Merge pull request 'Ashutosh_Employee_Update_Validation' (#13) from Ashutosh_Employee_Update_Validation into Issuses
e50eedc7e6
Added validation in Employee Create and update api to check Whether this email and Id belongs to same employee
Ashutosh_Employee_Update_Validation
6ae2912a52
Merge pull request 'user profile api returns duplicate FeaturePermissions. This makes permission checks impossible, as multiple permissions return the same feature ID. Instead it will return the permissionID, also now passing the list featureid's in the response' (#12) from vikas_38_featurepermission_issue into main
c4952825fe
user profile api returns duplicate FeaturePermissions. This makes permission checks impossible, as multiple permissions return the same feature ID. Instead it will return the permissionID, also now passing the list featureid's in the response
user profile api returns duplicate FeaturePermissions. This makes permission checks impossible, as multiple permissions return the same feature ID. Instead it will return the permissionID, also now passing the list featureid's in the response
user profile api returns duplicate FeaturePermissions. This makes permission checks impossible, as multiple permissions return the same feature ID. Instead it will return the permissionID, also now passing the list featureid's in the response
vikas.nale
pushed to vikas_38_featurepermission_issue at admin/marco.pms.api
2025-04-02 10:29:03 +00:00
c4952825fe
user profile api returns duplicate FeaturePermissions. This makes permission checks impossible, as multiple permissions return the same feature ID. Instead it will return the permissionID, also now passing the list featureid's in the response
vikas.nale
created branch vikas_38_featurepermission_issue in admin/marco.pms.api
2025-04-02 10:29:03 +00:00
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
0674f84a2c
Added new validation in user login to verify if user is active or not and if user's email is confirmed or not
Added new validation in user login to verify if user is active or not and if user's email is confirmed or not
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
ac6f52ce16
Fixed bug regrading passing incorrect tenantId and sending list of active and inactive employees rather than list of active or inc=active employees
Fixed bug regrading passing incorrect tenantId and sending list of active and inactive employees rather than list of active or inactive employees