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

#157

#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

• 8955bf1e6a Merge pull request 'Implemented functionality to upload captured attendance images to Amazon S3 and record associated data in the database.' (#24) from Ashutosh_Enhancement_#104_Store_Images_In_AmazonS3 into Feature_Forum Gitea Admin 2025-04-23 10:37:09 +00:00
• 1141971aa1 Added authorization to Attendance Controller Ashutosh_Enhancement_#104_Store_Images_In_AmazonS3 ashutosh.nehete 2025-04-23 15:50:28 +05:30
• cd1f06a99d Deleted the unwanted images ashutosh.nehete 2025-04-23 15:46:26 +05:30
• 1eab6669e1 Modified BatchId column in Document table to accept null values. ashutosh.nehete 2025-04-23 15:36:56 +05:30
• 4d0901b4dd Implemented functionality to upload captured attendance images to Amazon S3 and record associated data in the database. ashutosh.nehete 2025-04-23 15:00:38 +05:30
• 6c99a625b5 Add Models and Controller methods for Forum feature Vikas Nale 2025-04-22 09:56:59 +05:30
• 86c3503baf Implemented the functionality to send an email to the user upon successful tenant registration. TenantManagementV1 ashutosh.nehete 2025-04-21 13:01:30 +05:30
• 7b1cce26c8 Merge branch 'TenantManagementV1' of https://git.marcoaiot.com/admin/marco.pms.api into TenantManagementV1 ashutosh.nehete 2025-04-21 12:03:38 +05:30
• f2e2862b0f Perform CRUD oprations on Tenanat ashutosh.nehete 2025-04-01 10:54:08 +05:30
• fa5a8c178d Add API tag in controll rout path Issues_April_4W Feature_Task_management Vikas Nale 2025-04-19 12:58:34 +05:30
• dcd39db3b0 Move request demo api to separate market controller Vikas Nale 2025-04-19 12:40:03 +05:30
• aa1d5020f7 Merge pull request 'Created API to Request Demo of application and added table to store the data of user as well send to selected emails' (#22) from Ashutosh_Task_#67_Request_Demo into Feature_Task_management Vikas Nale 2025-04-19 05:31:45 +00:00
• 91cffbc632 Changed email seprator from "," to ";" Ashutosh_Task_#67_Request_Demo ashutosh.nehete 2025-04-18 18:10:53 +05:30
• f45f75befb Created API to Request Demo of application and added table to store the data of user ashutosh.nehete 2025-04-18 14:07:08 +05:30
• 0ac0de143d Merge pull request 'Added A new API to get list of Industries from its master table' (#21) from Ashutosh_Task_#79_Get_Industries_API into Feature_Task_management Vikas Nale 2025-04-16 11:42:45 +00:00
• 85319cdf49 Added A new API to get list of Industries from its master table ashutosh.nehete 2025-04-16 12:16:43 +05:30
• bee1dfef32 Added A new API to get list of Industries from its master table Ashutosh_Task_#79_Get_Industries_API ashutosh.nehete 2025-04-16 12:16:43 +05:30
• bda8cbc466 Merge pull request 'Fixed the employee duplication bug while adding the email to employee that does not have one' (#20) from Ashutosh_Bug_#75_Employee_duplicatation into Feature_Task_management Vikas Nale 2025-04-16 05:24:17 +00:00
• 2af750fbb3 Fixed the employee duplication bug while adding the email to employee that does not have one ashutosh.nehete 2025-04-16 10:21:53 +05:30
• fe503a70dc Merge pull request 'In this commit fixed the Bug #74 where when the regularization request sent it takes the date of request as checkout date' (#19) from Ashutosh_Bug_#74_Attendance_Regularization_Date into Feature_Task_management Vikas Nale 2025-04-16 05:23:49 +00:00
• 27649291c7 Fixed the employee duplication bug while adding the email to employee that does not have one Ashutosh_Bug_#75_Employee_duplicatation ashutosh.nehete 2025-04-16 10:21:53 +05:30
• a9f4610063 In this commit fixed the Bug #74 where when the regularization request sent it takes the date of request as checkout date Ashutosh_Bug_#74_Attendance_Regularization_Date ashutosh.nehete 2025-04-16 09:21:39 +05:30
• c7304dc80b Renamed columns in ActivityChecklist Vikas Nale 2025-04-15 18:05:42 +05:30
• f906e8f7d0 Merge pull request 'Modify Email Templates' (#18) from vikas_64_modifyemail_template into Feature_Task_management Vikas Nale 2025-04-15 12:12:35 +00:00
• b93b581d60 Modify Email Templates - Remove address and contact number - Add link to email - change twitter logo to x - link x logo to company twitter account Vikas Nale 2025-04-15 17:37:11 +05:30
• 5fbd65bab0 Modify Email Templates - Remove address and contact number - Add link to email - change twitter logo to x - link x logo to company twitter account Vikas Nale 2025-04-15 17:37:11 +05:30
• 1c48ab80aa Added checklist and taskallocation relation table and logic to map taskallocation and checklist in that table in report task API ashutosh.nehete 2025-04-15 17:11:29 +05:30
• cac50a3f06 Added checklist to report api ashutosh.nehete 2025-04-15 15:47:57 +05:30
• dbc1b721c1 Changed the Task list View model ashutosh.nehete 2025-04-14 17:26:35 +05:30
• 9b1a1d1fe7 Fixed the error of empty checkList in get activities ashutosh.nehete 2025-04-14 17:03:56 +05:30
• 40d9c335c4 Fixed the error of empty checkList in get activities ashutosh.nehete 2025-04-14 16:07:30 +05:30
• be0c37588e In dashboard project Progress show from first task assigned if give date is older than first assign date ashutosh.nehete 2025-04-14 15:58:14 +05:30
• b023e386f0 Add gallary models Feature_Image_Gallary Vikas Nale 2025-04-14 14:55:33 +05:30
• 832555d2b2 Merge pull request 'Ashutosh_ActivityMaster_managenment' (#17) from Ashutosh_ActivityMaster_managenment into Feature_Task_management Vikas Nale 2025-04-14 09:23:47 +00:00
• 829a421ab0 Fixed Confilts Ashutosh_ActivityMaster_managenment ashutosh.nehete 2025-04-14 13:37:27 +05:30
• f57e40219e Merge branch 'Ashutosh_ActivityMaster_managenment' of https://git.marcoaiot.com/admin/marco.pms.api into Ashutosh_ActivityMaster_managenment ashutosh.nehete 2025-04-14 12:57:06 +05:30
• 498ea6e4e7 Added the Check list in Activity Master APIs ashutosh.nehete 2025-04-14 12:28:25 +05:30
• 3ec3618b7e Fixed code error ashutosh.nehete 2025-04-11 17:19:32 +05:30
• c6f3216150 Added CheckList to Update and Create API ashutosh.nehete 2025-04-10 19:56:30 +05:30
• ed449fdf47 Created new Api for creating and editing activities ashutosh.nehete 2025-04-10 19:16:21 +05:30
• 17994bff08 Added CheckList to Update and Create API ashutosh.nehete 2025-04-10 19:56:30 +05:30
• 16a4234f75 Created new Api for creating and editing activities ashutosh.nehete 2025-04-10 19:16:21 +05:30
• d1be217740 Fixed code error ashutosh.nehete 2025-04-11 17:19:32 +05:30
• f391806a57 Added CheckList to Update and Create API ashutosh.nehete 2025-04-10 19:56:30 +05:30
• c3079258d9 Created new Api for creating and editing activities ashutosh.nehete 2025-04-10 19:16:21 +05:30
• a25fa069de Merge branch 'Feature_Task_management' of https://git.marcoaiot.com/admin/marco.pms.api into Feature_Task_management ashutosh.nehete 2025-04-14 12:49:20 +05:30
• dc9b696265 Fixed Confilt ashutosh.nehete 2025-04-14 12:48:42 +05:30
• ad1b2d35fb Merge pull request 'Add code to hide server information in response header' (#15) from Ashutosh_AddServerHeade_False into Feature_Task_management Vikas Nale 2025-04-14 07:11:47 +00:00
• f488109a4c Add code to hide server information in response header ashutosh.nehete 2025-04-09 14:49:01 +05:30
• a51c11389d Added the Check list in Activity Master APIs ashutosh.nehete 2025-04-14 12:28:25 +05:30
• e4f8e507d5 Merge branch 'Ashutosh_ActivityMaster_managenment' of https://git.marcoaiot.com/admin/marco.pms.api into Ashutosh_ActivityMaster_managenment ashutosh.nehete 2025-04-11 17:26:25 +05:30
• 23322fdeb2 Fixed code error ashutosh.nehete 2025-04-11 17:19:32 +05:30
• 0fe811d78c Added CheckList to Update and Create API ashutosh.nehete 2025-04-10 19:56:30 +05:30
• 689d5c28bb Created new Api for creating and editing activities ashutosh.nehete 2025-04-10 19:16:21 +05:30
• b8e2c265be Fixed code error ashutosh.nehete 2025-04-11 17:19:32 +05:30
• 52d0474d45 Added a filter of only date while fetching data from database ashutosh.nehete 2025-04-11 16:42:51 +05:30
• 3fabadc380 Added the date filter while fetching data from database ashutosh.nehete 2025-04-11 16:40:57 +05:30
• b624e9ec62 Merge branch 'Ashutosh_ActivityMaster_managenment' of https://git.marcoaiot.com/admin/marco.pms.api into Ashutosh_ActivityMaster_managenment ashutosh.nehete 2025-04-11 16:17:22 +05:30
• 3702dae1ac Added CheckList to Update and Create API ashutosh.nehete 2025-04-10 19:56:30 +05:30
• e53d45ed77 Created new Api for creating and editing activities ashutosh.nehete 2025-04-10 19:16:21 +05:30
• 38262074c4 Merge pull request 'Added Api to send data to front-end dashboard' (#14) from Ashutosh_Dashboard into Feature_Task_management Vikas Nale 2025-04-11 10:38:54 +00:00
• 90b5152bb2 Added CheckList to Update and Create API ashutosh.nehete 2025-04-10 19:56:30 +05:30
• 40420d19c4 Added api to send data to apis Ashutosh_Dashboard ashutosh.nehete 2025-04-10 19:38:54 +05:30
• 81d487f9f2 Created new Api for creating and editing activities ashutosh.nehete 2025-04-10 19:16:21 +05:30
• c44deb439e Removed all warning Ashutosh_Null_Refrenance_Warning_Fixed ashutosh.nehete 2025-04-09 16:29:38 +05:30
• 4eb4f19e9c Add code to hide server information in response header Ashutosh_AddServerHeade_False ashutosh.nehete 2025-04-09 14:49:01 +05:30
• 5d4b1ad282 Fixed the typo of PermanentAddress ashutosh.nehete 2025-04-09 13:09:50 +05:30
• db879495cb Created new view model for get projet list API ashutosh.nehete 2025-04-09 12:16:41 +05:30
• 15e83346e2 Merge branch 'Feature_Task_management' of https://git.marcoaiot.com/admin/marco.pms.api into Feature_Task_management ashutosh.nehete 2025-04-09 10:41:14 +05:30
• e41faf4045 Passing role name in record attendance api ashutosh.nehete 2025-04-09 10:41:00 +05:30
• 2117b81c48 Remove custom CORS settings to all allow all requests Vikas Nale 2025-04-09 10:36:58 +05:30
• 52a67ba15b Removed null refreance warning from MOdel project ashutosh.nehete 2025-04-09 10:25:44 +05:30
• 58bb684c4b Removed all Warnings from Services project ashutosh.nehete 2025-04-09 09:18:15 +05:30
• ec5fba0637 Fixed null refrenance warning ashutosh.nehete 2025-04-09 08:46:29 +05:30
• 56448cb8a2 Created new Api fro getting Attendance of emplyee who requested regularization ashutosh.nehete 2025-04-08 16:47:24 +05:30
• 7ddb1e2f8e Fixed the bug of Attendance Regularization ashutosh.nehete 2025-04-08 16:09:50 +05:30
• 727e4794da Fixed some miner bugs ashutosh.nehete 2025-04-07 18:07:37 +05:30
• 41edbef9d1 Chenaged response of manage task in project API Vaibhav_Resolved_Issues ashutosh.nehete 2025-04-07 11:34:40 +05:30
• 0b81a6ea62 Make changes in report api to check if user reporting second time. ashutosh.nehete 2025-04-07 09:42:38 +05:30
• 745b4d2e1c Created new view models for showing taskAllication list and comment ashutosh.nehete 2025-04-05 17:16:32 +05:30
• 64c4772595 fixed missing http method ashutosh.nehete 2025-04-04 16:09:47 +05:30
• 7ddb37852e Added Apis for task allocations ashutosh.nehete 2025-04-04 15:42:42 +05:30
• 352b4fb40e Changed Response format of all APIs ashutosh.nehete 2025-04-03 15:50:54 +05:30
• 41b8aa0126 Connection string ashutosh.nehete 2025-04-03 08:50:49 +05:30
• 8302e910af Perform CRUD oprations on Tenanat ashutosh.nehete 2025-04-01 10:54:08 +05:30
• 9c4b1639fe Merge branch 'Feature_Task_management' of https://git.marcoaiot.com/admin/marco.pms.api into Feature_Task_management Vikas Nale 2025-04-02 18:37:29 +05:30
• 1b16983092 #40 - Add models and database migration for Task Allocation Vikas Nale 2025-04-02 18:35:58 +05:30
• e6fb6a23b5 #40 - Add models and database migration for Task Allocation Vikas Nale 2025-04-02 18:35:58 +05:30
• 04d6c03b05 Merge pull request 'Ashutosh_Employee_Update_Validation' (#13) from Ashutosh_Employee_Update_Validation into Issuses Issuses Vikas Nale 2025-04-02 13:04:43 +00:00
• 79c74dc1a9 Merge branch 'TenantManagementV1' of https://git.marcoaiot.com/admin/marco.pms.api into TenantManagementV1 ashutosh.nehete 2025-04-02 18:10:48 +05:30
• cbc2ade4dd Perform CRUD oprations on Tenanat ashutosh.nehete 2025-04-01 10:54:08 +05:30
• dfa3ef0745 Merge branch 'Ashutosh_Employee_Update_Validation' of https://git.marcoaiot.com/admin/marco.pms.api into Ashutosh_Employee_Update_Validation Ashutosh_Employee_Update_Validation ashutosh.nehete 2025-04-02 17:54:49 +05:30
• e50eedc7e6 Added validation in Employee Create and update api to check Whether this email and Id belongs to same employee ashutosh.nehete 2025-04-02 17:53:07 +05:30
• cb85224415 Added validation in Employee Create and update api to check Whether this email and Id belongs to same employee ashutosh.nehete 2025-04-02 17:53:07 +05:30
• 5034da19cd added condition for unique role name. Pramod Mahajan 2025-04-02 16:53:35 +05:30
• 3fce6ef499 Merge branch 'Issuses' of https://git.marcoaiot.com/admin/marco.pms.api into Issuses Pramod Mahajan 2025-04-02 16:53:08 +05:30
• eba230723b Fixed bug about UpdatedBy ashutosh.nehete 2025-04-02 13:37:03 +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 ashutosh.nehete 2025-04-02 13:22:32 +05:30
• 212fe250c1 Solved time discrepancies in attendance/record unknown 2025-03-28 13:45:06 +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 ashutosh.nehete 2025-04-02 15:31:41 +05:30