Commit Graph

Select branches

Hide Pull Requests

Adding_Chips_Expense

AppMenu

Attendance_Regularize_Issues

Bug#752RefreshToken

Collection_Management

Document_Manag

Document_Manager

Expense_Bug#828

Expense_Bugs

Expense_Manangement_Feature

Expense_Weidget_main

Feature#772_NEWExpenseType_Master

Feature#773_EditExpenseType

Feature#774_DeleteExpenseType

Feature#777_EditPaymentMode

Feature#778_DeletePaymentMode

Feature#804_ExpnseFilter

Feature-#776NewPaymentMode

Feature-#809_ExpenseStatsuMang

Feature_Directory

Feature_Expense

GlobalSelectProject

HofixedIssues_July_4W

HotChanges_04_10_25

HotChanges_06-10-25

HotChanges_09_10_25

HotChanges_10_10_25

HotChanges_11_10_25

Image_Gallery_filter

Intefrating_API_Dashboard

Issues_Aug_1W

Issues_Aug_2W

Issues_July_1W

Issues_July_2W

Issues_July_3W

Issues_July_4W

Issues_Oct_1W

Issues_Oct_main_2W

Issues_Sep_1W

Issues_Sep_1W_V2

Jun_Widget

Kartik#Enhancement#1444

Kartik_Bug#1015

Kartik_Bug#1016

Kartik_Bug#1024

Kartik_Bug#1028

Kartik_Bug#1037

Kartik_Bug#1039

Kartik_Bug#1041

Kartik_Bug#1042

Kartik_Bug#1045

Kartik_Bug#1052

Kartik_Bug#1056

Kartik_Bug#1064

Kartik_Bug#1071

Kartik_Bug#1080

Kartik_Bug#1081

Kartik_Bug#1096

Kartik_Bug#1100

Kartik_Bug#1104

Kartik_Bug#1113

Kartik_Bug#1115

Kartik_Bug#1123

Kartik_Bug#1180

Kartik_Bug#1250

Kartik_Bug#1261

Kartik_Bug#1292

Kartik_Bug#1295

Kartik_Bug#1298

Kartik_Bug#1300

Kartik_Bug#1301

Kartik_Bug#1306

Kartik_Bug#1350

Kartik_Bug#1353

Kartik_Bug#1359

Kartik_Bug#1366

Kartik_Bug#1369

Kartik_Bug#1370

Kartik_Bug#1372

Kartik_Bug#1381

Kartik_Bug#1388

Kartik_Bug#1390

Kartik_Bug#1392

Kartik_Bug#1394

Kartik_Bug#1395

Kartik_Bug#1408

Kartik_Bug#1417

Kartik_Bug#1418

Kartik_Bug#1425

Kartik_Bug#1426

Kartik_Bug#1429

Kartik_Bug#1434

Kartik_Bug#1436

Kartik_Bug#1437

Kartik_Bug#1450

Kartik_Bug#1451

Kartik_Bug#1455

Kartik_Bug#1462

Kartik_Bug#1463

Kartik_Bug#1469

Kartik_Bug#1497

Kartik_Bug#1499

Kartik_Bug#493

Kartik_Bug#494

Kartik_Bug#611

Kartik_Bug#664

Kartik_Bug#717

Kartik_Bug#793

Kartik_Bug#797

Kartik_Bug#798

Kartik_Bug#799

Kartik_Bug#800

Kartik_Bug#805

Kartik_Bug#830

Kartik_Bug#836

Kartik_Bug#841

Kartik_Bug#842

Kartik_Bug#862

Kartik_Bug#869

Kartik_Bug#873

Kartik_Bug#884

Kartik_Bug#886

Kartik_Bug#887

Kartik_Bug#888

Kartik_Bug#889

Kartik_Bug#891

Kartik_Bug#895

Kartik_Bug#906

Kartik_Bug#907

Kartik_Bug#908

Kartik_Bug#909

Kartik_Bug#910

Kartik_Bug#915

Kartik_Bug#919

Kartik_Bug#920

