Commit Graph

Select branches

Hide Pull Requests

Activity_Hierarchy

Approve_Task

Ashutosh_ActivityMaster_managenment

Ashutosh_AddServerHeade_False

Ashutosh_AllowCredentials

Ashutosh_Bug#108_Attendance_log

Ashutosh_Bug#114_Email_Template_Not_Found

Ashutosh_Bug#119_Remove_CheckList_Item

Ashutosh_Bug#125_Unable_To_Add_Checklist_Item

Ashutosh_Bug#18_Project_Duplicate

Ashutosh_Bug#1_Cors_Configuration

Ashutosh_Bug#37_Attendance_Issues

Ashutosh_Bug_#74_Attendance_Regularization_Date

Ashutosh_Bug_#75_Employee_duplicatation

Ashutosh_CreateNewTenant

Ashutosh_Dashboard

Ashutosh_Employee_Update_Validation

Ashutosh_Enhancement_#104_Store_Images_In_AmazonS3

Ashutosh_Enhancement_#123_Possible_Null_Reference

Ashutosh_Enhancement_#214_Report_Task_At_Zero

Ashutosh_Forum_APIs

Ashutosh_JWT_Token

Ashutosh_Null_Refrenance_Warning_Fixed

Ashutosh_SCRUM-58_Time_Discrepancies_Attendance

Ashutosh_SCRUM-62_Decodeing_Token_Reset_password

Ashutosh_Task#106_Upload_Whitelist_Only

Ashutosh_Task#14_TenantProfile

Ashutosh_Task#1609

Ashutosh_Task#16_UpdateTenant

Ashutosh_Task_#67_Request_Demo

Ashutosh_Task_#79_Get_Industries_API

Ashutosh_User_Validations

Brevo_Mailling

Change_MPIN_Digits

Dynamic_Filter

Feature_Image_Gallary

Feature_Task_management

Finance_Dashboards

Inventory_Management

Issues_April_4W

Issuses

OnFieldWork_V1

Payment_Gatway_Management_OFW

Project_Report_Datewise

Purchase_Invoice_Management

Response_Encryption

Service_Project_Management

SideMenu_Management

TeanantManagement

TenantManagementV1

Update_Email_Template

Upgrade_Expense

Upgrade_Expense_Main

UserRights

Vaibhav_Resolved_Issues

Weidget_Dashboard_Jobs

contact_import

main

pramod_Refactoring#12_UniqueApplicationRole

pramod_Task#448

vikas_38_featurepermission_issue

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#16

#17

#18

#19

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

Mono Color

