1245 Commits

Author SHA1 Message Date
bb31e33983 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.api into Organization_Management 2025-09-18 12:02:44 +05:30
51d86d7bfc Merge pull request 'Ashutosh_Subscription_Plan' (#131) from Ashutosh_Subscription_Plan into main
Reviewed-on: #131
2025-09-18 06:32:18 +00:00
2039d84918 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.api into Ashutosh_Subscription_Plan 2025-09-18 12:01:57 +05:30
0ecc07777f Resolved the multi-threading issue 2025-09-18 12:01:08 +05:30
0dd5633f2e Resolved the multi-threading issue 2025-09-18 11:53:05 +05:30
f8182494d2 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.api into Organization_Management 2025-09-18 11:38:31 +05:30
dbd551e08c Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.api 2025-09-18 11:34:03 +05:30
d9e0c2ee57 Resloved the issue #1125 2025-09-18 11:33:59 +05:30
db0d464ab5 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.api into Organization_Management 2025-09-18 10:26:29 +05:30
55cae17ed1 Added the API og list organization 2025-09-18 10:25:59 +05:30
846b3ed6e3 Merge pull request 'Ashutosh_Get_All_Permission' (#130) from Ashutosh_Get_All_Permission into main
Reviewed-on: #130
2025-09-18 04:52:11 +00:00
4a25158cc9 Added the Promoter and PMC in project 2025-09-17 18:09:58 +05:30
0eb740fa25 Added the organization forgin key in tenant table and removed the tenantId from application user 2025-09-17 15:01:40 +05:30
5158153ee6 Added the forign key of organization in eployee table 2025-09-17 14:40:04 +05:30
4884bf5de0 Checking the manage infra permission when getting the infra 2025-09-17 13:17:38 +05:30
368fd37115 Removed the employee management from project-level permissions 2025-09-17 12:47:09 +05:30
68cd5acc9c Added the HasApplicationAccess parameter in employees table 2025-09-17 12:27:13 +05:30
30623d6bbc Added the create organization API 2025-09-17 12:01:22 +05:30
1e8c967d7a Added migration for Organization related permissions 2025-09-17 11:40:03 +05:30
cda8005b1b Added the Organization related permissions 2025-09-17 11:35:53 +05:30
8d97b2a687 Added the create global service API 2025-09-17 11:15:06 +05:30
061f287e8c Added the API to get global services 2025-09-17 11:01:34 +05:30
84baa3a147 Added the subscription list API in Market Controller 2025-09-16 18:17:43 +05:30
fae6d7bbe9 Added the CRUD operation for services, activity group, activity 2025-09-16 15:29:32 +05:30
0ef9d66cf1 Adding the models related to organizations 2025-09-16 15:27:44 +05:30
d9a1832e2e updated the get project-level permissions 2025-09-16 15:05:32 +05:30
122e7074b8 Added the GetAllPermissionFroProject API 2025-09-16 13:34:22 +05:30
e1b045f852 Merge pull request 'Document_Manager' (#129) from Document_Manager into main
Reviewed-on: #129
2025-09-11 04:12:00 +00:00
f75c31b3ce Added the check for checking uniquness of document ID 2025-09-10 11:52:13 +05:30
01f214a60b Added the TotalRecords parameter to get contact list API response 2025-09-10 10:27:24 +05:30
935f5345b9 Solved the rebase issues 2025-09-09 16:38:24 +05:30
5263e89df6 Merge pull request 'Directory_Refactor' (#128) from Directory_Refactor into Document_Manager
Reviewed-on: #128
2025-09-09 11:03:45 +00:00
7324537a90 Solved the rebase issues 2025-09-09 16:33:23 +05:30
caeac04d0d Added the logic to bypass the seat check condition 2025-09-09 15:29:26 +05:30
33ebee08db Merge pull request 'Mobile_Logger_Feature' (#127) from Mobile_Logger_Feature into Directory_Refactor
Reviewed-on: #127
2025-09-09 05:19:45 +00:00
d51d7da4f8 Merge branch 'Directory_Refactor' of https://git.marcoaiot.com/admin/marco.pms.api into Mobile_Logger_Feature 2025-09-09 10:49:13 +05:30
de08ceeb0d reduce the otp exprie time to 5 mins 2025-09-08 15:12:26 +05:30
ecabf52f2f splited the logic to get employee by projecr id 2025-09-08 15:09:25 +05:30
aa2a370467 getting the employee list filtered by tenant 2025-09-08 15:07:30 +05:30
73318060ec Added the distinct in get employee list 2025-09-08 14:58:16 +05:30
365439b2de only send employee with unique IDs when getting list 2025-09-08 14:49:14 +05:30
06db1adc52 Added the debug logs in log controller 2025-09-08 11:47:53 +05:30
4f77431541 Changed the folder name 2025-09-08 10:32:32 +05:30
1fd0837640 Solved the rebase error 2025-09-08 10:26:05 +05:30
672046d02e Added the contact note filter in get all contact notes API 2025-09-05 17:48:25 +05:30
48562235f5 Added the get filter APIs for contacts and contact notes 2025-09-04 16:57:37 +05:30
d507b9ede2 Intregating the project-level permissions in document controller 2025-09-04 14:52:25 +05:30
194764c9d6 Solving the rebase confilt 2025-09-04 12:42:44 +05:30
28caee40e3 Adding the overwriting the project-level permissions to tenant-level permission 2025-09-04 12:39:25 +05:30
4a13386546 Optimized the get employee list for project-level permission 2025-09-04 12:27:48 +05:30