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

• 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 Vikas Nale 2025-04-02 10:25:06 +00:00
• 6201184b7c Added new validation in user login to verify if user is active or not and if user's email is confirmed or not Ashutosh_User_Validations ashutosh.nehete 2025-04-02 15:31:41 +05:30
• 414bf7ece1 Fixed bug about UpdatedBy Ashutosh_Bug#37_Attendance_Issues ashutosh.nehete 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 ashutosh.nehete 2025-04-02 13:22:32 +05:30
• ceddddf6fe Perform CRUD oprations on Tenanat ashutosh.nehete 2025-04-01 10:54:08 +05:30
• 7b0a1b0073 Merge branch 'Issuses' of https://git.marcoaiot.com/admin/marco.pms.api into Issuses ashutosh.nehete 2025-03-31 17:23:50 +05:30
• dd75f9a115 Fixed project duplicate bug appered due to absence of projectId unknown 2025-03-31 11:23:30 +05:30
• 7fcb022ab3 Solved time discrepancies in attendance/record unknown 2025-03-28 13:45:06 +05:30
• bea2bcffb7 Added the condition to check if received token for reset password is encoded or not unknown 2025-03-28 13:08:50 +05:30
• 2e19d2fe54 Added Industries table and Column IsActive In tables Tenant and ApplicayionUser unknown 2025-03-31 16:31:17 +05:30
• 063441f322 Merge branch 'Ashutosh_SCRUM-58_Time_Discrepancies_Attendance' into Issuses Vikas Nale 2025-03-31 13:11:24 +05:30
• 5a4b46cb4f Merge branch 'Issuses' of https://git.marcoaiot.com/admin/marco.pms.api into Issuses Vikas Nale 2025-03-31 13:01:44 +05:30
• 58526d5feb Solved time discrepancies in attendance/record unknown 2025-03-28 13:45:06 +05:30
• 35da59304d Added the condition to check if received token for reset password is encoded or not unknown 2025-03-28 13:08:50 +05:30
• 2c3463b74f Merge pull request 'Fixed project duplicate bug appered due to absence of projectId' (#9) from Ashutosh_Bug#18_Project_Duplicate into Issuses Vikas Nale 2025-03-31 07:30:49 +00:00
• 24c283559f Created a new API to delete tenant TeanantManagement unknown 2025-03-29 15:33:12 +05:30
• 053391ae44 merge conflict Vikas Nale 2025-03-31 12:48:15 +05:30
• 5f345c69b9 merge confilct Vikas Nale 2025-03-31 12:46:37 +05:30
• 01e88c7ee0 Created a new API to get Tenant Profile unknown 2025-03-29 15:27:26 +05:30
• 1b0f0b831d Changed ActivityTime field in AttendanceLog Table and Remove Bugs from CreateTenant API unknown 2025-03-27 16:53:27 +05:30
• 26e2de4e0e Created new API for creating new tenant unknown 2025-03-26 18:05:36 +05:30
• cb370b97ea Resolve merge conflict with rebase Vikas Nale 2025-03-31 12:34:46 +05:30
• c701187223 resolve merge coflict Vikas Nale 2025-03-31 12:30:41 +05:30
• bed58af120 resolvev merge coflict pramod_Refactoring#12_UniqueApplicationRole Vikas Nale 2025-03-31 12:27:43 +05:30
• 636a6aab7b Removing the conflictes between Tenantmanagement and Ashutosh_Task#16_UpdateTenant branches Ashutosh_Task#16_UpdateTenant unknown 2025-03-31 12:21:20 +05:30
• c69226c83e Removing the conflictes between Tenantmanagement and Ashutosh_Task#16_UpdateTenant branches unknown 2025-03-31 12:15:16 +05:30
• 93a25690f1 Fixed project duplicate bug appered due to absence of projectId Ashutosh_Bug#18_Project_Duplicate unknown 2025-03-31 11:23:30 +05:30
• a4156153ff Merge pull request 'Created a new API to get Tenant Profile' (#6) from Ashutosh_Task#14_TenantProfile into TeanantManagement Vikas Nale 2025-03-30 05:58:02 +00:00
• a70c3007f1 Created a new API to delete tenant unknown 2025-03-29 15:33:12 +05:30
• 6ee508645a Created a new API to update tenant infromation unknown 2025-03-29 15:30:10 +05:30
• e12f92ee50 Created a new API to get Tenant Profile Ashutosh_Task#14_TenantProfile unknown 2025-03-29 15:27:26 +05:30
• 7a1a4d6bdb added condition for unique role name PramodMahajan14 2025-03-29 11:27:28 +05:30
• cdd67c1137 Merge pull request 'Added appsetting.Production.json file and configure cors settings for both development and production environment' (#4) from Ashutosh_Bug#1_Cors_Configuration into main Vikas Nale 2025-03-28 13:00:56 +00:00
• 65ef5f9a5a Added appsetting.Production.json file and configure cors settings for both development and production environment Ashutosh_Bug#1_Cors_Configuration unknown 2025-03-28 17:41:59 +05:30
• 26d569f782 added Docker file UserRights PramodMahajan14 2025-03-28 17:39:01 +05:30
• b85bc3d62e Merge pull request 'Solved time discrepancies in attendance/record' (#3) from Ashutosh_SCRUM-58_Time_Discrepancies_Attendance into Issuses Vikas Nale 2025-03-28 09:35:03 +00:00
• 8b4f892edf Solved time discrepancies in attendance/record unknown 2025-03-28 13:45:06 +05:30
• 597d86aa27 Merge pull request 'Added the condition to check if received token for reset password is encoded or not' (#2) from Ashutosh_SCRUM-62_Decodeing_Token_Reset_password into Issuses Vikas Nale 2025-03-28 09:34:33 +00:00
• 354680d28b Solved time discrepancies in attendance/record Ashutosh_SCRUM-58_Time_Discrepancies_Attendance unknown 2025-03-28 13:45:06 +05:30
• 2a6ab929d9 Added the condition to check if received token for reset password is encoded or not Ashutosh_SCRUM-62_Decodeing_Token_Reset_password unknown 2025-03-28 13:08:50 +05:30
• dca6414a59 Merge pull request 'Created new API for creating new tenant' (#1) from Ashutosh_CreateNewTenant into TeanantManagement Vikas Nale 2025-03-28 06:17:02 +00:00
• 8014b90487 Changed ActivityTime field in AttendanceLog Table and Remove Bugs from CreateTenant API Ashutosh_CreateNewTenant unknown 2025-03-27 16:53:27 +05:30
• 45adcc0227 Created new API for creating new tenant unknown 2025-03-26 18:05:36 +05:30
• 79753c33d3 Reset Migation Files Vikas Nale 2025-03-26 11:20:48 +05:30
• 0ea14ff112 Push user rights branh Vikas Nale 2025-03-25 13:01:56 +05:30
• 17d42f2cdf Add main version branch Vikas Nale 2025-03-25 11:53:37 +05:30