• 42da1f12cf Added the assigned by in organization mapping ashutosh.nehete 2025-09-24 17:20:09 +05:30
• c5da400e6b Enhanced the manage employe API ashutosh.nehete 2025-09-24 13:06:51 +05:30
• a405cfec13 If team meamber not found send empty ashutosh.nehete 2025-09-23 13:24:19 +05:30
• bc3e927777 Solved the typo ashutosh.nehete 2025-09-23 13:17:58 +05:30
• c304b615f7 Fixed the spelling mistake ashutosh.nehete 2025-09-23 13:15:11 +05:30
• 8d64e9702d Added the get filter API in image gallery ashutosh.nehete 2025-09-23 13:05:23 +05:30
• 98acbb66d6 Merge pull request 'Added the new parameter of service ids in image gallery filter' (#137) from Ashutosh_Enhancement_#1297 into Organization_Management ashutosh.nehete 2025-09-23 06:26:27 +00:00
• 81d1137939 Added the new parameter of service ids in image gallery filter ashutosh.nehete 2025-09-23 11:55:29 +05:30
• 0c6f5e0df0 Merge pull request 'Added the filter and pagenation in get task list API' (#136) from Ashutosh_Enhancement_#1293 into Organization_Management ashutosh.nehete 2025-09-23 06:15:47 +00:00
• f45bc29a44 Added the filter and pagenation in get task list API ashutosh.nehete 2025-09-23 11:34:14 +05:30
• ef84ba34da Addedd the tenant ID in employee profile cache ashutosh.nehete 2025-09-21 18:10:25 +05:30
• bd421d45aa Added the Jobrole in attendance ashutosh.nehete 2025-09-21 16:37:15 +05:30
• 777a72c71f Filtered the employees in attendance by organization ashutosh.nehete 2025-09-21 16:11:23 +05:30
• 264c9466c9 Chnaged the logic check if tenant and organization have any relation ashutosh.nehete 2025-09-21 15:37:55 +05:30
• a1f6552347 Added OrganizationID in JWT token ashutosh.nehete 2025-09-21 11:44:38 +05:30
• 06c5457981 Added the new API to get detailed list of services and enhanced the get work-items list to filter by service ashutosh.nehete 2025-09-21 11:36:09 +05:30
• 0ba4ccf45c Added the logic to filter by service Id ashutosh.nehete 2025-09-20 19:25:33 +05:30
• 84e2f840b4 distinct the organization in Get Assigned Organizations To Project API ashutosh.nehete 2025-09-20 18:37:08 +05:30
• 34b89c4718 Solved the rebase issues ashutosh.nehete 2025-09-20 18:06:37 +05:30
• d0745e8688 Merge pull request 'Firebase_Implementation' (#135) from Firebase_Implementation into main ashutosh.nehete 2025-09-20 12:11:54 +00:00
• 7d85cb5f4c Added the serviceId in project allocation ashutosh.nehete 2025-09-20 17:05:30 +05:30
• 9b59a4d6b6 Added the organization filter in get project allocation API ashutosh.nehete 2025-09-20 14:58:32 +05:30
• 7e0322c859 Chnage the keyword modefied to modified ashutosh.nehete 2025-09-20 12:44:39 +05:30
• 05bfa48115 added the TenantStatus and Industry in get tenant list API ashutosh.nehete 2025-09-20 12:30:37 +05:30
• 091d73958d Added the comma seprated project IDs to notification data ashutosh.nehete 2025-09-20 12:25:48 +05:30
• f45ada2be2 Changed the login endpoints ashutosh.nehete 2025-09-20 12:06:27 +05:30
• bcc416f47e Changed the Login Flow for auth controller and added the get tenant list and select tenant ashutosh.nehete 2025-09-20 11:40:04 +05:30
• ee1cb73fe5 Added the commit statement in assign organization to tenant API ashutosh.nehete 2025-09-20 11:33:01 +05:30
• eba1a70037 Added the data notification in delete employee API ashutosh.nehete 2025-09-20 11:12:32 +05:30
• 2f03de97d6 Added the total pages, page number, tota count in response ashutosh.nehete 2025-09-19 21:13:53 +05:30
• a1ab143df5 Fixed the error of checking the updated date to uploaded date ashutosh.nehete 2025-09-19 18:02:29 +05:30
• 64e6255458 Solved the rebase issuees ashutosh.nehete 2025-09-19 17:51:27 +05:30
• aa596b736d If service not exist in databse the not added in mapping ashutosh.nehete 2025-09-19 16:56:31 +05:30
• 3884c74d9b First saving the project sevice mapping then the project org mapping ashutosh.nehete 2025-09-19 16:46:41 +05:30
• 7f2b9f0ceb Merge pull request 'Added the API to get the organization list assigned to the project' (#134) from Ashutosh_Task#1246 into Organization_Management ashutosh.nehete 2025-09-19 10:36:49 +00:00
• f633e11e97 Added the API to get the organization list assigned to the project ashutosh.nehete 2025-09-19 16:04:32 +05:30
• 5fab8371ac Merge pull request 'Added the API to assign the organization to tenant' (#133) from Ashutosh_Task#1239 into Organization_Management ashutosh.nehete 2025-09-19 10:04:08 +00:00
• 2e0ea562fe Added the API to assign the organization to tenant ashutosh.nehete 2025-09-19 15:31:07 +05:30
• 8c97c78408 Added the API to get organization type list ashutosh.nehete 2025-09-19 14:53:55 +05:30
• 86102ef70d Merge pull request 'Added the API to get list of services according to the project and logged in employee' (#132) from Ashutosh_Task#1225 into Organization_Management ashutosh.nehete 2025-09-19 08:53:59 +00:00
• 009ac36e38 Changed the response message for get services API ashutosh.nehete 2025-09-19 14:22:14 +05:30
• d38bc4752a Added the API to get list of services according to the project and logged in employee ashutosh.nehete 2025-09-19 14:15:41 +05:30
• 77db9a6bd9 Added the services in master menu list ashutosh.nehete 2025-09-19 11:42:23 +05:30
• d452faf6a9 Solved the misssig key word ashutosh.nehete 2025-09-18 18:11:57 +05:30
• 2ce294904b Checking the project levelmpermission in project controller ashutosh.nehete 2025-09-18 18:04:22 +05:30
• 1e66dd2017 Added the deassiged service from project API ashutosh.nehete 2025-09-18 17:23:50 +05:30
• aed6949187 Added IsActive In ProjectServiceMapping Table ashutosh.nehete 2025-09-18 16:54:37 +05:30
• b069e9f07d Changed the check of the add note API ashutosh.nehete 2025-09-18 16:17:48 +05:30
• d41c49af7b Removed the Document ID Uniqueness ashutosh.nehete 2025-09-18 15:55:45 +05:30
• a10b24523e Added the checks to check the Designation and Description in contact ashutosh.nehete 2025-09-18 15:42:49 +05:30
• efd8667774 Added the VM in assign organization to project ashutosh.nehete 2025-09-18 15:18:33 +05:30
• ac672d0cc2 Added the document ID in document controller firebase data notification ashutosh.nehete 2025-09-18 15:04:41 +05:30
• de883103d5 Added the assign organization to project API ashutosh.nehete 2025-09-18 13:10:08 +05:30
• bb31e33983 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.api into Organization_Management ashutosh.nehete 2025-09-18 12:02:44 +05:30
• 51d86d7bfc Merge pull request 'Ashutosh_Subscription_Plan' (#131) from Ashutosh_Subscription_Plan into main ashutosh.nehete 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 ashutosh.nehete 2025-09-18 12:01:57 +05:30
• 0ecc07777f Resolved the multi-threading issue ashutosh.nehete 2025-09-18 12:01:08 +05:30
• 0dd5633f2e Resolved the multi-threading issue ashutosh.nehete 2025-09-18 11:53:05 +05:30
• f8182494d2 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.api into Organization_Management ashutosh.nehete 2025-09-18 11:38:31 +05:30
• dbd551e08c Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.api ashutosh.nehete 2025-09-18 11:34:03 +05:30
• d9e0c2ee57 Resloved the issue #1125 ashutosh.nehete 2025-09-18 11:33:59 +05:30
• db0d464ab5 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.api into Organization_Management ashutosh.nehete 2025-09-18 10:26:29 +05:30
• 55cae17ed1 Added the API og list organization ashutosh.nehete 2025-09-18 10:25:59 +05:30
• 846b3ed6e3 Merge pull request 'Ashutosh_Get_All_Permission' (#130) from Ashutosh_Get_All_Permission into main ashutosh.nehete 2025-09-18 04:52:11 +00:00
• 3f8024421a Sending the data message to all employees asigned to the project ashutosh.nehete 2025-09-18 10:07:05 +05:30
• 9d71a71a53 Sending the attendance data notification to all employees from the project ashutosh.nehete 2025-09-18 09:56:39 +05:30
• 4a25158cc9 Added the Promoter and PMC in project ashutosh.nehete 2025-09-17 18:09:58 +05:30
• 20b12cfcd4 Added the contactId in firebase for directory notification ashutosh.nehete 2025-09-17 17:19:55 +05:30
• 0eb740fa25 Added the organization forgin key in tenant table and removed the tenantId from application user ashutosh.nehete 2025-09-17 15:01:40 +05:30
• 5158153ee6 Added the forign key of organization in eployee table ashutosh.nehete 2025-09-17 14:40:04 +05:30
• 4884bf5de0 Checking the manage infra permission when getting the infra ashutosh.nehete 2025-09-17 13:17:38 +05:30
• 368fd37115 Removed the employee management from project-level permissions ashutosh.nehete 2025-09-17 12:47:09 +05:30
• 68cd5acc9c Added the HasApplicationAccess parameter in employees table ashutosh.nehete 2025-09-17 12:27:13 +05:30
• 30623d6bbc Added the create organization API ashutosh.nehete 2025-09-17 12:01:22 +05:30
• 1e8c967d7a Added migration for Organization related permissions ashutosh.nehete 2025-09-17 11:40:03 +05:30
• cda8005b1b Added the Organization related permissions ashutosh.nehete 2025-09-17 11:35:53 +05:30
• 8d97b2a687 Added the create global service API ashutosh.nehete 2025-09-17 11:15:06 +05:30
• 061f287e8c Added the API to get global services ashutosh.nehete 2025-09-17 11:01:34 +05:30
• 84baa3a147 Added the subscription list API in Market Controller ashutosh.nehete 2025-09-16 18:17:43 +05:30
• fae6d7bbe9 Added the CRUD operation for services, activity group, activity ashutosh.nehete 2025-09-16 15:29:32 +05:30
• 0ef9d66cf1 Adding the models related to organizations ashutosh.nehete 2025-09-16 15:27:44 +05:30
• d9a1832e2e updated the get project-level permissions ashutosh.nehete 2025-09-16 15:05:32 +05:30
• 122e7074b8 Added the GetAllPermissionFroProject API ashutosh.nehete 2025-09-16 13:34:22 +05:30
• cdc2afb688 Added the update bucket query ashutosh.nehete 2025-09-16 11:36:38 +05:30
• 892facef40 Added the projectID and employeeID in document modification notification ashutosh.nehete 2025-09-15 18:04:44 +05:30
• 0b150fed9a Checking the correct permission updating the notes ashutosh.nehete 2025-09-15 17:04:18 +05:30
• b17d1d30e5 taken the requried service from thread ashutosh.nehete 2025-09-15 17:01:29 +05:30
• a0789f7f8e Corrected the spell mistake in firebase keywords ashutosh.nehete 2025-09-15 16:31:43 +05:30
• 7d30831408 Removed the requried from base64 when getting any attachment ashutosh.nehete 2025-09-15 16:24:47 +05:30
• 87ebee8005 Added the firebase notification in document controller ashutosh.nehete 2025-09-12 18:02:58 +05:30
• a88446ceb5 Added the firebase notification in directory controller ashutosh.nehete 2025-09-12 16:31:39 +05:30
• 5717bb6dac Added the joining date parameter when creating or update employee using the mobiles ashutosh.nehete 2025-09-12 12:46:07 +05:30
• cf35b8c773 Added the IsAttachmentRequried parameter to ExpensesTypeMaster table ashutosh.nehete 2025-09-12 12:38:26 +05:30
• 5105da7b54 Resloved the rebase ashutosh.nehete 2025-09-12 09:46:39 +05:30
• e1b045f852 Merge pull request 'Document_Manager' (#129) from Document_Manager into main ashutosh.nehete 2025-09-11 04:12:00 +00:00
• f75c31b3ce Added the check for checking uniquness of document ID ashutosh.nehete 2025-09-10 11:52:13 +05:30
• 01f214a60b Added the TotalRecords parameter to get contact list API response ashutosh.nehete 2025-09-10 10:27:24 +05:30
• 935f5345b9 Solved the rebase issues ashutosh.nehete 2025-09-09 16:38:24 +05:30
• 5263e89df6 Merge pull request 'Directory_Refactor' (#128) from Directory_Refactor into Document_Manager ashutosh.nehete 2025-09-09 11:03:45 +00:00
• 7324537a90 Solved the rebase issues ashutosh.nehete 2025-09-09 16:33:23 +05:30