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

Project_Safety_Management

Purchase_Invoice_Management

Purchase_Order

Response_Encryption

Service_Project_Management

SideMenu_Management

TeanantManagement

TenantManagementV1

Update_Email_Template

Updated_Mobile_Menu

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

• 732cfbef3e added permission for fetch menu according feature permission pramod mahajan 2025-08-18 09:37:16 +05:30
• ff5f673475 initially added fetch menu api pramod mahajan 2025-08-17 12:55:53 +05:30
• 288c0fe492 Adding the days to end date while adding or updating subscription rather than months ashutosh.nehete 2025-08-16 17:26:42 +05:30
• d240a79e49 Assigning the root employee to default when creating the tenant ashutosh.nehete 2025-08-16 17:15:01 +05:30
• d8870b8140 Added default entries for the tenant in master tables depending upon its plan ashutosh.nehete 2025-08-16 16:59:36 +05:30
• 7b1238e7d6 Sending the notification to team member when task is assigned ashutosh.nehete 2025-08-16 11:51:30 +05:30
• 4655aa948b Chnaged the firebase service-account json ashutosh.nehete 2025-08-14 15:05:32 +05:30
• f4cb08f472 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.api into Firebase_Implementation ashutosh.nehete 2025-08-14 14:45:13 +05:30
• 990b928a63 Added proper logs in firebase service ashutosh.nehete 2025-08-14 11:46:40 +05:30
• 3d6926864d Added the current plan details in tenant details API ashutosh.nehete 2025-08-14 11:06:55 +05:30
• 9a9876b7ca Chnaged the login notification body and title ashutosh.nehete 2025-08-13 16:44:54 +05:30
• 884efdce61 Sending the data when marking the Attendance ashutosh.nehete 2025-08-13 16:33:19 +05:30
• ba5698f4b2 Fixed the typo ashutosh.nehete 2025-08-13 16:04:30 +05:30
• 673102cb50 Changed the notification body and titile ashutosh.nehete 2025-08-13 15:40:23 +05:30
• 2699439996 Made FCM token nullable for loginDTO ashutosh.nehete 2025-08-13 15:21:35 +05:30
• 813bc70bda Added firebase in attendance record API ashutosh.nehete 2025-08-13 15:15:14 +05:30
• 58b817be99 Added the firebase services ashutosh.nehete 2025-08-13 11:52:44 +05:30
• d74e64d1dc Merge pull request 'profile_page' (#110) from profile_page into main ashutosh.nehete 2025-08-13 05:44:45 +00:00
• d113fc3c3d Sending the project degination in place of employee degination in allocation history API ashutosh.nehete 2025-08-13 11:07:36 +05:30
• 47a3d6035c Changed the Parameter DeviceToken to FcmToken ashutosh.nehete 2025-08-13 10:41:35 +05:30
• 7f4f266dd0 Changed the notification body ashutosh.nehete 2025-08-13 10:35:24 +05:30
• 5cf6885a93 Added the FCMTokenMapping model ashutosh.nehete 2025-08-13 10:27:13 +05:30
• 48fb5fd449 Sending the notification after sending the response ashutosh.nehete 2025-08-13 10:21:07 +05:30
• f19f759752 Added suspend tenant API ashutosh.nehete 2025-08-12 14:49:23 +05:30
• d9a454ca28 Added the update logs in mongoDB while updating tenant ashutosh.nehete 2025-08-12 14:23:53 +05:30
• b44fd6d49f Created the structure for set device token API ashutosh.nehete 2025-08-12 14:09:16 +05:30
• 56977e3702 Added firebase nuget package ashutosh.nehete 2025-08-12 12:00:59 +05:30
• 6f1a9cd892 solved the conflicts ashutosh.nehete 2025-08-12 11:57:37 +05:30
• 44614f475b solve confilectes ashutosh.nehete 2025-08-12 11:52:53 +05:30
• 7335ad23ce added the logs ashutosh.nehete 2025-08-12 11:31:04 +05:30
• c5385c0b06 Added logs in login-mobile ashutosh.nehete 2025-08-12 10:54:40 +05:30
• 6017d87793 Taking token from model ashutosh.nehete 2025-08-12 10:19:31 +05:30
• f502adb6c6 added notofication in attendance ashutosh.nehete 2025-08-12 10:15:24 +05:30
• 1b47fbdcf0 Testing the firebase notification added in login API ashutosh.nehete 2025-08-12 10:03:28 +05:30
• 37c91d4432 resolving the rebase errors ashutosh.nehete 2025-08-11 16:54:47 +05:30
• 0ba2874041 solving rebase ashutosh.nehete 2025-08-11 16:52:19 +05:30
• 4bd3e59427 Sloving the rebase ashutosh.nehete 2025-08-11 16:50:55 +05:30
• 4a78bb8074 Added updatelogs in update and delete bucket API ashutosh.nehete 2025-08-11 16:37:41 +05:30
• e7302ecd6c Added updatelogs in delete contact API ashutosh.nehete 2025-08-11 14:40:49 +05:30
• 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 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