|
|
c44deb439e
|
Removed all warning
|
2025-04-09 16:29:38 +05:30 |
|
|
|
52a67ba15b
|
Removed null refreance warning from MOdel project
|
2025-04-09 10:25:44 +05:30 |
|
|
|
58bb684c4b
|
Removed all Warnings from Services project
|
2025-04-09 09:18:15 +05:30 |
|
|
|
ec5fba0637
|
Fixed null refrenance warning
|
2025-04-09 08:46:29 +05:30 |
|
|
|
56448cb8a2
|
Created new Api fro getting Attendance of emplyee who requested regularization
|
2025-04-08 16:47:24 +05:30 |
|
|
|
7ddb1e2f8e
|
Fixed the bug of Attendance Regularization
|
2025-04-08 16:09:50 +05:30 |
|
|
|
727e4794da
|
Fixed some miner bugs
|
2025-04-07 18:07:37 +05:30 |
|
|
|
41edbef9d1
|
Chenaged response of manage task in project API
|
2025-04-07 11:34:40 +05:30 |
|
|
|
0b81a6ea62
|
Make changes in report api to check if user reporting second time.
|
2025-04-07 09:42:38 +05:30 |
|
|
|
745b4d2e1c
|
Created new view models for showing taskAllication list and comment
|
2025-04-05 17:16:32 +05:30 |
|
|
|
64c4772595
|
fixed missing http method
|
2025-04-04 16:09:47 +05:30 |
|
|
|
7ddb37852e
|
Added Apis for task allocations
|
2025-04-04 15:42:42 +05:30 |
|
|
|
352b4fb40e
|
Changed Response format of all APIs
|
2025-04-03 15:50:54 +05:30 |
|
|
|
9c4b1639fe
|
Merge branch 'Feature_Task_management' of https://git.marcoaiot.com/admin/marco.pms.api into Feature_Task_management
|
2025-04-02 18:37:29 +05:30 |
|
|
|
1b16983092
|
#40 - Add models and database migration for Task Allocation
|
2025-04-02 18:37:15 +05:30 |
|
|
|
e6fb6a23b5
|
#40 - Add models and database migration for Task Allocation
|
2025-04-02 18:35:58 +05:30 |
|
|
|
04d6c03b05
|
Merge pull request 'Ashutosh_Employee_Update_Validation' (#13) from Ashutosh_Employee_Update_Validation into Issuses
Reviewed-on: #13
|
2025-04-02 13:04:43 +00:00 |
|
|
|
e50eedc7e6
|
Added validation in Employee Create and update api to check Whether this email and Id belongs to same employee
|
2025-04-02 17:54:38 +05:30 |
|
Pramod Mahajan
|
5034da19cd
|
added condition for unique role name.
|
2025-04-02 16:53:35 +05:30 |
|
Pramod Mahajan
|
3fce6ef499
|
Merge branch 'Issuses' of https://git.marcoaiot.com/admin/marco.pms.api into Issuses
|
2025-04-02 16:53:08 +05:30 |
|
|
|
eba230723b
|
Fixed bug about UpdatedBy
|
2025-04-02 16:08:02 +05:30 |
|
|
|
69a4ad7286
|
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:08:02 +05:30 |
|
|
|
212fe250c1
|
Solved time discrepancies in attendance/record
|
2025-04-02 16:08:01 +05:30 |
|
|
|
a42a924884
|
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:06:53 +05:30 |
|
|
|
bec60cd24e
|
Fixed bug about UpdatedBy
|
2025-04-02 16:06:53 +05:30 |
|
|
|
c17b5df8d0
|
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:06:53 +05:30 |
|
|
|
a9124e1a93
|
Fixed project duplicate bug appered due to absence of projectId
|
2025-04-02 16:06:53 +05:30 |
|
|
|
f0ed430f37
|
Solved time discrepancies in attendance/record
|
2025-04-02 16:06:53 +05:30 |
|
|
|
c071b7ecaf
|
Added the condition to check if received token for reset password is encoded or not
|
2025-04-02 16:06:53 +05:30 |
|
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 |
|
|
|
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
Reviewed-on: #12
|
2025-04-02 10:29:53 +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
|
2025-04-02 15:58:48 +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 |
|
