Commit Graph

Select branches

Hide Pull Requests

Adding_Chips_Expense

Adding_Multiple_FileUpload

Adding_New_Dropdown

Adding_Toggle_Button

Adding_dropdown

AppMenu

Assigned_Employee_Job_Role

Attendance_Regularize_Issues

Attendance_Tabs

Branch_Detail_View

Bug#752RefreshToken

Collection_Service_Project

Document_Manag

Document_Manager

Expense_Bug#828

Expense_Bugs

Expense_Manangement_Feature

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

Finance_Export_Functionality

Finance_Form_Layout

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_FilterChips

Image_Gallery_filter

Implementing_TimeLine

Intefrating_API_Dashboard

Inventary_Management

Issues_Aug_1W

Issues_Aug_2W

Issues_Expense

Issues_Expense_2W

Issues_July_1W

Issues_July_2W

Issues_July_3W

Issues_July_4W

Issues_Nov_4W

Issues_Oct_1W

Issues_Oct_4W_V1

Issues_Oct_main_2W

Issues_Sep_1W

Issues_Sep_1W_V2

Jobs_Side_Panel

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#1391

Kartik_Bug#1392

Kartik_Bug#1394

Kartik_Bug#1395

Kartik_Bug#1408

Kartik_Bug#1417

Kartik_Bug#1418

Kartik_Bug#1425

Kartik_Bug#1434

Kartik_Bug#1437

Kartik_Bug#1450

Kartik_Bug#1451

Kartik_Bug#1455

Kartik_Bug#1462

Kartik_Bug#1463

Kartik_Bug#1469

Kartik_Bug#1496

Kartik_Bug#1497

Kartik_Bug#1499

Kartik_Bug#1534

Kartik_Bug#1657

Kartik_Bug#1661

Kartik_Bug#1666

Kartik_Bug#1773

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_Bug_V1#1525

Kartik_Bug_V1#1537

Kartik_Bug_V1#1539

Kartik_Bug_V1#1543

Kartik_Bug_V1#1564

Kartik_Bug_V1#1569

Kartik_Bug_V1#1572

Kartik_Directory_Changes#805

Kartik_Enhancement#1053

Kartik_Enhancement#1448

Kartik_Enhancement#1468

Kartik_Enhancement#807

Kartik_Enhancement#948

Kartik_Enhancement_918

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#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_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

Multiple_File_Uploader

OnFieldWork_V1

OnField_Issues_Oct_2W

Organization_Hierarchy

Organization_Management

Payment_Getway_Management

Payment_Getway_Management_onField

PmsGrid

ProjectUpdationForOrganizaion

Project_Branch_Management

Purchase_Invoice_Management

Purchase_Invoice_Update

Purchase_Payment

Recurring_Expense

Refactor_Directory

Refactor_Expenses

Response_Encryption

Service_Management_CardView

Service_Org_Task_1495

Service_Project_ListView

Service_Project_Managment

Services_Bugs

Services_Master

SideBarCollapsed

SingalR_Integration

TeamAssignToProject

Tenant_Manag

Tenant_Management

UI_Changes_Add_Skeleton

UI_Changes_DirectoryFilter

UI_Changes_PMS

View_Recurring_Expense

Weidget_Dashboard_Services

Weidget_Dashoard_Jobs

activity_image

collection_dev

cosmatic-changes

dpr-report

filter_offcanvas

hotchanges_projectPermission

hotfix/MasterActivity

issues_Oct_4W

kartik_Bug#628

landing-page-consmatic-changes-migration

landing_page_1

landing_page_with_new_theme

loader_implmentation

login-layout-changes

main

migrate_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

upgrade_Expense

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

#487

#488

#489

#49

#490

#491

#492

#493

#494

#495

#496

#497

#498

#499

#5

#50

#500

#501

#502

#503

#504

#505

#506

#507

#508

#509

#51

#510

#511