Kartik_Bug#929

Kartik_Bug#932

Kartik_Bug#933

Kartik_Bug#941

Kartik_Bug#944

Kartik_Bug#955

Kartik_Bug#956

Kartik_Bug#962

Kartik_Bug#972

Kartik_Bug#973

Kartik_Bug#974

Kartik_Bug#976

Kartik_Bug#978

Kartik_Bug#979

Kartik_Directory_Changes#805

Kartik_Enhancement#1053

Kartik_Enhancement#1433

Kartik_Enhancement#1446

Kartik_Enhancement#1448

Kartik_Enhancement#807

Kartik_Enhancement#948

Kartik_Filter_Changes#800

Kartik_ProjectList#628

Kartik_Task#1079

Kartik_Task#1227

Kartik_Task#1229

Kartik_Task#1230

Kartik_Task#1303

Kartik_Task#1345

Kartik_Task#1361

Kartik_Task#1374

Kartik_Task#1402

Kartik_Task#1405

Kartik_Task#1459

Kartik_Task#1465

Kartik_Task#1477

Kartik_Task#400

Kartik_Task#414

Kartik_Task#425

Kartik_Task#470

Kartik_Task#512

Kartik_Task#832

Kartik_Task#839

Kartik_Task#953

Kartik_Task#969

Kartik_Task750

Kartik_Task857

Kartik_Task_#832_ProjectSelection

Kartik_Task_1459

Kartik_Task_Att#1236

Kartik_Task_AttFilter#1235

Kartik_Task_AtteOrg#1264

Kartik_Task_DailyProgress#1232

Kartik_Task_DailyTask#1231

Kartik_Task_Infra#1265

Kartik_Task_InfraMask#1266

Kartik_Task_OrgCol_att#1238

Kartik_Task_TeamGrid#1259

Landing_pages

MasterModalRefactor

Master_Services

OnFieldWork_V1

OnField_Issues_Oct_2W

Organization_Management

ProjectUpdationForOrganizaion

Refactor_Directory

Refactor_Expenses

Service_Org_Task_1495

Services_Master

SingalR_Integration

TeamAssignToProject

Tenant_Manag

Tenant_Management

UI_Changes_Add_Skeleton

UI_Changes_DirectoryFilter

UI_Changes_PMS

activity_image

collection_dev

cosmatic-changes

filter_offcanvas

hotchanges_projectPermission

hotfix/MasterActivity

kartik_Bug#628

landing_page_1

landing_page_with_new_theme

loader_implmentation

login-layout-changes

main

newFeature_Directory

organization_level_login

organization_management

pramod_Bug#128

pramod_Bug#141

pramod_Bug#152InfraModals

pramod_Task#111

pramod_Task#207

pramod_Task#294

pramod_Task#482

pramod_Task#505

pramod_Task-#398

profile_page

react-query

vikas_16_dockerdeployment

vikas_deploy

vikas_widget_project_overview

#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

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#19

#190

#191

#192

#193

#194

#195

#196

#197

#198

#199

#2

#20

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#21

#210

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#220

#221

#222

#223

#224

#225

#226

#227

#228

#229

#23

#230

#231

#232

#233

#234

#235

#236

#237

#238

#239

#24

#240

#241

#242

#243

#244

#245

#246

#247

#248

#249

#25

#250

#251

#252

#253

#254

#255

#256

#257

#258

#259

#26

#260

#261

#262

#263

#264

#265

#266

#267

#268

#269

#27

#270

#271

#272

#273

#274

#275

#276

#277

#278

#279

#28

#280

#281

#282

#283

#284

#285

#286

#287

#288

#289

#29

#290

#291

#292

#293

#294

#295

#296

#297

#298

#299

#3

#30

#300

#301

#302

#303

#304

#305

#306

#307

#308

#309

#31

#310

#311

#312

#313

#314

#315

#316

#317

#318

#319

#32

#320

#321

#322

#323

#324

#325

#326

#327

#328

#329

#33

#330

#331

#332

#333

#334

#335

#336

#337

