Commit Graph

Select branches

Hide Pull Requests

Acititvity_Images

Activity_Hierarchy

AppMenu

Approve_Task

Approve_Task_Feature

Ashtuosh_Bug#191_Incorrect_Success_Message

Ashtush_Task#265_Delete_Contact_Category

AshutoshEnhancement#332_Added_Filter_To_Contact_List

Ashutosh_#375_To_#381

Ashutosh_ActivityMaster_managenment

Ashutosh_AddServerHeade_False

Ashutosh_AllowCredentials

Ashutosh_AppSettings_Changes

Ashutosh_ApprovedBy_In_Attendes

Ashutosh_Bug#108_Attendance_log

Ashutosh_Bug#114_Email_Template_Not_Found

Ashutosh_Bug#117_Null_Validation_In_Attendance_Log

Ashutosh_Bug#119_Remove_CheckList_Item

Ashutosh_Bug#125_Unable_To_Add_Checklist_Item

Ashutosh_Bug#127_Regularization_Time_Validation

Ashutosh_Bug#1461

Ashutosh_Bug#1498

Ashutosh_Bug#18_Project_Duplicate

Ashutosh_Bug#1_Cors_Configuration

Ashutosh_Bug#37_Attendance_Issues

Ashutosh_Bug#529

Ashutosh_Bug#935

Ashutosh_Bug_#74_Attendance_Regularization_Date

Ashutosh_Bug_#75_Employee_duplicatation

Ashutosh_Contact_Note_CRUD

Ashutosh_CreateNewTenant

Ashutosh_Dashboard

Ashutosh_Employee_Update_Validation

Ashutosh_Enhancement#1347

Ashutosh_Enhancement#1452

Ashutosh_Enhancement#172_Show_InactiveEmployees

Ashutosh_Enhancement#198_Added_IsSystem

Ashutosh_Enhancement#199_Manage_Employee_FromBody

Ashutosh_Enhancement#206_Added_WorkCategory_In_WorkItem

Ashutosh_Enhancement#276_TodaysPlanned

Ashutosh_Enhancement#413_Manage_Employee

Ashutosh_Enhancement#456_Self_Attendance

Ashutosh_Enhancement#496_ShortName

Ashutosh_Enhancement_#104_Store_Images_In_AmazonS3

Ashutosh_Enhancement_#123_Possible_Null_Reference

Ashutosh_Enhancement_#1293

Ashutosh_Enhancement_#1297

Ashutosh_Enhancement_#1355

Ashutosh_Enhancement_#214_Report_Task_At_Zero

Ashutosh_Enhancement_#622

Ashutosh_Enhancement_#631

Ashutosh_Feature#170_Task_Deletion

Ashutosh_Feature#174_Suspend_Employee

Ashutosh_Feature#183_Get_AttendanceLogs_By_EmployeeId

Ashutosh_Feature#208_WorkCategory_Master_Table

Ashutosh_Feature_Permission

Ashutosh_Forum_APIs

Ashutosh_Get_All_Permission

Ashutosh_JWT_Token

Ashutosh_Null_Refrenance_Warning_Fixed

Ashutosh_Refactor

Ashutosh_SCRUM-58_Time_Discrepancies_Attendance

Ashutosh_SCRUM-62_Decodeing_Token_Reset_password

Ashutosh_Subscription_Plan

Ashutosh_Task#1009

Ashutosh_Task#1010

Ashutosh_Task#1011

Ashutosh_Task#1013

Ashutosh_Task#1018

Ashutosh_Task#1019

Ashutosh_Task#1025

Ashutosh_Task#1026

Ashutosh_Task#1027

Ashutosh_Task#1029

Ashutosh_Task#1036

Ashutosh_Task#106_Upload_Whitelist_Only

Ashutosh_Task#1225

Ashutosh_Task#1239

Ashutosh_Task#1246

Ashutosh_Task#124_Models_And_Dto

Ashutosh_Task#1360

Ashutosh_Task#14_TenantProfile

Ashutosh_Task#16_UpdateTenant

Ashutosh_Task#226_Create_Contact

Ashutosh_Task#228_Update_Contact

Ashutosh_Task#229_Create_Contact_Category

Ashutosh_Task#230_Get_Contact_By_Id

Ashutosh_Task#231_Get_Contact_By_BucketId

Ashutosh_Task#233_Update_Contact_Category

Ashutosh_Task#234_Get_COntact_Category_By_Id

Ashutosh_Task#235_Get_Contact_Category_List

Ashutosh_Task#246_Get_Note_List_By_ContactID

Ashutosh_Task#249_Create_Bucket

