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

• d0912cca56 Merge pull request 'Organization_Management' (#142) from Organization_Management into main ashutosh.nehete 2025-09-30 09:05:14 +00:00
• d957c692f1 Added new API to get monthly attendance report Organization_Management ashutosh.nehete 2025-09-30 14:34:29 +05:30
• 40ca680f45 Added the Organization sub-menu in project menu in MenuStaticMaster ashutosh.nehete 2025-09-30 12:42:29 +05:30
• 8dee7b0fa2 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.api into Organization_Management ashutosh.nehete 2025-09-30 12:36:39 +05:30
• 1e1fe6692d Added the permission check in note create API ashutosh.nehete 2025-09-30 12:34:58 +05:30
• 0df13975a7 Added logic to add hard coded menu if menu from mongodb connot be found ashutosh.nehete 2025-09-30 12:30:04 +05:30
• 8fb5aa632d Removed the cache get logic from expenses get APIs ashutosh.nehete 2025-09-30 12:26:10 +05:30
• 7e4d4b0f5b Chnaged the log to check if sprid in used wile searching ashutosh.nehete 2025-09-30 11:40:43 +05:30
• 64bde99ab5 Corrected the check to add self organization ashutosh.nehete 2025-09-30 10:18:15 +05:30
• 90851a3349 Added HasAdmin check when adding note for contact ashutosh.nehete 2025-09-29 17:22:45 +05:30
• 2c0cd87227 Sloved the issue in get task list where user is getting the list of all tasks accept the task of selected project ashutosh.nehete 2025-09-29 16:50:38 +05:30
• c3670eaab9 Added Primary organization of tenant in get organization list ashutosh.nehete 2025-09-29 14:48:42 +05:30
• 1cd8203d27 Added the PMC, Promotor and Primary organization of the tenant in list of assigned organization to project ashutosh.nehete 2025-09-29 14:33:57 +05:30
• 5df66b79ca Added check to check the Designation in create contact API ashutosh.nehete 2025-09-29 11:15:14 +05:30
• 31da8a4402 Added the AsNoTracking in GetCurrentEmployeeAsync and get permission Ids helper functions ashutosh.nehete 2025-09-29 10:18:44 +05:30
• 27a2610388 Added the HasApplicationAccess in Employee VM ashutosh.nehete 2025-09-29 10:08:14 +05:30
• cd175c4fdf Added the services in organization details API ashutosh.nehete 2025-09-29 09:42:21 +05:30
• d6145ee0ba Added the forgin key for approver in attends table ashutosh.nehete 2025-09-27 14:50:51 +05:30
• 04086ed7e0 Creating the application user in manage employee API through mobile ashutosh.nehete 2025-09-27 14:18:42 +05:30
• a9b4b79ee4 Added the service ID and Organization ID in get project allocation API ashutosh.nehete 2025-09-27 10:33:42 +05:30
• 70092e5601 Added the created by and updated by in organization update API ashutosh.nehete 2025-09-26 16:12:46 +05:30
• 33cd7113a7 Merge pull request 'Add new API to get organization details' (#141) from Ashutosh_Task_#1362 into Organization_Management ashutosh.nehete 2025-09-26 10:26:46 +00:00
• 1d4d61ef2c Add new API to get organization details Ashutosh_Task_#1362 ashutosh.nehete 2025-09-26 15:53:38 +05:30
• f93686c1df Removed the Activity from master menu ashutosh.nehete 2025-09-26 14:59:24 +05:30
• f2213db807 Added organizationId filter to the employee list for organization assiged to the project ashutosh.nehete 2025-09-26 11:43:44 +05:30
• eddbdde355 Merge pull request 'Added new API to get list of employees assigned to project and filtered by services and organizations' (#140) from Ashutosh_Task#1360 into Organization_Management ashutosh.nehete 2025-09-26 06:02:25 +00:00
• 0048281616 Added new API to get list of employees assigned to project and filtered by services and organizations Ashutosh_Task#1360 ashutosh.nehete 2025-09-26 11:30:28 +05:30
• f248557704 Optimized the Organization APIs ashutosh.nehete 2025-09-25 17:17:21 +05:30
• 18d590ccbe Added the promotor and PMC in project VM ashutosh.nehete 2025-09-25 16:56:21 +05:30
• 4c6070fee5 Merge pull request 'Added the service Id in Query parameter to get infra details API' (#139) from Ashutosh_Enhancement_#1355 into Organization_Management ashutosh.nehete 2025-09-25 10:16:20 +00:00
• 0fb5c3935d Added the service Id in Query parameter to get infra details API Ashutosh_Enhancement_#1355 ashutosh.nehete 2025-09-25 15:45:47 +05:30
• 2f052174aa Changed the VM when creating and updating project ashutosh.nehete 2025-09-25 12:37:57 +05:30
• 2258771229 Merge pull request 'Enhanced the Create and update project API' (#138) from Ashutosh_Enhancement#1347 into Organization_Management ashutosh.nehete 2025-09-25 06:50:39 +00:00
• e4e49595e6 Enhanced the Create and update project API Ashutosh_Enhancement#1347 ashutosh.nehete 2025-09-25 12:18:44 +05:30
• 44d2827dcc Added the global services ids list parameter in create tenant DTO ashutosh.nehete 2025-09-25 09:54:08 +05:30
• fef3db297c Mapping the tenant with organization when creating the organization ashutosh.nehete 2025-09-24 19:43:45 +05:30
• 0d4d4c3754 Seprated the service ID in task list from filter ashutosh.nehete 2025-09-24 19:35:16 +05:30
• 162d735d16 Added new API to get employee list ashutosh.nehete 2025-09-24 19:20:21 +05:30
• 38e1f7a0fc Added no tracking in upate bucket API ashutosh.nehete 2025-09-24 17:47:08 +05:30
• fe1dfd7293 Getting the employee list of user's organization only ashutosh.nehete 2025-09-24 17:23:32 +05:30
• 42da1f12cf Added the assigned by in organization mapping ashutosh.nehete 2025-09-24 17:20:09 +05:30
• c5da400e6b Enhanced the manage employe API ashutosh.nehete 2025-09-24 13:06:51 +05:30
• a405cfec13 If team meamber not found send empty ashutosh.nehete 2025-09-23 13:24:19 +05:30
• bc3e927777 Solved the typo ashutosh.nehete 2025-09-23 13:17:58 +05:30
• c304b615f7 Fixed the spelling mistake ashutosh.nehete 2025-09-23 13:15:11 +05:30
• 8d64e9702d Added the get filter API in image gallery ashutosh.nehete 2025-09-23 13:05:23 +05:30
• 98acbb66d6 Merge pull request 'Added the new parameter of service ids in image gallery filter' (#137) from Ashutosh_Enhancement_#1297 into Organization_Management ashutosh.nehete 2025-09-23 06:26:27 +00:00
• 81d1137939 Added the new parameter of service ids in image gallery filter Ashutosh_Enhancement_#1297 ashutosh.nehete 2025-09-23 11:55:29 +05:30
• 0c6f5e0df0 Merge pull request 'Added the filter and pagenation in get task list API' (#136) from Ashutosh_Enhancement_#1293 into Organization_Management ashutosh.nehete 2025-09-23 06:15:47 +00:00
• f45bc29a44 Added the filter and pagenation in get task list API Ashutosh_Enhancement_#1293 ashutosh.nehete 2025-09-23 11:34:14 +05:30
• ef84ba34da Addedd the tenant ID in employee profile cache ashutosh.nehete 2025-09-21 18:10:25 +05:30
• bd421d45aa Added the Jobrole in attendance ashutosh.nehete 2025-09-21 16:37:15 +05:30
• 777a72c71f Filtered the employees in attendance by organization ashutosh.nehete 2025-09-21 16:11:23 +05:30
• 264c9466c9 Chnaged the logic check if tenant and organization have any relation ashutosh.nehete 2025-09-21 15:37:55 +05:30
• a1f6552347 Added OrganizationID in JWT token ashutosh.nehete 2025-09-21 11:44:38 +05:30
• 06c5457981 Added the new API to get detailed list of services and enhanced the get work-items list to filter by service ashutosh.nehete 2025-09-21 11:36:09 +05:30
• 0ba4ccf45c Added the logic to filter by service Id ashutosh.nehete 2025-09-20 19:25:33 +05:30
• 84e2f840b4 distinct the organization in Get Assigned Organizations To Project API ashutosh.nehete 2025-09-20 18:37:08 +05:30
• 34b89c4718 Solved the rebase issues ashutosh.nehete 2025-09-20 18:06:37 +05:30
• d0745e8688 Merge pull request 'Firebase_Implementation' (#135) from Firebase_Implementation into main ashutosh.nehete 2025-09-20 12:11:54 +00:00
• 7d85cb5f4c Added the serviceId in project allocation ashutosh.nehete 2025-09-20 17:05:30 +05:30
• 9b59a4d6b6 Added the organization filter in get project allocation API ashutosh.nehete 2025-09-20 14:58:32 +05:30
• 7e0322c859 Chnage the keyword modefied to modified Firebase_Implementation ashutosh.nehete 2025-09-20 12:44:39 +05:30
• 05bfa48115 added the TenantStatus and Industry in get tenant list API ashutosh.nehete 2025-09-20 12:30:37 +05:30
• 091d73958d Added the comma seprated project IDs to notification data ashutosh.nehete 2025-09-20 12:25:48 +05:30
• f45ada2be2 Changed the login endpoints ashutosh.nehete 2025-09-20 12:06:27 +05:30
• bcc416f47e Changed the Login Flow for auth controller and added the get tenant list and select tenant ashutosh.nehete 2025-09-20 11:40:04 +05:30
• ee1cb73fe5 Added the commit statement in assign organization to tenant API ashutosh.nehete 2025-09-20 11:33:01 +05:30
• eba1a70037 Added the data notification in delete employee API ashutosh.nehete 2025-09-20 11:12:32 +05:30
• 2f03de97d6 Added the total pages, page number, tota count in response ashutosh.nehete 2025-09-19 21:13:53 +05:30
• a1ab143df5 Fixed the error of checking the updated date to uploaded date ashutosh.nehete 2025-09-19 18:02:29 +05:30
• 64e6255458 Solved the rebase issuees ashutosh.nehete 2025-09-19 17:51:27 +05:30
• aa596b736d If service not exist in databse the not added in mapping ashutosh.nehete 2025-09-19 16:56:31 +05:30
• 3884c74d9b First saving the project sevice mapping then the project org mapping ashutosh.nehete 2025-09-19 16:46:41 +05:30
• 7f2b9f0ceb Merge pull request 'Added the API to get the organization list assigned to the project' (#134) from Ashutosh_Task#1246 into Organization_Management ashutosh.nehete 2025-09-19 10:36:49 +00:00
• f633e11e97 Added the API to get the organization list assigned to the project Ashutosh_Task#1246 ashutosh.nehete 2025-09-19 16:04:32 +05:30
• 5fab8371ac Merge pull request 'Added the API to assign the organization to tenant' (#133) from Ashutosh_Task#1239 into Organization_Management ashutosh.nehete 2025-09-19 10:04:08 +00:00
• 2e0ea562fe Added the API to assign the organization to tenant Ashutosh_Task#1239 ashutosh.nehete 2025-09-19 15:31:07 +05:30
• 8c97c78408 Added the API to get organization type list ashutosh.nehete 2025-09-19 14:53:55 +05:30
• 86102ef70d Merge pull request 'Added the API to get list of services according to the project and logged in employee' (#132) from Ashutosh_Task#1225 into Organization_Management ashutosh.nehete 2025-09-19 08:53:59 +00:00
• 009ac36e38 Changed the response message for get services API Ashutosh_Task#1225 ashutosh.nehete 2025-09-19 14:22:14 +05:30
• d38bc4752a Added the API to get list of services according to the project and logged in employee ashutosh.nehete 2025-09-19 14:15:41 +05:30
• 77db9a6bd9 Added the services in master menu list ashutosh.nehete 2025-09-19 11:42:23 +05:30
• d452faf6a9 Solved the misssig key word ashutosh.nehete 2025-09-18 18:11:57 +05:30
• 2ce294904b Checking the project levelmpermission in project controller ashutosh.nehete 2025-09-18 18:04:22 +05:30
• 1e66dd2017 Added the deassiged service from project API ashutosh.nehete 2025-09-18 17:23:50 +05:30
• aed6949187 Added IsActive In ProjectServiceMapping Table ashutosh.nehete 2025-09-18 16:54:37 +05:30
• b069e9f07d Changed the check of the add note API ashutosh.nehete 2025-09-18 16:17:48 +05:30
• d41c49af7b Removed the Document ID Uniqueness ashutosh.nehete 2025-09-18 15:55:45 +05:30
• a10b24523e Added the checks to check the Designation and Description in contact ashutosh.nehete 2025-09-18 15:42:49 +05:30
• efd8667774 Added the VM in assign organization to project ashutosh.nehete 2025-09-18 15:18:33 +05:30
• ac672d0cc2 Added the document ID in document controller firebase data notification ashutosh.nehete 2025-09-18 15:04:41 +05:30
• de883103d5 Added the assign organization to project API ashutosh.nehete 2025-09-18 13:10:08 +05:30
• bb31e33983 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.api into Organization_Management ashutosh.nehete 2025-09-18 12:02:44 +05:30
• 51d86d7bfc Merge pull request 'Ashutosh_Subscription_Plan' (#131) from Ashutosh_Subscription_Plan into main ashutosh.nehete 2025-09-18 06:32:18 +00:00
• 2039d84918 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.api into Ashutosh_Subscription_Plan Ashutosh_Subscription_Plan ashutosh.nehete 2025-09-18 12:01:57 +05:30
• 0ecc07777f Resolved the multi-threading issue ashutosh.nehete 2025-09-18 12:01:08 +05:30
• 0dd5633f2e Resolved the multi-threading issue ashutosh.nehete 2025-09-18 11:53:05 +05:30
• f8182494d2 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.api into Organization_Management ashutosh.nehete 2025-09-18 11:38:31 +05:30
• dbd551e08c Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.api ashutosh.nehete 2025-09-18 11:34:03 +05:30