#338

#339

#34

#340

#341

#342

#343

#344

#345

#346

#347

#348

#349

#35

#350

#351

#352

#353

#354

#355

#356

#357

#358

#359

#36

#360

#361

#362

#363

#364

#365

#366

#367

#368

#369

#37

#370

#371

#372

#373

#374

#375

#376

#377

#378

#379

#38

#380

#381

#382

#383

#384

#385

#386

#387

#388

#389

#39

#390

#391

#392

#393

#394

#395

#396

#397

#398

#399

#4

#40

#400

#401

#402

#403

#404

#405

#406

#407

#408

#409

#41

#410

#411

#412

#413

#414

#415

#416

#417

#418

#419

#42

#420

#421

#422

#423

#424

#425

#426

#427

#428

#429

#43

#430

#431

#432

#433

#434

#435

#436

#437

#438

#439

#44

#440

#441

#442

#443

#444

#445

#446

#447

#448

#449

#45

#450

#451

#452

#453

#454

#455

#456

#457

#458

#459

#46

#460

#461

#462

#463

#464

#465

#466

#467

#468

#469

#47

#470

#471

#472

#473

#474

#475

#476

#477

#478

#479

#48

#480

#481

#482

#483

#484

#485

#486

#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

• 97525e3cb2 Correction in Expense compoent at name column. Expense_Weidget_main Kartik Sharma 2025-10-16 12:51:03 +05:30
• 2a0f7794b5 Changes in filter panel. Kartik Sharma 2025-10-16 10:17:12 +05:30
• 798ea24088 Merge branch 'Issues_Oct_main_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Expense_Weidget_main Kartik Sharma 2025-10-16 10:03:02 +05:30
• 8460460caf Merge pull request 'Excessive space between Organization dropdown and Search bar in Attendance menu.' (#484) from Kartik_Bug#1499 into Issues_Oct_main_2W Issues_Oct_main_2W pramod.mahajan 2025-10-15 12:37:16 +00:00
• c8273070ac Changes in Attendance and Expenselist. Kartik Sharma 2025-10-15 17:21:56 +05:30
• dc4e48ad3b Changes in Employee list at pagination and at mobile view then scrollbar is shown. Kartik Sharma 2025-10-14 14:51:57 +05:30
• 20b508bebc Changes in Regularization tab. Kartik Sharma 2025-10-14 14:42:33 +05:30
• 05c01d1d34 Changes in Attendance page. Kartik Sharma 2025-10-14 14:32:45 +05:30
• 073897156e Excessive space between Organization dropdown and Search bar in Attendance menu. Kartik Sharma 2025-10-14 12:46:29 +05:30
• ddfbd2dc71 Merge branch 'Issues_Oct_main_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Bug#1499 Kartik_Bug#1499 Kartik Sharma 2025-10-15 18:06:38 +05:30
• 3a2fcf71ee Merge pull request 'Export to PDF button not functioning' (#479) from Kartik_Bug#1434 into Issues_Oct_main_2W pramod.mahajan 2025-10-15 12:33:55 +00:00
• f0c6aea55d Create a seprate file for export functionality in employee. Kartik Sharma 2025-10-15 18:02:36 +05:30
• 278a5651fe Changes in excel import. Kartik Sharma 2025-10-15 17:48:58 +05:30
• 6fc3e674e5 Export to PDF button not functioning Kartik Sharma 2025-10-13 16:40:58 +05:30
• 33033dea9d Create a seprate file for export functionality in employee. Kartik_Bug#1434 Kartik Sharma 2025-10-15 18:02:36 +05:30
• 9f4d82eb06 Merge pull request '“No images match the selected filters.” message should be displayed at the center of the page.' (#481) from Kartik_Bug#1497 into Issues_Oct_main_2W pramod.mahajan 2025-10-15 12:26:25 +00:00
• 4ba0c823c0 “No images match the selected filters.” message should be displayed at the center of the page. Kartik Sharma 2025-10-14 10:13:24 +05:30
• acf6a28191 Merge pull request 'Attendance "No record" message improvement' (#480) from Kartik_Bug#1437 into Issues_Oct_main_2W pramod.mahajan 2025-10-15 12:24:37 +00:00
• 98c90f2a9b Attendance "No record" message improvement Kartik Sharma 2025-10-13 17:11:25 +05:30
• 79ac3ee481 Changes in excel import. Kartik Sharma 2025-10-15 17:48:58 +05:30
• 6e89fbd680 added xl, and doc file allow to upload and getSubscription plan api properly Collection_Management pramod.mahajan 2025-10-15 17:31:58 +05:30
• 66270c1886 Changes in Attendance and Expenselist. Kartik Sharma 2025-10-15 17:21:56 +05:30
• cc2a82e3f0 Removing error in Contact Filter panel. Kartik Sharma 2025-10-15 16:56:18 +05:30
• a8ae0fac70 Merge branch 'landing_page_with_new_theme' into OnFieldWork_V1 OnFieldWork_V1 Vikas Nale 2025-10-15 16:56:04 +05:30
• b318d469f6 Changes in OnField Work. Kartik Sharma 2025-10-15 16:52:27 +05:30
• b23518f796 Changes in expense filter panel. Kartik Sharma 2025-10-15 15:58:59 +05:30
• 9648d1a98b removed console pramod.mahajan 2025-10-15 15:55:46 +05:30
• aa947b791b added paymentadjustment head crud operation pramod.mahajan 2025-10-15 15:42:30 +05:30
• 73534226e3 Changes in Filter panel when on close Kartik Sharma 2025-10-15 14:38:17 +05:30
• bd6332fa61 Changes in Filter panel. Kartik Sharma 2025-10-15 14:10:03 +05:30
• 51cca64dd5 adjust history table whenever select comment tab pramod.mahajan 2025-10-15 12:55:07 +05:30
• 57d65a5fe7 Adding Chips in Document, Directory and Expense Page. Kartik Sharma 2025-10-15 12:46:47 +05:30
• 9bbe479153 Removing unnessary gap in Documents.jsx file. Kartik Sharma 2025-10-15 12:45:38 +05:30
• ca88928850 added provideAll is flag inside basic projctname api pramod.mahajan 2025-10-15 12:45:11 +05:30
• 962286a4da added mark as completd api operation pramod.mahajan 2025-10-15 12:35:07 +05:30
• ce976a6d5c Changes Directory Notes and Contact filter panel at time of chips remover. Kartik Sharma 2025-10-15 12:25:33 +05:30
• d1af4f402d Changes when we select a Expense Status in ExpenseFilter Panel. Kartik Sharma 2025-10-15 12:18:27 +05:30
• 105beb6062 more cosmmatic changes landing_page_with_new_theme Vikas Nale 2025-10-15 11:54:49 +05:30
• f61c7a4a35 Removing Unessary gaps. Kartik Sharma 2025-10-15 11:50:26 +05:30
• 0b02531909 Adding Table-respnsive in projectNav. Kartik Sharma 2025-10-15 11:33:09 +05:30
• dec15278fa Changes in Emp Attendance and DateRange picker. Kartik Sharma 2025-10-15 11:00:18 +05:30
• dacd72f945 handle reposnsive height Vikas Nale 2025-10-15 10:52:07 +05:30
• 76df08e921 integrated editcollection and vew douments pramod.mahajan 2025-10-14 20:17:48 +05:30
• 0052fed1e6 integrated comment api added comment and payments history inside view collection pramod.mahajan 2025-10-14 18:20:36 +05:30
• da56c59ac9 Merge branch 'Issues_Oct_main_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Expense_Weidget_main Kartik Sharma 2025-10-14 17:40:42 +05:30
• d9392c244e Changes in UI of Weigets and show selected project on 2 heading. Kartik Sharma 2025-10-14 17:29:20 +05:30
• a7f1ba97c3 Creating new weidgets in Dashboard in main. Kartik Sharma 2025-10-14 17:14:06 +05:30
• a2177dc2af UI changes in attendance, listview Directory, ExpenseList, Project Page at mobile view. Kartik Sharma 2025-10-14 15:53:37 +05:30
• a9d1ba08dd UI updation in Attendance Toady's and Regularization tab. Kartik Sharma 2025-10-14 15:44:36 +05:30
• b80af5467c Changes in Infrastructure. Kartik Sharma 2025-10-14 15:07:07 +05:30
• 0ff12e27d8 Changes in Employee list at pagination and at mobile view then scrollbar is shown. Kartik Sharma 2025-10-14 14:51:57 +05:30
• 2845ad67d1 Changes in Regularization tab. Kartik Sharma 2025-10-14 14:42:33 +05:30
• 8b766abe46 Changes in Attendance page. Kartik Sharma 2025-10-14 14:32:45 +05:30
• e2035e1fd8 updated payhistory after add payment pramod.mahajan 2025-10-14 14:28:49 +05:30
• 7176a86913 Merge pull request 'integrated collection details api' (#485) from collection_dev into Collection_Management pramod.mahajan 2025-10-14 08:54:29 +00:00
• a26e4d1dc2 added skeleton for payment history at add payment form pramod.mahajan 2025-10-14 14:23:48 +05:30
• f91c7d6da1 rmoved console pramod.mahajan 2025-10-14 13:42:21 +05:30
• 272645f0b4 integrated collection details api pramod.mahajan 2025-10-14 13:36:19 +05:30
• 6eb7b9e870 added skeleton for payment history at add payment form collection_dev pramod.mahajan 2025-10-14 14:23:48 +05:30
• 2b9cc8abfe rmoved console pramod.mahajan 2025-10-14 13:42:21 +05:30
• ac3f4dcbb2 integrated collection details api pramod.mahajan 2025-10-14 13:36:19 +05:30
• 97aebf680f Excessive space between Organization dropdown and Search bar in Attendance menu. Kartik Sharma 2025-10-14 12:46:29 +05:30
• 55ff4d5d29 Correction in UI of logo upload in Organization popup. Kartik_Bug#1469 Kartik Sharma 2025-10-14 12:04:11 +05:30
• 97cb357a3c Logo icon shown in organization details popup, but no option to upload logo while creating organization Kartik Sharma 2025-10-14 11:48:05 +05:30
• 9526cb0e5e add more cosmatic changes and include contact us section Vikas Nale 2025-10-14 10:29:46 +05:30
• 301684a12b Merge pull request 'collection_dev' (#482) from collection_dev into Collection_Management pramod.mahajan 2025-10-14 04:55:41 +00:00
• 9288ac1fbc successfuuly fetch data and create collection pramod.mahajan 2025-10-14 10:24:45 +05:30
• b0be543ea0 “No images match the selected filters.” message should be displayed at the center of the page. Kartik_Bug#1497 Kartik Sharma 2025-10-14 10:13:24 +05:30
• 376a2a397f intergrated get list and create collection pramod.mahajan 2025-10-14 00:21:19 +05:30
• 58c2fbdf1b initiallly setup pramod.mahajan 2025-10-13 17:15:59 +05:30
• 2fcc9e02e6 Attendance "No record" message improvement Kartik_Bug#1437 Kartik Sharma 2025-10-13 17:11:25 +05:30
• 10227a2722 Export to PDF button not functioning Kartik Sharma 2025-10-13 16:40:58 +05:30
• 9592108472 Removing extra margin-top on Project-details. Kartik Sharma 2025-10-13 16:35:28 +05:30
• 764d508974 Adding Services in Setting. Service_Org_Task_1495 Kartik Sharma 2025-10-13 16:21:03 +05:30
• 432cf2122e new design added Vikas Nale 2025-10-13 16:12:46 +05:30
• 3b032b7b07 Merge pull request 'Incorrect Toggle Switch Text for Active/Inactive Employee in Project Teams' (#475) from Kartik_Bug#1455 into Issues_Oct_main_2W pramod.mahajan 2025-10-13 09:33:09 +00:00
• b8891d403f Incorrect Toggle Switch Text for Active/Inactive Employee in Project Teams Kartik Sharma 2025-10-13 10:45:58 +05:30
• 01568db61c Merge pull request '“NA” Should Be Displayed When Employee Has No Email Instead of “–”' (#476) from Kartik_Bug#1451 into Issues_Oct_main_2W pramod.mahajan 2025-10-13 09:32:51 +00:00
• 80a974e3be “NA” Should Be Displayed When Employee Has No Email Instead of “–” Kartik Sharma 2025-10-13 11:17:09 +05:30
• f3e05a11d6 Merge pull request 'Adding Project and Service field in View Organization popup.' (#477) from Kartik_Task#1477 into Issues_Oct_main_2W pramod.mahajan 2025-10-13 09:32:32 +00:00
• 222e6495a8 Adding Project and Service field in View Organization popup. Kartik Sharma 2025-10-13 12:11:14 +05:30
• 18a3b8a85b Merge pull request 'Filter Sidebar Should Auto-Close When Navigating to Another Page' (#478) from Kartik_Bug#1450 into Issues_Oct_main_2W pramod.mahajan 2025-10-13 09:32:17 +00:00
• d75296ffe8 Filter Sidebar Should Auto-Close When Navigating to Another Page Kartik_Bug#1450 Kartik Sharma 2025-10-13 14:51:47 +05:30
• 6649cab6a2 Added cursor-not-allowed when user can delete the organization. Kartik Sharma 2025-10-13 14:16:11 +05:30
• eab23389ed Correction in Projects Completion Status in this weidget data cannot be shown. Kartik Sharma 2025-10-13 12:51:42 +05:30
• 429c46fb5c Adding Project and Service field in View Organization popup. Kartik_Task#1477 Kartik Sharma 2025-10-13 12:11:14 +05:30
• 30267e779b “NA” Should Be Displayed When Employee Has No Email Instead of “–” Kartik_Bug#1451 Kartik Sharma 2025-10-13 11:17:09 +05:30
• a50176fdcb Incorrect Toggle Switch Text for Active/Inactive Employee in Project Teams Kartik_Bug#1455 Kartik Sharma 2025-10-13 10:45:58 +05:30
• 12b632f087 added new api for list of org main pramod.mahajan 2025-10-11 18:06:51 +05:30
• 6ee4fb6d04 Updated TeamEmployeeList to fetch employees using useOrganizationEmployees during search. Kartik Sharma 2025-10-11 17:48:25 +05:30
• 67bb685d4b added new api for orgaization dropdown pramod.mahajan 2025-10-11 16:55:22 +05:30
• 8fd4e7f3f1 added space between first and last name pramod.mahajan 2025-10-11 16:30:27 +05:30
• aca2decb00 clear fully cache after remove session pramod.mahajan 2025-10-11 16:26:04 +05:30
• f7f4b68997 changed reimburse data during transaction to current date pramod.mahajan 2025-10-11 15:09:04 +05:30
• f839613066 Merge pull request 'Fix: Ensure orgData can be cleared when opening Organization Modal' (#474) from HotChanges_11_10_25 into main pramod.mahajan 2025-10-11 08:42:26 +00:00
• 765b4356a6 Merge pull request 'Adding Chips in Directory Contact and Notes Page.' (#473) from Kartik_Task#1465 into OnFieldWork_V1 pramod.mahajan 2025-10-11 08:41:19 +00:00
• 6125130cff Adding Chips in Directory Contact and Notes Page. Kartik Sharma 2025-10-11 10:30:15 +05:30
• b58bd33774 added requested b and requested at column inside rgularization HotChanges_11_10_25 pramod.mahajan 2025-10-11 14:08:27 +05:30
• 136bc94c5b removed dbugger and add new classes pramod.mahajan 2025-10-11 13:12:23 +05:30
• 8357fa9b22 Merge branch 'OnFieldWork_V1' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Bug#1462 Kartik_Bug#1462 Kartik Sharma 2025-10-11 12:57:28 +05:30