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

• 0916abe464 Added the Manage project-level permissions API ashutosh.nehete 2025-09-03 16:55:20 +05:30
• 961cc018cf Chnage response of get tag API ashutosh.nehete 2025-09-03 16:05:35 +05:30
• 2e55d1e3c4 Added the get document tags API ashutosh.nehete 2025-09-03 15:31:26 +05:30
• c27b2a2ff1 Added the check to check the system defined types ashutosh.nehete 2025-09-03 14:50:03 +05:30
• cd489f45ae added the document categeory vm in document type ashutosh.nehete 2025-09-03 13:15:15 +05:30
• 4c2b33472b Added the new condition while checking the document category or type by name ashutosh.nehete 2025-09-03 12:51:07 +05:30
• 9b3324c27c Added the documents in mobile side menu ashutosh.nehete 2025-09-03 11:46:14 +05:30
• efc577f9a2 Corrected the equation to gt total number of pages ashutosh.nehete 2025-09-03 11:06:22 +05:30
• 391d79af3e Created the structure for project-level-permissions APIs ashutosh.nehete 2025-09-02 16:05:08 +05:30
• 830a9526dd Added the total page and count in list APis for documnets ashutosh.nehete 2025-09-02 15:29:48 +05:30
• 067da422c2 Added the pagenantion to get version list API ashutosh.nehete 2025-09-02 14:46:51 +05:30
• c199e3e241 Added the end-point for maste APIs of document modules ashutosh.nehete 2025-09-02 14:36:42 +05:30
• 1d50d4987a added the crud opration for document modules ashutosh.nehete 2025-09-02 14:19:03 +05:30
• de4d62ba78 added tags in documents details API ashutosh.nehete 2025-09-01 20:56:25 +05:30
• b6243f8100 Added the document category in details ashutosh.nehete 2025-09-01 12:09:34 +05:30
• 727df6e828 Added the download permission to get persigned Url API ashutosh.nehete 2025-08-30 10:27:42 +05:30
• e34840fbb8 Added the entity Id in get list API ashutosh.nehete 2025-08-29 18:27:35 +05:30
• dd48e5071c Merge pull request 'Added the API to activate and deactivate the document' (#126) from Ashutosh_Task#1036 into Document_Manager ashutosh.nehete 2025-08-29 12:54:28 +00:00
• 242c345ce1 Added the API to activate and deactivate the document ashutosh.nehete 2025-08-29 18:23:55 +05:30
• 2ca9dead1f Merge pull request 'Added the API to get document attachment details' (#125) from Ashutosh_Task#1029 into Document_Manager ashutosh.nehete 2025-08-29 11:48:16 +00:00
• ec4756d888 Added the API to get document attachment details ashutosh.nehete 2025-08-29 17:17:38 +05:30
• 03959f9b38 Merge pull request 'Added the API to get Pre-Signed Url by attachment ID' (#124) from Ashutosh_Task#1027 into Document_Manager ashutosh.nehete 2025-08-29 10:42:43 +00:00
• ac69bcb339 Added the API to get Pre-Signed Url by attachment ID ashutosh.nehete 2025-08-29 16:11:58 +05:30
• a24db1716f Merge pull request 'Added the API to get old version list' (#123) from Ashutosh_Task#1026 into Document_Manager ashutosh.nehete 2025-08-29 10:14:48 +00:00
• ec85fd8eb3 Added the API to get old version list ashutosh.nehete 2025-08-29 15:44:15 +05:30
• 61f5b14fcc Merge pull request 'Added the API to verify or reject the document' (#122) from Ashutosh_Task#1025 into Document_Manager ashutosh.nehete 2025-08-29 07:41:07 +00:00
• 87cf37ca03 Added the API to verify or reject the document ashutosh.nehete 2025-08-29 13:10:31 +05:30
• 0cdbd574db changing the documentDataId if attachment is not verified ashutosh.nehete 2025-08-29 12:42:27 +05:30
• 72765fd491 Merge pull request 'Added the get filter for documents' (#121) from Ashutosh_Task#1013 into Document_Manager ashutosh.nehete 2025-08-29 06:56:16 +00:00
• 7e98429e10 Added the get filter for documents ashutosh.nehete 2025-08-29 12:25:43 +05:30
• 759fa9324b Merge pull request 'Added the update document API' (#120) from Ashutosh_Task#1010 into Document_Manager ashutosh.nehete 2025-08-29 05:59:39 +00:00
• d2af05b6a0 Added the update document API ashutosh.nehete 2025-08-29 11:29:04 +05:30
• 6d207e8f7d Merge pull request 'Added the list document API' (#119) from Ashutosh_Task#1011 into Document_Manager ashutosh.nehete 2025-08-28 11:50:47 +00:00
• cf2b07ee77 Added the list document API ashutosh.nehete 2025-08-28 17:20:09 +05:30
• 08232ee34f Added uploaded by in response of upload document API ashutosh.nehete 2025-08-28 15:13:44 +05:30
• d57395efcd Merge pull request 'Added the upload document API' (#118) from Ashutosh_Task#1009 into Document_Manager ashutosh.nehete 2025-08-28 09:31:22 +00:00
• 75ae12a81e Added the upload document API ashutosh.nehete 2025-08-28 15:00:16 +05:30
• 4c36cf266f Added Document Category and Document Type in master menu list ashutosh.nehete 2025-08-28 14:31:55 +05:30
• 39ebc69da7 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.api into Document_Manager ashutosh.nehete 2025-08-28 12:53:46 +05:30
• 8ceac5aa91 Merge pull request 'Added the get list of Document type API' (#117) from Ashutosh_Task#1019 into Document_Manager ashutosh.nehete 2025-08-28 07:19:30 +00:00
• 4161506def Added the get list of Document type API ashutosh.nehete 2025-08-28 12:48:13 +05:30
• a89a2f076f Merge pull request 'Added the Get Document Category list API' (#116) from Ashutosh_Task#1018 into Document_Manager ashutosh.nehete 2025-08-28 06:47:43 +00:00
• eac77e23d4 Added the Get Document Category list API ashutosh.nehete 2025-08-28 12:17:05 +05:30
• 0ef9f0e62d Change the endpoint of request Demo API ashutosh.nehete 2025-08-28 11:50:06 +05:30
• 6aaa38ba52 Fixed the spelling mistake ashutosh.nehete 2025-08-28 11:41:32 +05:30
• 535a9924cc Merge pull request 'Added the tables for document management' (#115) from Ashutosh_Task#980 into Document_Manager ashutosh.nehete 2025-08-28 05:55:42 +00:00
• 3dfdb2ab5d Added the tables for document management ashutosh.nehete 2025-08-28 11:22:31 +05:30
• d3eebb2086 Merge pull request 'Tenant_Management' (#114) from Tenant_Management into main ashutosh.nehete 2025-08-28 05:13:09 +00:00
• 03f7a5ba14 Added new get menu list for mobile ashutosh.nehete 2025-08-26 15:17:00 +05:30
• 6253ba7de3 Chnaged the logic of adding and removing the permissions ashutosh.nehete 2025-08-25 15:21:02 +05:30
• fdcbd9af5f Added the logic to only remove the employee permission if every module in subscription is not enabled ashutosh.nehete 2025-08-25 12:57:15 +05:30
• 9765ce1b8f Added the check to check the max user in add subscription as well ashutosh.nehete 2025-08-25 11:02:38 +05:30
• 5d8a5909bc Added the check to check the ma user count ashutosh.nehete 2025-08-25 10:40:09 +05:30
• 2c841b3bd0 Resovled the mearge confilects ashutosh.nehete 2025-08-25 10:22:51 +05:30
• 66716dda0f Sending the master list by name order ashutosh.nehete 2025-08-25 10:19:39 +05:30
• 76ac9de014 Set logic the get all master table for super tenant ashutosh.nehete 2025-08-24 14:12:55 +05:30
• 3864788d43 Changed the logic for super tenant ashutosh.nehete 2025-08-24 13:57:56 +05:30
• 300f570907 Optimized the get master table list ashutosh.nehete 2025-08-24 13:53:09 +05:30
• e7705a5051 Added API to get Master Tables list dynamically ashutosh.nehete 2025-08-24 13:38:39 +05:30
• f85f1adb92 Added current plan feature details in tenant profile ashutosh.nehete 2025-08-23 18:28:24 +05:30
• 9e11ca0008 added coments in appmenu controller ashutosh.nehete 2025-08-23 18:23:26 +05:30
• ff288448b0 Optimized the the Appmenu controller ashutosh.nehete 2025-08-23 17:53:53 +05:30
• 4ebd49d0c8 Merge pull request 'Issues_Aug_1W' (#113) from Issues_Aug_1W into main ashutosh.nehete 2025-08-23 11:08:42 +00:00
• 7cfebd764c sloving the merage conflicts ashutosh.nehete 2025-08-23 13:23:00 +05:30
• 5d2687f1e7 Merge pull request 'AppMenu : Implement Sidebar Menu with Permission-based Access Control' (#112) from AppMenu into Tenant_Management ashutosh.nehete 2025-08-23 07:49:59 +00:00
• f97a59994e Sloving the Mearge conflict ashutosh.nehete 2025-08-23 13:19:39 +05:30
• 68027ded77 If user has manage tenant permission then only showing the tenants he/she created ashutosh.nehete 2025-08-23 13:07:20 +05:30
• ea1e172c65 resolved conflicts pramod mahajan 2025-08-23 12:45:20 +05:30
• bd4f1d5e69 Added the IsRoot user Field in employee profile VM ashutosh.nehete 2025-08-23 11:42:11 +05:30
• da787cfe43 Removed the FCM token from login DTO and logic of adding FCM token to database from mobile login API ashutosh.nehete 2025-08-23 11:17:28 +05:30
• ac23a8724d Added page size the search emplyee API ashutosh.nehete 2025-08-23 09:53:32 +05:30
• 540c3e75fd Changed the logic of validating ashutosh.nehete 2025-08-22 17:27:53 +05:30
• 6f7fad1ae4 Added a new validation to check if the tenant is it's own tenant ashutosh.nehete 2025-08-22 14:50:59 +05:30
• 88a7a90bfe Getting the permission through different scope ashutosh.nehete 2025-08-22 12:55:07 +05:30
• 263d55cff0 Fixed the error occured due to rebasing Activity_Hierarchy ashutosh.nehete 2025-08-22 11:30:32 +05:30
• dd9ee03282 Solving the rebase errors ashutosh.nehete 2025-08-22 11:13:04 +05:30
• 7eabd4fa73 Added the tenant ID in emplyee profile ashutosh.nehete 2025-08-22 10:17:54 +05:30
• 452f4a7e5a Removed the unnesseary notification ashutosh.nehete 2025-08-21 11:23:17 +05:30
• 0de2e3f75d Corrected the typo in method name ashutosh.nehete 2025-08-21 09:50:10 +05:30
• ca31c011e4 Addd code to remove duplicate FCM tokens ashutosh.nehete 2025-08-20 17:11:16 +05:30
• 5ac1c2b798 Added the expiry date in FCM mapping table ashutosh.nehete 2025-08-20 17:00:17 +05:30
• cf51d4f37c Added the notification for expenses controller ashutosh.nehete 2025-08-20 16:07:00 +05:30
• 445d02662a Merge pull request 'Restrict the user creation if the maximum user limit is reached' (#111) from Ashutosh_Bug#935 into Tenant_Management ashutosh.nehete 2025-08-20 06:50:20 +00:00
• 307c7c96c2 Optimized the helper function ashutosh.nehete 2025-08-20 12:19:16 +05:30
• bc935282a5 Restrict the user creation if the maximum user limit is reached ashutosh.nehete 2025-08-20 12:12:12 +05:30
• 2b6e8b7c8a Added proper keyword for firebase notification ashutosh.nehete 2025-08-20 11:19:16 +05:30
• 4af6891821 Optimized the Directory notes API ashutosh.nehete 2025-08-20 10:55:16 +05:30
• 455cbc5cd4 Added the firebase to project created and update API ashutosh.nehete 2025-08-19 16:04:56 +05:30
• f6ce8dd4f6 Changed the logic to check if logout done by mobile APP ashutosh.nehete 2025-08-19 15:39:34 +05:30
• 5538c3ae25 Removing the FCM Token if employee is logout ashutosh.nehete 2025-08-19 15:25:20 +05:30
• 38450dce70 Firebase notification is Implemented in project infra ashutosh.nehete 2025-08-19 12:07:44 +05:30
• 889b5a84b6 change the employee fetching logic in employe suspend employee ashutosh.nehete 2025-08-19 11:46:14 +05:30
• b4cb81772e Added the function to re activeate the employee ashutosh.nehete 2025-08-19 11:31:14 +05:30
• e8c8c92120 handle error pramod mahajan 2025-08-18 23:31:18 +05:30
• 3ba954ac82 correct the order of haspermission method parameters pramod mahajan 2025-08-18 18:22:50 +05:30
• 23473b33f0 Added firebase notification for task allocation ashutosh.nehete 2025-08-18 17:14:27 +05:30
• 90a2b23c1a Added the condition to check if it is the root tenant ashutosh.nehete 2025-08-18 12:41:00 +05:30
• c84ea987c5 Added the pagenantion in employee search API ashutosh.nehete 2025-08-18 12:21:01 +05:30
• cf161e4a04 Only sending the feature that tenant has permission of ashutosh.nehete 2025-08-18 11:46:42 +05:30
• 374e023cde added perfectly permssion checking coondition and fixed previous mistake pramod mahajan 2025-08-18 10:29:53 +05:30