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

• d9e0c2ee57 Resloved the issue #1125 ashutosh.nehete 2025-09-18 11:33:59 +05:30
• db0d464ab5 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.api into Organization_Management ashutosh.nehete 2025-09-18 10:26:29 +05:30
• 55cae17ed1 Added the API og list organization ashutosh.nehete 2025-09-18 10:25:59 +05:30
• 846b3ed6e3 Merge pull request 'Ashutosh_Get_All_Permission' (#130) from Ashutosh_Get_All_Permission into main ashutosh.nehete 2025-09-18 04:52:11 +00:00
• 3f8024421a Sending the data message to all employees asigned to the project ashutosh.nehete 2025-09-18 10:07:05 +05:30
• 9d71a71a53 Sending the attendance data notification to all employees from the project ashutosh.nehete 2025-09-18 09:56:39 +05:30
• 4a25158cc9 Added the Promoter and PMC in project ashutosh.nehete 2025-09-17 18:09:58 +05:30
• 20b12cfcd4 Added the contactId in firebase for directory notification ashutosh.nehete 2025-09-17 17:19:55 +05:30
• 0eb740fa25 Added the organization forgin key in tenant table and removed the tenantId from application user ashutosh.nehete 2025-09-17 15:01:40 +05:30
• 5158153ee6 Added the forign key of organization in eployee table ashutosh.nehete 2025-09-17 14:40:04 +05:30
• 4884bf5de0 Checking the manage infra permission when getting the infra Ashutosh_Get_All_Permission ashutosh.nehete 2025-09-17 13:17:38 +05:30
• 368fd37115 Removed the employee management from project-level permissions ashutosh.nehete 2025-09-17 12:47:09 +05:30
• 68cd5acc9c Added the HasApplicationAccess parameter in employees table ashutosh.nehete 2025-09-17 12:27:13 +05:30
• 30623d6bbc Added the create organization API ashutosh.nehete 2025-09-17 12:01:22 +05:30
• 1e8c967d7a Added migration for Organization related permissions ashutosh.nehete 2025-09-17 11:40:03 +05:30
• cda8005b1b Added the Organization related permissions ashutosh.nehete 2025-09-17 11:35:53 +05:30
• 8d97b2a687 Added the create global service API ashutosh.nehete 2025-09-17 11:15:06 +05:30
• 061f287e8c Added the API to get global services ashutosh.nehete 2025-09-17 11:01:34 +05:30
• 84baa3a147 Added the subscription list API in Market Controller ashutosh.nehete 2025-09-16 18:17:43 +05:30
• fae6d7bbe9 Added the CRUD operation for services, activity group, activity ashutosh.nehete 2025-09-16 15:29:32 +05:30
• 0ef9d66cf1 Adding the models related to organizations ashutosh.nehete 2025-09-16 15:27:44 +05:30
• d9a1832e2e updated the get project-level permissions ashutosh.nehete 2025-09-16 15:05:32 +05:30
• 122e7074b8 Added the GetAllPermissionFroProject API ashutosh.nehete 2025-09-16 13:34:22 +05:30
• cdc2afb688 Added the update bucket query ashutosh.nehete 2025-09-16 11:36:38 +05:30
• 892facef40 Added the projectID and employeeID in document modification notification ashutosh.nehete 2025-09-15 18:04:44 +05:30
• 0b150fed9a Checking the correct permission updating the notes ashutosh.nehete 2025-09-15 17:04:18 +05:30
• b17d1d30e5 taken the requried service from thread ashutosh.nehete 2025-09-15 17:01:29 +05:30
• a0789f7f8e Corrected the spell mistake in firebase keywords ashutosh.nehete 2025-09-15 16:31:43 +05:30
• 7d30831408 Removed the requried from base64 when getting any attachment ashutosh.nehete 2025-09-15 16:24:47 +05:30
• 87ebee8005 Added the firebase notification in document controller ashutosh.nehete 2025-09-12 18:02:58 +05:30
• a88446ceb5 Added the firebase notification in directory controller ashutosh.nehete 2025-09-12 16:31:39 +05:30
• 5717bb6dac Added the joining date parameter when creating or update employee using the mobiles ashutosh.nehete 2025-09-12 12:46:07 +05:30
• cf35b8c773 Added the IsAttachmentRequried parameter to ExpensesTypeMaster table ashutosh.nehete 2025-09-12 12:38:26 +05:30
• 5105da7b54 Resloved the rebase ashutosh.nehete 2025-09-12 09:46:39 +05:30
• e1b045f852 Merge pull request 'Document_Manager' (#129) from Document_Manager into main ashutosh.nehete 2025-09-11 04:12:00 +00:00
• f75c31b3ce Added the check for checking uniquness of document ID Document_Manager ashutosh.nehete 2025-09-10 11:52:13 +05:30
• 01f214a60b Added the TotalRecords parameter to get contact list API response ashutosh.nehete 2025-09-10 10:27:24 +05:30
• 935f5345b9 Solved the rebase issues ashutosh.nehete 2025-09-09 16:38:24 +05:30
• 5263e89df6 Merge pull request 'Directory_Refactor' (#128) from Directory_Refactor into Document_Manager ashutosh.nehete 2025-09-09 11:03:45 +00:00
• 7324537a90 Solved the rebase issues Directory_Refactor ashutosh.nehete 2025-09-09 16:33:23 +05:30
• caeac04d0d Added the logic to bypass the seat check condition ashutosh.nehete 2025-09-09 15:29:26 +05:30
• 33ebee08db Merge pull request 'Mobile_Logger_Feature' (#127) from Mobile_Logger_Feature into Directory_Refactor ashutosh.nehete 2025-09-09 05:19:45 +00:00
• d51d7da4f8 Merge branch 'Directory_Refactor' of https://git.marcoaiot.com/admin/marco.pms.api into Mobile_Logger_Feature Mobile_Logger_Feature ashutosh.nehete 2025-09-09 10:49:13 +05:30
• de08ceeb0d reduce the otp exprie time to 5 mins ashutosh.nehete 2025-09-08 15:12:26 +05:30
• ecabf52f2f splited the logic to get employee by projecr id ashutosh.nehete 2025-09-08 15:09:25 +05:30
• aa2a370467 getting the employee list filtered by tenant ashutosh.nehete 2025-09-08 15:07:30 +05:30
• 73318060ec Added the distinct in get employee list ashutosh.nehete 2025-09-08 14:58:16 +05:30
• 365439b2de only send employee with unique IDs when getting list ashutosh.nehete 2025-09-08 14:49:14 +05:30
• 413c804a87 Adding the code to send email using brevo Brevo_Mailling ashutosh.nehete 2025-09-08 14:26:27 +05:30
• 06db1adc52 Added the debug logs in log controller ashutosh.nehete 2025-09-08 11:47:53 +05:30
• 4f77431541 Changed the folder name ashutosh.nehete 2025-09-08 10:32:32 +05:30
• 1fd0837640 Solved the rebase error ashutosh.nehete 2025-09-08 10:26:05 +05:30
• 672046d02e Added the contact note filter in get all contact notes API ashutosh.nehete 2025-09-05 17:48:25 +05:30
• 48562235f5 Added the get filter APIs for contacts and contact notes ashutosh.nehete 2025-09-04 16:57:37 +05:30
• d507b9ede2 Intregating the project-level permissions in document controller ashutosh.nehete 2025-09-04 14:52:25 +05:30
• 194764c9d6 Solving the rebase confilt ashutosh.nehete 2025-09-04 12:42:44 +05:30
• 28caee40e3 Adding the overwriting the project-level permissions to tenant-level permission ashutosh.nehete 2025-09-04 12:39:25 +05:30
• 4a13386546 Optimized the get employee list for project-level permission ashutosh.nehete 2025-09-04 12:27:48 +05:30
• b336bd3481 Added the API to get list of employee whom project-level is assigned ashutosh.nehete 2025-09-04 12:19:27 +05:30
• 3a3e742296 Added the API to get modules for project level configuration ashutosh.nehete 2025-09-03 18:08:43 +05:30
• 35ea41d1ce Added the file meta-data of file in details and get version API ashutosh.nehete 2025-09-03 18:01:07 +05:30
• 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_Task#1036 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_Task#1029 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_Task#1027 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_Task#1026 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_Task#1025 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_Task#1013 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_Task#1010 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_Task#1011 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_Task#1009 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