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

• 6688b76145 Added updatelogs in update contact API ashutosh.nehete 2025-08-11 14:29:07 +05:30
• 21e1a7322c Saving the tenant subscription modification logs in mongo DB ashutosh.nehete 2025-08-11 11:43:46 +05:30
• ac0843ffe7 Solved migration error occured while rebasing ashutosh.nehete 2025-08-11 11:05:21 +05:30
• 897a998b27 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.api into profile_page ashutosh.nehete 2025-08-08 12:20:55 +05:30
• 7f0dd1c08a Sloved the rebase issue ashutosh.nehete 2025-08-08 12:20:02 +05:30
• de41db6219 Resolved the rebase issues ashutosh.nehete 2025-08-08 12:19:31 +05:30
• 759d152a9a Resolving the Rebase issues ashutosh.nehete 2025-08-08 12:00:14 +05:30
• ef41990d7f Optimized the get list Notes API ashutosh.nehete 2025-08-08 11:47:18 +05:30
• 5c411602bc Merge pull request 'Expanses_Management_Feature' (#109) from Expanses_Management_Feature into main ashutosh.nehete 2025-08-08 06:14:47 +00:00
• 830accbe98 Optimized the assign bucket API and delete bucket API in Directory module ashutosh.nehete 2025-08-07 15:16:15 +05:30
• 9b241a0c70 Made MPIN to be 4 digit Expanses_Management_Feature ashutosh.nehete 2025-08-07 15:03:52 +05:30
• 3980c14d72 Optimized the contact update API, Delete API , Bucket list API, Create Bucket API, Update Bucket API without implementing cache ashutosh.nehete 2025-08-07 13:28:32 +05:30
• 9c6bd2c053 Added update tenant API in tenant controller ashutosh.nehete 2025-08-07 09:45:03 +05:30
• 0aee183fdd Showing profile of all emplyee event if it inactive ashutosh.nehete 2025-08-06 17:54:37 +05:30
• f02eb32143 Changed status code 401 to 403 ashutosh.nehete 2025-08-06 15:10:55 +05:30
• 9ef7946d89 Teannt porfile API Optimized ashutosh.nehete 2025-08-06 15:05:48 +05:30
• 7555b73f02 Added an API to get task by employeeId ashutosh.nehete 2025-08-06 14:51:55 +05:30
• 9edc0e645e Added to an API to get project assignment histery of an employee ashutosh.nehete 2025-08-06 13:07:41 +05:30
• c210e6e3f2 Added the Tenant Profile API ashutosh.nehete 2025-08-06 12:41:32 +05:30
• 6b4e229f6b Added Currency in subscription list VM ashutosh.nehete 2025-08-06 12:16:46 +05:30
• fb1f34f950 Added new condition for checking the permission for expense Action API ashutosh.nehete 2025-08-06 12:14:18 +05:30
• cbcae9fb57 Optimized the CreateSubscriptionPlan API ashutosh.nehete 2025-08-06 11:08:24 +05:30
• 640b80ea82 Subscription plan details added in update subscription API ashutosh.nehete 2025-08-06 10:14:53 +05:30
• c65d73ff87 Added new subscription details in add-subscription API ashutosh.nehete 2025-08-06 09:47:16 +05:30
• 54bf49a005 Seprated the subscrption plan and subscription details and commented add-subscription and update-subscription ashutosh.nehete 2025-08-06 09:36:40 +05:30
• 60a3b3ab22 Added new API check if user with email exists or not ashutosh.nehete 2025-08-05 11:18:31 +05:30
• 7bf30d722b Optimzed the add subscription API ashutosh.nehete 2025-08-04 17:01:02 +05:30
• 19aedfb648 Chnage the cache logic ashutosh.nehete 2025-08-04 15:45:04 +05:30
• 33538c25b7 Chnaged get query ashutosh.nehete 2025-08-04 14:51:05 +05:30
• c3571f76b8 Changed the if condition in expense list API ashutosh.nehete 2025-08-04 14:46:40 +05:30
• 1072a2da03 Added mongoDB string in appsetting ashutosh.nehete 2025-08-04 12:39:28 +05:30
• b9f2bc53c8 Added updated at in action API ashutosh.nehete 2025-08-04 12:26:33 +05:30
• 545018dde1 If frequency is null send all prices for all plans ashutosh.nehete 2025-08-04 12:24:37 +05:30
• c708fa1ea1 Crrocted the typo in SubScription Plans ashutosh.nehete 2025-08-04 12:16:40 +05:30
• 53a2c5d87c Added API to get plan List and add subscription to specific tenant ashutosh.nehete 2025-08-04 12:10:52 +05:30
• 30fa924d0f added the date in update logs ashutosh.nehete 2025-08-04 11:12:07 +05:30
• 2c94854f57 Showing the draft of self only ashutosh.nehete 2025-08-04 09:46:56 +05:30
• 6c394f40ad added PermissionKey inside MenuItem and start to making get api pramod mahajan 2025-08-04 09:46:40 +05:30
• ee4e3f713e added two more end-point for Add Item and SubItem pramod mahajan 2025-08-03 11:33:08 +05:30
• 5988a98016 created edit MenuItem and subMenuItem end -points pramod mahajan 2025-08-03 02:20:51 +05:30
• cc5badeb0f create menu api created pramod mahajan 2025-08-02 14:45:38 +05:30
• 2ccae935f3 Sending the ExpenseLogs in Details API ashutosh.nehete 2025-08-02 12:48:20 +05:30
• 001bb6447d corrected the typo ashutosh.nehete 2025-08-02 09:45:56 +05:30
• c8435020a4 Chnaged the function to chek if base64 is valid or not ashutosh.nehete 2025-08-01 18:22:31 +05:30
• a7392a515d Added new logs in expense update API ashutosh.nehete 2025-08-01 17:50:59 +05:30
• 3915e9b9d0 Correct Typo of OrganizationSize and OrganizationName ashutosh.nehete 2025-08-01 16:43:07 +05:30
• 8210e250a1 added new parameter tenant table ashutosh.nehete 2025-08-01 16:22:12 +05:30
• eaf6284a57 Order nextStatus by it name ashutosh.nehete 2025-08-01 16:18:17 +05:30
• 56d3b754d9 side bar Menu Model define pramod mahajan 2025-08-01 14:50:00 +05:30
• fdac2e06e1 Added get tenant list API ashutosh.nehete 2025-08-01 13:17:49 +05:30
• 555bb87779 Validating the null objects while saving the object in cache ashutosh.nehete 2025-08-01 12:15:24 +05:30
• 0be021448d Added the date filert in mongo get function also ashutosh.nehete 2025-08-01 11:34:23 +05:30
• ff0bead3a0 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.api into Tenant_Management ashutosh.nehete 2025-08-01 09:39:16 +05:30
• 4808d6e77b COrrected the seppling mistake for projectDetails API ashutosh.nehete 2025-08-01 09:03:12 +05:30
• 59459acaee Only sending 10 employees if project Id is not provided ashutosh.nehete 2025-07-31 19:06:26 +05:30
• e565a80f7a Optimized the create tenant API ashutosh.nehete 2025-07-31 18:56:19 +05:30
• 732182a672 Added new API to fetch basic employee list ashutosh.nehete 2025-07-31 17:26:09 +05:30
• b7d770716a Created the API ot Create new Tenant ashutosh.nehete 2025-07-31 16:54:06 +05:30
• 36dc5e8950 Resloved the rebase errors ashutosh.nehete 2025-07-31 11:39:09 +05:30
• eb75e2f723 Resloving rebase issues ashutosh.nehete 2025-07-31 11:34:33 +05:30
• d001366d77 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.api into Expanses_Management_Feature ashutosh.nehete 2025-07-31 11:30:38 +05:30
• 7fe8dc60cb Merge pull request 'Issues_July_4W' (#108) from Issues_July_4W into main ashutosh.nehete 2025-07-31 05:52:51 +00:00
• 36db35d90e Sending every project exists in expense table ashutosh.nehete 2025-07-31 11:15:37 +05:30
• 1c9008ca62 Added the search funcationality abd chnaged the cache object ashutosh.nehete 2025-07-31 10:28:45 +05:30
• 1a0641162c Added the currency master table ashutosh.nehete 2025-07-30 15:44:19 +05:30
• d28f37714f Added new status and change expesne status from tenant scop to system scope ashutosh.nehete 2025-07-30 12:24:19 +05:30
• 388979ef82 Chnage Reviewed to Mark as Reviewed in expenses status ashutosh.nehete 2025-07-30 10:08:26 +05:30
• 4325dffc06 change ExpensesReimburse from list to single entity in expense details view model ashutosh.nehete 2025-07-30 09:34:16 +05:30
• 0c1cb98f5b Added the code to save reimbursement in database ashutosh.nehete 2025-07-29 18:11:33 +05:30
• f4368ae4e3 change display name fo expense status from Paid to Mark as Paid ashutosh.nehete 2025-07-29 17:17:57 +05:30
• ce4e52e69d Chnage the name of Prosecc Pending to payment Payment pending ashutosh.nehete 2025-07-29 15:59:12 +05:30
• 6c32a48095 Changed the display names of expense status ashutosh.nehete 2025-07-29 15:47:49 +05:30
• 9e15cf0447 Optimized the Create contact API in directory module ashutosh.nehete 2025-07-29 15:00:23 +05:30
• 0b2883af0f Added proper reponse message in expense APIs ashutosh.nehete 2025-07-28 18:00:37 +05:30
• 53a93542e9 Optimized the Get contact details API ashutosh.nehete 2025-07-28 14:50:48 +05:30
• 5b091a8d6f Rewrite the uf condiotn in get expense details API ashutosh.nehete 2025-07-28 11:18:26 +05:30
• 61741331e0 Corrected the feaching logic for expense delete API ashutosh.nehete 2025-07-28 10:37:18 +05:30
• 019ef5d997 Optimized the contact list API in Directory Controller ashutosh.nehete 2025-07-26 14:57:05 +05:30
• 7619ce9820 FIltering the master list by active and inactive ashutosh.nehete 2025-07-26 09:17:26 +05:30
• 57d2b03c02 Change the id else logic to show proper message upon deletion or resotation of master entity in expenses module ashutosh.nehete 2025-07-26 09:11:04 +05:30
• 0aefcb97de Added call for lign API contact_import ashutosh.nehete 2025-07-26 08:56:10 +05:30
• c45d9238c8 Added an API to save multiple contacts in database ashutosh.nehete 2025-07-25 17:31:11 +05:30
• 0f65ccace5 Add API interface to call API Vikas Nale 2025-07-25 14:36:32 +05:30
• aa47bfe59c Added an API to modify isActive parameter in Payment mode master table for that tenant ashutosh.nehete 2025-07-25 13:06:28 +05:30
• 9acb9974a0 Add a WPF project for utility application - Import Director contact is implemented Vikas Nale 2025-07-25 13:05:59 +05:30
• f1e9a8655a Added an API to modify isActive parameter in Expense status master table for that tenant ashutosh.nehete 2025-07-25 13:02:13 +05:30
• b4931aafd6 Added an API to modify isActive parameter in Expense type master table for that tenant ashutosh.nehete 2025-07-25 12:54:49 +05:30
• e31e19ed74 Added an API to update expenses status to master table for that tenant ashutosh.nehete 2025-07-25 12:28:06 +05:30
• 2ad0638d4f Added applied filters in response ashutosh.nehete 2025-07-25 12:26:34 +05:30
• a196906bf9 Added an API to update payment mode to master table for that tenant ashutosh.nehete 2025-07-25 12:07:16 +05:30
• 5b5aa9f77a Added an API to update Expense type to master table for that tenant ashutosh.nehete 2025-07-25 11:52:47 +05:30
• cad631ec7a Added the end point for add expenses status API ashutosh.nehete 2025-07-25 11:07:15 +05:30
• 9cd9bac975 Added an API to add new Expense status to master table for that tenant ashutosh.nehete 2025-07-25 10:55:25 +05:30
• 1834c103f0 Added an API to add new payment mode to master table for that tenant ashutosh.nehete 2025-07-25 10:36:57 +05:30
• e1102c2978 Added an API to add new Expense type to master table for that tenant ashutosh.nehete 2025-07-25 10:26:29 +05:30
• 62956d6b12 solved the mearge error Issues_July_4W ashutosh.nehete 2025-07-24 17:28:27 +05:30
• c2fe726f0c Added signalR in update expesne API ashutosh.nehete 2025-07-24 16:16:30 +05:30
• c881964ab1 Added proper validation and logs in get expesne status, expenses type and payment mode APIs ashutosh.nehete 2025-07-24 16:07:39 +05:30
• 809d64e296 Added permission IDs in expesne status master View model ashutosh.nehete 2025-07-24 16:03:23 +05:30
• 36163e97cc Merge pull request 'Added Designation Parameter in Contacts and Implement in Related APIs' (#104) from Ashutosh_Enhancement_#631 into Issues_July_4W Vikas Nale 2025-07-24 10:04:45 +00:00