Ashutosh_Task#250_Update_Bucket

Ashutosh_Task#263_Delete_Contact

Ashutosh_Task#266_Delete_Contact_Tag

Ashutosh_Task#269_Delete_Bucket

Ashutosh_Task#316_Daily_Project_Report

Ashutosh_Task#317_Get_Organization_List

Ashutosh_Task#346_Pending_Attendance

Ashutosh_Task#347_Project_Attendance_Report

Ashutosh_Task#348_Activities_Report

Ashutosh_Task#356_Directory_Management

Ashutosh_Task#387_Assign_Bucket

Ashutosh_Task#469_Mobile_Login

Ashutosh_Task#471_Create_MPIN

Ashutosh_Task#480_Send_OTP

Ashutosh_Task#483_Login_OTP

Ashutosh_Task#484_Login_MPIN

Ashutosh_Task#513

Ashutosh_Task#663

Ashutosh_Task#767

Ashutosh_Task#980

Ashutosh_Task_#1362

Ashutosh_Task_#237

Ashutosh_Task_#67_Request_Demo

Ashutosh_Task_#79_Get_Industries_API

Ashutosh_Tasl#236_Create_ContactTag

Ashutosh_User_Validations

Attendance_Weidget_feature

Brevo_Mailling

Change_MPIN_Digits

Collection_Management

Directory_Refactor

Document_Manager

Expanses_Management_Feature

Feature_Directory

Feature_Forum

Feature_Image_Gallary

Feature_Task_management

Firebase_Implementation

GlobalSelectProject

Image_Gallery

Issue_Jun_1W

Issue_Jun_1W_2

Issue_Jun_2W

Issue_May_3W

Issue_May_4W

Issue_May_5W

Issues_April_4W

Issues_Aug_1W

Issues_July_1W

Issues_July_4W

Issues_June_3W

Issues_May_2W

Issuses

Mobile_Logger_Feature

OnFieldWork_V1

Organization_Management

ProjectDetails_Split_API

SingalR_Integration

TeanantManagement

TenantManagementV1

Tenant_Management

UserRights

Vaibhav_Resolved_Issues

contact_import

main

pramod_Refactoring#12_UniqueApplicationRole

pramod_Task#238

pramod_Task#282

pramod_Task#448

pramod_Task#455

pramod_Task#465

pramod_Task#474

pramod_Task-#237_Update_Contact_Tag

profile_page

tmp-releae-head

vikas#387_code_review

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

#15

#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

• 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
• bec60cd24e Fixed bug about UpdatedBy ashutosh.nehete 2025-04-02 13:37:03 +05:30
• c17b5df8d0 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
• a9124e1a93 Fixed project duplicate bug appered due to absence of projectId unknown 2025-03-31 11:23:30 +05:30
• f0ed430f37 Solved time discrepancies in attendance/record unknown 2025-03-28 13:45:06 +05:30
• c071b7ecaf Added the condition to check if received token for reset password is encoded or not unknown 2025-03-28 13:08:50 +05:30
• fce9832ea2 Merge branch 'Issuses' of https://git.marcoaiot.com/admin/marco.pms.api into Issuses Pramod Mahajan 2025-04-02 16:04:24 +05:30
• 5e9dd55a07 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
• 368e186e36 Fixed bug about UpdatedBy ashutosh.nehete 2025-04-02 13:37:03 +05:30
• 97adf8b995 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
• 8056247008 Fixed project duplicate bug appered due to absence of projectId unknown 2025-03-31 11:23:30 +05:30
• a502be4977 Solved time discrepancies in attendance/record unknown 2025-03-28 13:45:06 +05:30
• 4936a99e57 Added the condition to check if received token for reset password is encoded or not unknown 2025-03-28 13:08:50 +05:30
• 6ae2912a52 Merge pull request 'user profile api returns duplicate FeaturePermissions. This makes permission checks impossible, as multiple permissions return the same feature ID. Instead it will return the permissionID, also now passing the list featureid's in the response' (#12) from vikas_38_featurepermission_issue into main Vikas Nale 2025-04-02 10:29:53 +00:00
• c4952825fe user profile api returns duplicate FeaturePermissions. This makes permission checks impossible, as multiple permissions return the same feature ID. Instead it will return the permissionID, also now passing the list featureid's in the response vikas_38_featurepermission_issue Vikas Nale 2025-04-02 15:58:48 +05:30
• 587530856a Merge pull request 'Added new validation in user login to verify if user is active or not and if user's email is confirmed or not' (#11) from Ashutosh_User_Validations into Issuses Vikas Nale 2025-04-02 10:26:11 +00:00
• 0674f84a2c 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
• 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