#512

#513

#514

#515

#516

#517

#518

#519

#52

#520

#521

#522

#523

#524

#525

#526

#527

#528

#529

#53

#530

#531

#532

#533

#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

• 22bd8d4130 Enhance email validation and fix spelling errors in address fields Vaibhav Surve 2025-04-08 17:33:26 +05:30
• d9e1c91a6b Refactor project status options and remove "Suspended" status Vaibhav Surve 2025-04-08 16:10:42 +05:30
• 9c0f98dbaf Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management Pramod Mahajan 2025-04-08 16:00:11 +05:30
• 5559970a05 Merge pull request 'Ashutosh_Daily_Task_Planning_Issues' (#4) from Ashutosh_Daily_Task_Planning_Issues into Feature_Task_Management Gitea Admin 2025-04-08 09:54:02 +00:00
• a78c4b90db Fixed the error "project not found" in daily task planning ashutosh.nehete 2025-04-08 14:58:00 +05:30
• f9c6d1b7f8 Fixed the error "project not found" in daily task planning ashutosh.nehete 2025-04-08 14:57:16 +05:30
• 23486cbec6 Fixed the error "project not found" in daily task planning ashutosh.nehete 2025-04-08 14:58:00 +05:30
• ce40105ae5 Fixed the error "project not found" in daily task planning ashutosh.nehete 2025-04-08 14:57:16 +05:30
• 147342bfc1 Merge pull request 'Refactor employee action dropdown for better accessibility and code clarity' (#3) from vaibhav_bug_Issue-#49 into Feature_Task_Management Gitea Admin 2025-04-08 07:53:22 +00:00
• c989f23106 Refactor employee action dropdown for better accessibility and code clarity Vaibhav Surve 2025-04-08 13:17:44 +05:30
• 14ca1eb54c Merge pull request 'Vaibhav_Resolved_Issues' (#2) from Vaibhav_Resolved_Issues into Feature_Task_Management Gitea Admin 2025-04-08 07:53:03 +00:00
• 085176c593 update "Not Data Found" message to "No Data Found" with improved styling Vaibhav Surve 2025-04-08 11:50:41 +05:30
• cee8f23fd9 enhance modal handling by adding onClose prop to TaskModel and WorkAreaModel components Vaibhav Surve 2025-04-08 11:16:29 +05:30
• e424314127 Refactor employee action dropdown for better accessibility and code clarity Vaibhav Surve 2025-04-08 13:17:44 +05:30
• df989605b9 Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management Pramod Mahajan 2025-04-08 13:03:12 +05:30
• d3263a9d65 update "Not Data Found" message to "No Data Found" with improved styling Vaibhav Surve 2025-04-08 11:50:41 +05:30
• d35f6e1c89 enhance modal handling by adding onClose prop to TaskModel and WorkAreaModel components Vaibhav Surve 2025-04-08 11:16:29 +05:30
• 5995c74ae6 change class= to className= Vikas Nale 2025-04-08 09:37:38 +05:30
• 984efe207b Reduce font size on menu and project infra Vikas Nale 2025-04-07 22:11:38 +05:30
• 8888f9d2d8 Merge pull request 'Vaibhav_Resolved_Issues' (#1) from Vaibhav_Resolved_Issues into Feature_Task_Management Vikas Nale 2025-04-07 16:25:50 +00:00
• 66c4e44ded updated Connect, Documentation, and Support pages with "Coming Soon!" message and illustration Vaibhav Surve 2025-04-07 18:30:01 +05:30
• f2a77b0685 added "Coming Soon!" message and illustration to multiple components Vaibhav Surve 2025-04-07 18:29:22 +05:30
• c595930640 refactor: streamline modal handling and improve floor management functionality Vaibhav Surve 2025-04-07 17:02:15 +05:30
• 6c0b92606a updated links for Daily Expenses and Application Users in menuData.json Vaibhav Surve 2025-04-07 17:01:08 +05:30
• 9e17b74ba4 changed font size and removed console. Pramod Mahajan 2025-04-07 18:44:19 +05:30
• a28d290feb hide or visible password Pramod Mahajan 2025-04-07 17:17:21 +05:30
• 8bce23d9b6 added hid and visible functionality for password field. Pramod Mahajan 2025-04-07 17:16:18 +05:30
• 2081b13d64 removed space between check and view button Pramod Mahajan 2025-04-07 17:15:17 +05:30
• 93c95e007a integrated create Task api and handling data caching updated for task. Pramod Mahajan 2025-04-07 17:14:07 +05:30
• 10d6f96ea7 added taskreport, commentTask feature Pramod Mahajan 2025-04-06 18:03:10 +05:30
• ddfbed1020 updated project infra components and added assigntask Pramod Mahajan 2025-04-05 13:10:24 +05:30
• 1451c1aff7 added login and forgot form validation and changed server response format Pramod Mahajan 2025-04-03 17:51:59 +05:30
• e6a687c8e2 added validation for aadhar, pan Number, email, phone number and address length. Pramod Mahajan 2025-04-03 00:22:24 +05:30
• 21ca99455b added character limitation for description field-255 Pramod Mahajan 2025-04-02 22:45:47 +05:30
• 73ffbe9bf4 Newly Checked-In Employees and log Displaying in Descending Order Pramod Mahajan 2025-04-02 18:57:14 +05:30
• f7f1f8d083 added user rights for regularize Pramod Mahajan 2025-04-02 18:17:05 +05:30
• f4af7ccf1c added ascending order list , user-rights, Pramod Mahajan 2025-04-02 17:24:43 +05:30
• 79a1a08620 added back button,master-header Pramod Mahajan 2025-04-02 13:42:17 +05:30
• fba9a8fc06 removed "Select Master" option in master dropdown Pramod Mahajan 2025-04-01 20:41:10 +05:30
• 5a7ca02952 added use-rights functionality according to users Pramod Mahajan 2025-04-01 17:17:35 +05:30
• 8ff2167088 remove image path vikas_deploy Vikas Nale 2025-03-31 16:59:44 +05:30
• 281527ef69 Changes fo environment variable for docker container Vikas Nale 2025-03-31 16:56:04 +05:30
• 8fc9cc2d2d chnages for background env variables vikas_16_dockerdeployment Vikas Nale 2025-03-31 13:06:54 +05:30
• 0ad38baa99 Modify docker file to setup enviroment variables using emtrypoint.sh Vikas Nale 2025-03-30 12:31:53 +05:30
• 959e4dd7dd removed unwanted handeling on login page Vaibhav Surve 2025-03-29 16:45:19 +05:30
• 899dac5afd replased env url Vaibhav Surve 2025-03-29 16:22:50 +05:30
• 0cfd60dbe4 Resolved toast issue occured on the login page, added flag for axios Vaibhav Surve 2025-03-29 16:13:34 +05:30
• 850b2e6998 update enviroment variable PramodMahajan14 2025-03-29 14:36:57 +05:30
• 66bfcd80c1 add env config. PramodMahajan14 2025-03-28 16:46:41 +05:30
• ba38e0c289 added env vairables and update ts config for building container PramodMahajan14 2025-03-28 13:27:42 +05:30
• 8e455e96b4 updated projectList comp. immediately update rights PramodMahajan14 2025-03-26 13:02:49 +05:30
• a3ab1ad105 remove API_URL string inside deleteMaster page, PramodMahajan14 2025-03-25 17:54:59 +05:30
• ba302898b8 Add UserRights branch from github changeset: 10a346901a9018735d9fd70a1a79a737595177ab Vikas Nale 2025-03-25 17:22:23 +05:30
• 11241696b3 Add first version in main branch Vikas Nale 2025-03-25 17:14:14 +05:30