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

• 70aa5121fa Added the Finance in mobile menu Collection_Management ashutosh.nehete 2025-10-15 17:43:58 +05:30
• 2e299c6152 Added the expense related dashboards ashutosh.nehete 2025-10-15 13:00:17 +05:30
• c13dec9052 Added the payement adjustment heads in master dropdown ashutosh.nehete 2025-10-15 11:26:36 +05:30
• 8c305872a0 Added the CRUD API for Payment Adjustment heads ashutosh.nehete 2025-10-15 11:24:48 +05:30
• 302185808e Added the Payment Adjustment Head table also new API of get Payment Adjustment Head lists as well added the forgin key in received payment table and API ashutosh.nehete 2025-10-14 17:57:37 +05:30
• 4dc37cb0ac Added the projectID filter in get invoice list API ashutosh.nehete 2025-10-14 16:55:46 +05:30
• e80728805b Added the comment in Received Invoice Payment and added provide all project flag in get basic project ashutosh.nehete 2025-10-14 15:34:38 +05:30
• 4434ea971f Added file name and content type in invoice attachment view models ashutosh.nehete 2025-10-14 14:29:57 +05:30
• 5a9b06cca6 Added the update invoice API ashutosh.nehete 2025-10-14 14:24:59 +05:30
• 47bb49fac6 Merge pull request 'Added the organization name in record response object' (#145) from Ashutosh_Bug#1498 into Collection_Management ashutosh.nehete 2025-10-14 06:07:09 +00:00
• 5ce95f7e23 Added the organization name in record response object Ashutosh_Bug#1498 ashutosh.nehete 2025-10-14 11:36:32 +05:30
• 636dd48ad6 Change response for invoice number check ashutosh.nehete 2025-10-14 11:29:04 +05:30
• 62688d508f Added the add comment API and get Details API ashutosh.nehete 2025-10-14 11:24:35 +05:30
• c92e71b292 Added the new API to markAsCompletedthe invoice ashutosh.nehete 2025-10-13 21:08:11 +05:30
• 2b19890b53 Added the create payment received invoice API ashutosh.nehete 2025-10-13 20:44:38 +05:30
• 5ff87cd870 Added the get list of invoices API ashutosh.nehete 2025-10-13 19:59:18 +05:30
• b30369baa5 Added the new API to create invoice ashutosh.nehete 2025-10-13 18:35:57 +05:30
• 4684b438f6 Added the invoice related tables ashutosh.nehete 2025-10-13 18:35:26 +05:30
• 7e20807325 corrected the distinct by error main ashutosh.nehete 2025-10-11 15:57:53 +05:30
• 186486d934 Added the new API to get organizations for dropdown ashutosh.nehete 2025-10-11 15:36:52 +05:30
• d07f0311ae Optmized the work status master APIs ashutosh.nehete 2025-10-11 13:52:20 +05:30
• 2f6031e62c revert e02636b6b66287a22fcfb34c150aece1b136cc68 ashutosh.nehete 2025-10-11 08:19:59 +00:00
• e02636b6b6 Optmized the work status master APIs ashutosh.nehete 2025-10-11 13:48:36 +05:30
• bad784e147 Optimized the contact related msater APIs ashutosh.nehete 2025-10-11 12:59:31 +05:30
• 886d0bb3b1 Clearing the employee profile cache when selecting the tenant ashutosh.nehete 2025-10-10 18:32:01 +05:30
• 2a25bbae82 Added .WithExposedHeaders("Authorization") in project.cs Ashutosh_AllowCredentials ashutosh.nehete 2025-10-10 18:14:23 +05:30
• 2041f99ac5 Added the AllowCredentials in cros in project.cs file ashutosh.nehete 2025-10-10 17:55:59 +05:30
• 74dd9eeb8d organization Tenant Mapping is already existed then return error message ashutosh.nehete 2025-10-10 17:53:23 +05:30
• 1939a63d9a Assigning the appilcation role to root employee of the any organization ashutosh.nehete 2025-10-10 17:05:43 +05:30
• c07db9f94d removed employee project cache when adding the subscription ashutosh.nehete 2025-10-10 15:59:42 +05:30
• 53da15416a Removing all employees profile from cache for certain tenant ashutosh.nehete 2025-10-10 15:46:56 +05:30
• a809bdd469 Merge pull request 'Sloved issues of permissions not been assigned when updating the subscription' (#144) from Ashutosh_Bug#1461 into main ashutosh.nehete 2025-10-10 08:49:19 +00:00
• bb2c098cb9 Sloved issues of permissions not been assigned when updating the subscription Ashutosh_Bug#1461 ashutosh.nehete 2025-10-10 14:17:32 +05:30
• bd3b70f4ea Merge pull request 'Added the RequestedAt and RequestedBy in attendance' (#143) from Ashutosh_Enhancement#1452 into main ashutosh.nehete 2025-10-10 07:06:25 +00:00
• 000cef3bb7 enhanced the get team based on project Ashutosh_Enhancement#1452 ashutosh.nehete 2025-10-10 12:36:11 +05:30
• 522deae8f7 Added the RequestedAt and RequestedBy in attendance ashutosh.nehete 2025-10-10 12:08:53 +05:30
• 663d94093c Enhanced the employe log API OnFieldWork_V1 ashutosh.nehete 2025-10-10 10:01:21 +05:30
• dc83aa72a6 Added the API to get filter task allocation ashutosh.nehete 2025-10-09 16:57:04 +05:30
• 9a8aa4f5ce Changed the index of reject button in expense controller ashutosh.nehete 2025-10-09 16:52:34 +05:30
• af92ab977b Added the get filter API ashutosh.nehete 2025-10-09 16:47:06 +05:30
• c06dc8ebe7 Selecting the default services in project allocation ashutosh.nehete 2025-10-09 16:00:26 +05:30
• 8609db64d2 Made the serviceId is nullable in project allocation ashutosh.nehete 2025-10-09 15:23:37 +05:30
• ef597b2bb7 Added the project ID in attendance VM ashutosh.nehete 2025-10-09 11:28:06 +05:30
• 4acc61f03a Added the Requested by in attendance table ashutosh.nehete 2025-10-08 17:54:37 +05:30
• c47b0da7b8 Showing the list of all attendance even if user have selfattendance permissons ashutosh.nehete 2025-10-08 14:16:24 +05:30
• d180d5d60e Changed the variable from totalCount to totalAmount ashutosh.nehete 2025-10-08 12:32:09 +05:30
• 60eefa78c0 Corrected the total amount sent in expense pending dashboard ashutosh.nehete 2025-10-08 12:30:34 +05:30
• b1af96b923 Added the name of the project name in view model ashutosh.nehete 2025-10-08 12:16:25 +05:30
• 629c4541d6 Removed the logic to save the FCM from verify FCM API ashutosh.nehete 2025-10-08 11:35:43 +05:30
• e831f50505 Removed the logic to save the FCM from verify FCM API ashutosh.nehete 2025-10-08 11:33:34 +05:30
• e93408c00d Removed the FCM token verify MPIN API ashutosh.nehete 2025-10-08 11:30:47 +05:30
• ba88fbced6 Removed the FCM token from MPIN verify API ashutosh.nehete 2025-10-08 11:27:30 +05:30
• 16e509ccbd Hided the tenant management feature permissions from tenant other than super tenant ashutosh.nehete 2025-10-08 11:03:29 +05:30
• 8a4a056c2d Added the query parameter to get all employee in basic employee API ashutosh.nehete 2025-10-08 10:56:05 +05:30
• 13d2e1cd7d Corrected the mistake of showing all images except selected project ashutosh.nehete 2025-10-07 12:34:48 +05:30
• 26acfec408 Added the todays completed tasks ashutosh.nehete 2025-10-06 18:33:37 +05:30
• 3bd38f3c68 Changed the logic in API to get Attendance logs by employee ashutosh.nehete 2025-10-06 16:10:58 +05:30
• f6e8a0d5e2 Sloved missing veriable issue ashutosh.nehete 2025-10-06 15:29:56 +05:30
• 0561e356d8 Added the condition to get all records in expense monthly report API ashutosh.nehete 2025-10-06 15:29:00 +05:30
• 2e29dc9946 Chnaged the check for persentages ashutosh.nehete 2025-10-06 14:42:29 +05:30
• db752a4678 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.api ashutosh.nehete 2025-10-06 13:16:31 +05:30
• 245182eb07 Added the attendance persentage and task persentage ashutosh.nehete 2025-10-06 13:15:48 +05:30
• 9daf76c6eb return all employees when allEmployee=true pramod.mahajan 2025-10-05 00:24:26 +05:30
• c33afa58c3 Solved spelling mistake ashutosh.nehete 2025-10-04 17:51:58 +05:30
• 4ceb5c3cb2 Changed the authontication logic for delete contact notes ashutosh.nehete 2025-10-04 17:50:18 +05:30
• d0dabf776b Added the condition to not get services object in project allocation ashutosh.nehete 2025-10-04 17:26:08 +05:30
• 04223578ad Added the ExpenseUId in expenses tables ashutosh.nehete 2025-10-04 16:56:04 +05:30
• e2ee3f325c Added the Distinct in expense filter ashutosh.nehete 2025-10-04 12:38:22 +05:30
• 6441103e30 Chnaged the search to searchString in get directory list API ashutosh.nehete 2025-10-04 12:35:15 +05:30
• d380dfebd2 Added the ExpensTypes in expense list API and get expenese filter API ashutosh.nehete 2025-10-04 12:25:02 +05:30
• 658fa8cd23 Changed he expense UID format ashutosh.nehete 2025-10-04 10:45:38 +05:30
• 3afdad29b2 Added total amout in expense pending dashboard ashutosh.nehete 2025-10-03 17:13:23 +05:30
• 8f463ce90d Added ExpenseUId in expense table ashutosh.nehete 2025-10-03 15:24:59 +05:30
• 590476a8aa Added the APi to get count of pending expenses ashutosh.nehete 2025-10-03 14:32:59 +05:30
• 548e714ea9 Getting the monthly expenses report based on project and category ashutosh.nehete 2025-10-03 12:53:19 +05:30
• 91f4305995 Added the projectId in get expense pending list API ashutosh.nehete 2025-10-03 11:08:15 +05:30
• 7e15c517ac Optimized the dashboard APIs for expenses ashutosh.nehete 2025-10-03 10:54:38 +05:30
• 9332d9cc0b Added the API to get list pending expenses according to permissions ashutosh.nehete 2025-10-01 18:12:51 +05:30
• f94a7de4ab change email in complete system ashutosh.nehete 2025-10-01 17:46:11 +05:30
• 541ed28bd2 Added the new deashboard report of expenses ashutosh.nehete 2025-10-01 17:32:48 +05:30
• 0e1d20156f Check if email exist in total tenant ashutosh.nehete 2025-10-01 17:16:27 +05:30
• eb3a65428e Modyfied the attendance report API ashutosh.nehete 2025-10-01 15:09:51 +05:30
• 87c5de87a1 Checking in organization not in tenant ashutosh.nehete 2025-10-01 12:19:03 +05:30
• 5eda1773b7 Chnaged the sequence of buttons in sequece ashutosh.nehete 2025-10-01 11:33:56 +05:30
• b3f54962ab Removed hasProjectAccess check from document controller ashutosh.nehete 2025-10-01 10:55:00 +05:30
• 040e7df32b Removed the permission check from project details API ashutosh.nehete 2025-10-01 10:32:04 +05:30
• 0066e20c43 Removed the tenant check from find employee query in document controller ashutosh.nehete 2025-10-01 10:23:46 +05:30
• 7659eadd00 Added the check before sending mail when adding application access to employee ashutosh.nehete 2025-10-01 10:10:01 +05:30
• 824381bb49 Added the project section in side menu ashutosh.nehete 2025-10-01 09:53:40 +05:30
• 207a44acd7 Checking if have directory admin permission in delete contact API ashutosh.nehete 2025-09-30 21:32:59 +05:30
• 7775f58d69 Added the check to check if has directory admin permission ashutosh.nehete 2025-09-30 21:13:56 +05:30
• 91be729b41 Changed the logic of getting all employees in get employee list API ashutosh.nehete 2025-09-30 20:53:54 +05:30
• 0bd57d29d8 Removed the Authorization of hub ashutosh.nehete 2025-09-30 20:31:57 +05:30
• b442bb4bbc Changed the logic to get tenantId in auth controller ashutosh.nehete 2025-09-30 20:23:54 +05:30
• ca3e47c1e6 Changed theexpenses Vms ashutosh.nehete 2025-09-30 20:11:29 +05:30
• 061512d501 Removed the organization ID from manage employee DTO ashutosh.nehete 2025-09-30 19:44:00 +05:30
• 71cc442054 getting the all project through get project list API ashutosh.nehete 2025-09-30 19:28:09 +05:30
• bab03a8e47 Getting all employees in attendence module regardless of project ashutosh.nehete 2025-09-30 18:17:24 +05:30
• 8ddb414e91 Added the organization type in assignd organization list ashutosh.nehete 2025-09-30 18:08:07 +05:30
• d8329f1fab Removed the tenant check from master services ashutosh.nehete 2025-09-30 17:10:30 +05:30