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

• 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_Task#1019 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_Task#1018 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_Task#980 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 Tenant_Management 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 AppMenu 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 Issues_Aug_1W 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_Bug#935 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
• 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 profile_page 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