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

Enhancement#1790

Enhancement#1791

Enhancement#1792

Feature_Image_Gallary

Feature_Plan_Review

Feature_Task_management

Finance_Dashboards

Inventory_Management

Issues_April_4W

Issuses

MediatR_Management

OnFieldWork_V1

Payment_Gatway_Management_OFW

Permission_Granular_Control

Project_Report_Datewise

Purchase_Invoice_Management

Purchase_Order

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

feature_email_templates

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

#157

#158

#159

#16

#160

#161

#162

#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

• 2c445878d0 project details API is split into three APIs. ashutosh.nehete 2025-07-01 12:39:07 +05:30
• a3de905159 Chnaged the name of view employee feature permission to view team members ashutosh.nehete 2025-06-30 16:58:28 +05:30
• 5f9ca98284 Implemented the view employee and view all employee permission to employee list API ashutosh.nehete 2025-06-30 16:33:50 +05:30
• 00c30eb2cc Merge pull request 'Ashutosh_Enhancement_#622' (#98) from Ashutosh_Enhancement_#622 into Issues_June_3W Vikas Nale 2025-06-30 10:13:46 +00:00
• 2a507bf7b0 Implemented View all employee permission in employee list API ashutosh.nehete 2025-06-30 15:29:29 +05:30
• 5a3dd42630 Added migration for new feature permissio and chnaged features for view infra and manage infra to project management ashutosh.nehete 2025-06-30 13:13:12 +05:30
• ea80176eec Merge pull request 'Added a return statement after saving the contact tag.' (#97) from Ashutosh_Task_#237 into Issues_June_3W ashutosh.nehete 2025-06-30 05:04:10 +00:00
• d817170d0f Added a return statement after saving the contact tag. ashutosh.nehete 2025-06-30 10:31:01 +05:30
• b7386d0c98 Merge pull request 'Ashutosh_Task#513' (#96) from Ashutosh_Task#513 into Issues_June_3W ashutosh.nehete 2025-06-28 04:27:28 +00:00
• 8c691c5d3e Merge branch 'Ashutosh_Task#513' of https://git.marcoaiot.com/admin/marco.pms.api into Ashutosh_Task#513 ashutosh.nehete 2025-06-28 09:51:30 +05:30
• 8d35063ced Merge pull request 'Ashutosh_Task#513' (#95) from Ashutosh_Task#513 into Issues_June_3W ashutosh.nehete 2025-06-27 11:45:54 +00:00
• 2128e630d5 Added conatct name nd organization name in all contact note VMs ashutosh.nehete 2025-06-27 11:50:51 +05:30
• 9149c4e546 Filtered conatct notes by projects and added contact name and organization name in list VM ashutosh.nehete 2025-06-27 10:58:29 +05:30
• d12f8ed0fb Added conatct name nd organization name in all contact note VMs ashutosh.nehete 2025-06-27 11:50:51 +05:30
• 90c5308d76 Filtered conatct notes by projects and added contact name and organization name in list VM ashutosh.nehete 2025-06-27 10:58:29 +05:30
• 083f2c53d5 Updated CRUD APIs for Activity Management to include functionality for storing Service ID and Activity Group ID as foreign keys. ashutosh.nehete 2025-06-27 09:39:27 +05:30
• c5830fb222 Implement CRUD API for Activity Groups ashutosh.nehete 2025-06-26 17:59:17 +05:30
• 3bab7badb3 Implemented CRUD API for services ashutosh.nehete 2025-06-26 17:57:58 +05:30
• f6fa0bee1e Implemented Skeleton for CRUD APIs for Services and Activity Groups ashutosh.nehete 2025-06-26 17:42:24 +05:30
• f3cf2092a9 Added Models for Service and Activity Group and Updated Activity Master Model Also added DTOs and VMs for Service and Activity Group and Updated DTOs and VMs for Activity Master ashutosh.nehete 2025-06-26 17:27:17 +05:30
• 70c1c6da9d Merge branch 'Issues_June_3W' of https://git.marcoaiot.com/admin/marco.pms.api into Issues_June_3W ashutosh.nehete 2025-06-24 16:33:05 +05:30
• e3ddcee8b3 Implemented An API to get list of all notes ashutosh.nehete 2025-06-23 14:50:50 +05:30
• 0d49163d7b Merge pull request 'When task is approved stored approved tasks in reported task field not in completed task' (#93) from Ashutosh_Bug#529 into Approve_Task_Feature ashutosh.nehete 2025-06-24 06:06:37 +00:00
• b94f4bdb63 When task is approved stored approved tasks in reported task field not in completed task ashutosh.nehete 2025-06-24 11:30:50 +05:30
• 373d80260f Removed demo objects for which is used for testing purpose ashutosh.nehete 2025-06-24 10:10:03 +05:30
• 2ed0e6e5b6 Merge branch 'Issues_June_3W' of https://git.marcoaiot.com/admin/marco.pms.api into Issues_June_3W ashutosh.nehete 2025-06-23 17:10:10 +05:30
• 72a92417b5 Implemented An API to get list of all notes ashutosh.nehete 2025-06-23 14:50:50 +05:30
• bb76047605 Implemeted an API to store logs from mobile Application ashutosh.nehete 2025-06-23 17:09:39 +05:30
• cb2856b2df Merge pull request 'Implemented An API to get list of all notes' (#92) from Ashutosh_Task#513 into Issues_June_3W ashutosh.nehete 2025-06-23 11:38:16 +00:00
• b56478056e Implemented An API to get list of all notes ashutosh.nehete 2025-06-23 14:50:50 +05:30
• 82ebd07d61 Added project validation in attendance Overview API ashutosh.nehete 2025-06-20 13:09:13 +05:30
• b78c5c07c5 Added a new API in dashbased ot check attendance overview of specifec project for give number of days ashutosh.nehete 2025-06-20 12:45:35 +05:30
• 64a7cde69c Implemented signalR in record-mobile API ashutosh.nehete 2025-06-19 18:28:57 +05:30
• a6a842bf10 Fixed rebase issues ashutosh.nehete 2025-06-19 07:30:55 -04:00
• c3f5fe8e34 Fixing rebase issues ashutosh.nehete 2025-06-19 07:07:54 -04:00
• c9bb18d8e5 Optimized the task management API ashutosh.nehete 2025-06-18 19:08:06 +05:30
• 2e925efcf7 Added code to validate the id received by path parameter with id received by payload ashutosh.nehete 2025-06-16 17:19:59 +05:30
• 5bc13e215d Added CRUD operation APIs for work Status master table ashutosh.nehete 2025-06-16 16:58:56 +05:30
• f20b4a42a1 added new fields inside workItem- parentTaskId and Description Pramod Mahajan 2025-06-18 17:34:33 +05:30
• 99818c42b0 Added new API to get list of work status ashutosh.nehete 2025-06-16 16:24:49 +05:30
• 5d5579882f Added Functionality for approving the reported task ashutosh.nehete 2025-06-16 15:57:04 +05:30
• 3dfde6d9a5 Added new entry in status master table ashutosh.nehete 2025-06-19 11:43:10 +05:30
• aa2bc674eb Optimized the task management API ashutosh.nehete 2025-06-18 19:08:06 +05:30
• 4164c7d761 Cheange the message sending when manageing project infrastructure ashutosh.nehete 2025-06-18 18:12:28 +05:30
• 692b1bfef3 Merge branch 'Approve_Task_Feature' of https://git.marcoaiot.com/admin/marco.pms.api into Approve_Task_Feature Pramod Mahajan 2025-06-18 17:35:12 +05:30
• 1c58265a9f added new fields inside workItem- parentTaskId and Description Pramod Mahajan 2025-06-18 17:34:33 +05:30
• 303f326773 Implemented signalR in Employee module ashutosh.nehete 2025-06-18 12:00:35 +05:30
• e2956c0c8c Added signalR functionality in Project Infrastructure ashutosh.nehete 2025-06-17 17:05:52 +05:30
• 39378f3a88 Resolved rebase issues ashutosh.nehete 2025-06-16 18:09:00 +05:30
• caacb43aa8 Merge branch 'SingalR_Integration' of https://git.marcoaiot.com/admin/marco.pms.api into SingalR_Integration ashutosh.nehete 2025-06-16 17:57:49 +05:30
• 29ea1698bc Implemented signalR in manage Task API ashutosh.nehete 2025-06-13 16:22:58 +05:30
• 793877b8f8 Implemented signalR in project infrastructure APIs ashutosh.nehete 2025-06-12 11:04:24 +05:30
• f47586710b Add basic implementation and add in record attendance API for testing ashutosh.nehete 2025-06-11 10:21:39 +05:30
• b21d30c18e Changed the keyword for updating and creating project ashutosh.nehete 2025-06-12 20:53:24 +05:30
• d78a2fe3b2 Implemented signalR in project infrastructure APIs ashutosh.nehete 2025-06-12 11:04:24 +05:30
• 6ebc74499f Add basic implementation and add in record attendance API for testing ashutosh.nehete 2025-06-11 10:21:39 +05:30
• ff9c7c9434 Added code to validate the id received by path parameter with id received by payload ashutosh.nehete 2025-06-16 17:19:59 +05:30
• e391c82659 Added CRUD operation APIs for work Status master table ashutosh.nehete 2025-06-16 16:58:56 +05:30
• 1f56143142 Added new API to get list of work status ashutosh.nehete 2025-06-16 16:24:49 +05:30
• dc21b9d2c6 Added Functionality for approving the reported task ashutosh.nehete 2025-06-16 15:57:04 +05:30
• d841cd2385 Changed the Approve task API to Able update compeleted task field Approve_Task ashutosh.nehete 2025-06-14 11:30:11 +05:30
• 453150e24d Updated manage task API to create new task if assigned task have any errors ashutosh.nehete 2025-06-14 11:08:20 +05:30
• c113805ff9 Added Approve task API in task Controller ashutosh.nehete 2025-06-14 10:16:01 +05:30
• 17ae02a0b3 Implemented signalR in manage Task API ashutosh.nehete 2025-06-13 16:22:58 +05:30
• 9d5535edf1 Added description in list task API ashutosh.nehete 2025-06-12 22:30:43 +05:30
• c689f2dfd8 Merge branch 'Acititvity_Images' of https://git.marcoaiot.com/admin/marco.pms.api into Acititvity_Images ashutosh.nehete 2025-06-12 21:40:36 +05:30
• 5c019a2ff6 Chnaged the name form presignedUrls to ReportedProsignedUrl ashutosh.nehete 2025-06-12 21:35:40 +05:30
• cb185db4f3 Sending pre signed url in task list API ashutosh.nehete 2025-06-12 18:32:50 +05:30
• 1a51860517 Implemented the image capture while writing comment in task allocation and add presignedurl in task get by in API ashutosh.nehete 2025-06-12 17:02:18 +05:30
• f275d08215 Implemented image storing to S3 while reporting task ashutosh.nehete 2025-06-12 16:09:28 +05:30
• 4ccc690560 Chnaged the name form presignedUrls to ReportedProsignedUrl ashutosh.nehete 2025-06-12 21:35:40 +05:30
• 82f3fdbc23 Merge branch 'SingalR_Integration' of https://git.marcoaiot.com/admin/marco.pms.api into SingalR_Integration ashutosh.nehete 2025-06-12 20:54:06 +05:30
• 790e9f63e1 Changed the keyword for updating and creating project ashutosh.nehete 2025-06-12 20:53:24 +05:30
• 0636c8aedd Implemented signalR in project infrastructure APIs ashutosh.nehete 2025-06-12 11:04:24 +05:30
• 8f2c828282 Add basic implementation and add in record attendance API for testing ashutosh.nehete 2025-06-11 10:21:39 +05:30
• 169e7f6601 Changed the keyword for updating and creating project ashutosh.nehete 2025-06-12 20:53:24 +05:30
• 691a670a28 Sending pre signed url in task list API ashutosh.nehete 2025-06-12 18:32:50 +05:30
• d8ee5940fd Add new API to only fetch project information to load in dropdowns. Full project details including progress will be fatched latter when required Vikas Nale 2025-06-12 17:32:48 +05:30
• 76b6ac6581 Implemented the image capture while writing comment in task allocation and add presignedurl in task get by in API ashutosh.nehete 2025-06-12 17:02:18 +05:30
• abe7870ad5 Implemented image storing to S3 while reporting task ashutosh.nehete 2025-06-12 16:09:28 +05:30
• 712c5e2a0a Implemented signalR in project infrastructure APIs ashutosh.nehete 2025-06-12 11:04:24 +05:30
• 648b4f9ef0 Implemented firebase client and sended push notification to mobile app ashutosh.nehete 2025-06-11 19:33:21 +05:30
• 8814dc59d9 Add basic implementation and add in record attendance API for testing ashutosh.nehete 2025-06-11 10:21:39 +05:30
• d5e7d38101 Merge pull request 'Feature_Directory' (#90) from Feature_Directory into main Vikas Nale 2025-06-10 14:44:35 +00:00
• db49522756 Merge pull request 'Introduces a new column to the Project database table.' (#91) from Ashutosh_Enhancement#496_ShortName into main Vikas Nale 2025-06-10 14:20:38 +00:00
• 3f18371330 FIxed issues invalid validation ashutosh.nehete 2025-06-10 16:52:01 +05:30
• 7689d2d235 Introduces a new column to the Project database table. ashutosh.nehete 2025-06-10 16:40:46 +05:30
• b61caa9ee7 Fixed rebase confilets ashutosh.nehete 2025-06-09 20:22:36 +05:30
• 6df8148f40 Fixed rebase ashutosh.nehete 2025-06-09 20:17:33 +05:30
• 7dfed25d8e created new DTO for projectsallocation for one specific employee Pramod Mahajan 2025-06-09 12:16:02 +05:30
• 9ed615110d created two end pointe for assigne and unassign project for perticular employee Pramod Mahajan 2025-06-09 09:48:35 +05:30
• 4f0515f8f4 created new dto for projectAllocation for employee Pramod Mahajan 2025-06-09 09:46:30 +05:30
• 361a2ab5c3 Sending Is Active in Object Of Contact notes ashutosh.nehete 2025-05-29 11:49:08 +05:30
• 0db199e74f fixed the bug of only sending ID of logged in employee in Bucket object ashutosh.nehete 2025-05-28 15:55:00 +05:30
• a6fc75f492 Stopping multiple entries in employee-bucket mapping table ashutosh.nehete 2025-05-28 15:14:31 +05:30
• af9e06cd98 Sending last updatedBy and updatedAt when sending list of notes ashutosh.nehete 2025-05-28 15:00:56 +05:30
• 7dc80ec006 Included object consist of basic infromation of employee who created the bucket in View models ashutosh.nehete 2025-05-28 12:48:02 +05:30
• 4abeb8cf5a Sending number of conacts within the bucket with it information in API Update bucket, Assign Bucket, and Get Bucket List ashutosh.nehete 2025-05-28 11:36:40 +05:30
• b88dbea6c6 Corrected Spelling mistakes ashutosh.nehete 2025-05-28 10:45:03 +05:30
• 138eb963d0 Implemented an API to delete a Bucket ashutosh.nehete 2025-05-28 10:40:00 +05:30