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

• 46815a7911 fixed attendance - check In -out and persisted date range from Redux store for attendance logs HotChanges_06-10-25 pramod.mahajan 2025-10-07 12:17:27 +05:30
• 516e84e1af Removing border line in directory contact tab. Kartik_Bug#1429 Kartik Sharma 2025-10-07 11:39:19 +05:30
• 833cdd9091 Adding percentage in Infrastructure. Kartik_Bug#1350 Kartik Sharma 2025-10-07 11:23:03 +05:30
• 2f2215ab8a Merge pull request 'OnField_Issues_Oct_2W' (#455) from OnField_Issues_Oct_2W into OnFieldWork_V1 pramod.mahajan 2025-10-07 04:10:40 +00:00
• 071f862743 Incorrect navigation when viewing project details Kartik Sharma 2025-10-06 13:09:08 +05:30
• 040331e27d Removing the dropdown from the Masters page. Kartik Sharma 2025-10-06 13:17:20 +05:30
• db2730c02b Employee Click Should Navigate to Profile Page from Attendance Page Kartik Sharma 2025-10-06 17:20:20 +05:30
• 2e09a53078 Merge pull request 'Incorrect navigation when viewing project details' (#452) from Kartik_Bug#1418 into OnField_Issues_Oct_2W OnField_Issues_Oct_2W pramod.mahajan 2025-10-07 04:09:06 +00:00
• 7a30e3b112 Incorrect navigation when viewing project details Kartik Sharma 2025-10-06 13:09:08 +05:30
• a3a5d9fdad Merge pull request 'Removing the dropdown from the Masters page.' (#453) from Kartik_Bug#1417 into OnField_Issues_Oct_2W pramod.mahajan 2025-10-07 04:08:35 +00:00
• 9498ff0488 Removing the dropdown from the Masters page. Kartik Sharma 2025-10-06 13:17:20 +05:30
• 2be4a56a8c Merge pull request 'Employee Click Should Navigate to Profile Page from Attendance Page' (#454) from Kartik_Bug#1426 into OnField_Issues_Oct_2W pramod.mahajan 2025-10-07 04:08:17 +00:00
• 9df813698d Merge pull request 'Adding_Chips_Expense' (#451) from Adding_Chips_Expense into OnFieldWork_V1 pramod.mahajan 2025-10-06 13:47:36 +00:00
• 6ba018399c Merge branch 'OnFieldWork_V1' of https://git.marcoaiot.com/admin/marco.pms.web into Adding_Chips_Expense Adding_Chips_Expense Kartik Sharma 2025-10-06 19:06:33 +05:30
• aeb9778216 Add link to login page Vikas Nale 2025-10-06 17:50:22 +05:30
• 81ed65c0c6 add initial version of landig page Vikas Nale 2025-10-06 17:49:03 +05:30
• 16e1746c0f Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into HotChanges_06-10-25 pramod.mahajan 2025-10-06 17:41:43 +05:30
• 9886fac03e employee attendance display sorted by date, pramod.mahajan 2025-10-06 17:20:36 +05:30
• cf7c7e83a9 Employee Click Should Navigate to Profile Page from Attendance Page Kartik_Bug#1426 Kartik Sharma 2025-10-06 17:20:20 +05:30
• a28a7fb444 checked-Out Time should be greather than or equal to checked In time pramod.mahajan 2025-10-06 16:07:31 +05:30
• 8160a53981 added gallery and gallery filter pramod.mahajan 2025-10-06 16:05:22 +05:30
• 612c684fc9 Removing the dropdown from the Masters page. Kartik_Bug#1417 Kartik Sharma 2025-10-06 13:17:20 +05:30
• 7fcf4461d9 Incorrect navigation when viewing project details Kartik_Bug#1418 Kartik Sharma 2025-10-06 13:09:08 +05:30
• 470421b730 added two date and service-name column inside ProjectAssignedOrgslist and fixed inactive fn in project team pramod.mahajan 2025-10-06 10:58:07 +05:30
• 7505b790a7 added trim fn to avoid extra spacing HotChanges_04_10_25 pramod.mahajan 2025-10-06 10:06:31 +05:30
• 8fd13247c7 Merge pull request 'HotChanges_04_10_25' (#450) from HotChanges_04_10_25 into main pramod.mahajan 2025-10-05 04:28:55 +00:00
• 0fec257354 make removeSession flexible to clear local, session, or both pramod.mahajan 2025-10-05 00:21:19 +05:30
• 638c033705 fixed employee name show whenever update expense - for paid by pramod.mahajan 2025-10-05 00:14:39 +05:30
• 7872e21477 changed date utils and added search employee inside manage expense pramod.mahajan 2025-10-04 19:50:26 +05:30
• 6928bbd309 Changes in ProjectRepository api for getProjectInfraByProject Kartik Sharma 2025-10-04 17:50:54 +05:30
• 3693af3d00 added missing projects at ManageContact (Edit&Crate) pramod.mahajan 2025-10-04 16:36:11 +05:30
• 1e49cf17a2 addd dropdown at expense table action pramod.mahajan 2025-10-04 16:25:28 +05:30
• ab5e0b2f79 Merge branch 'OnFieldWork_V1' of https://git.marcoaiot.com/admin/marco.pms.web into Adding_Chips_Expense Kartik Sharma 2025-10-04 16:12:07 +05:30
• 7c9d2ddeb1 Added Chips in Expense filter. Kartik Sharma 2025-10-04 16:06:26 +05:30
• f0f579beae fixed dashbord card size pramod.mahajan 2025-10-04 15:47:07 +05:30
• b53e6284b9 Merge branch 'OnFieldWork_V1' of https://git.marcoaiot.com/admin/marco.pms.web into OnFieldWork_V1 pramod.mahajan 2025-10-04 14:13:43 +05:30
• b1c23aab4d added expens group fied Name pramod.mahajan 2025-10-04 14:13:09 +05:30
• 4a05e67ff0 Adding dropdown in ExpenseFilter. Kartik Sharma 2025-10-04 14:12:20 +05:30
• 87d13d0f77 Changes in Monthly Expense weidget. Kartik Sharma 2025-10-04 12:20:59 +05:30
• 997971629f addd Expense By project pramod.mahajan 2025-10-04 11:08:19 +05:30
• 18ac8e11bd added expense filte at api url level pramod.mahajan 2025-10-04 10:50:14 +05:30
• 2db7faeaa3 Changes in Dshboard weidget Kartik_Task#1405 Kartik Sharma 2025-10-04 10:30:13 +05:30
• 508ef8a626 Merge branch 'OnFieldWork_V1' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Task#1405 Kartik Sharma 2025-10-04 09:54:18 +05:30
• 60785cb246 chages in dashoard Kartik Sharma 2025-10-04 09:50:44 +05:30
• 78808ecac0 added Expensebstatus widget, fixed small bugs pramod.mahajan 2025-10-03 19:07:44 +05:30
• 80ac18ff26 Changes in Monthly Expense dashboard. Kartik Sharma 2025-10-03 17:00:57 +05:30
• 2397be3b8c Adding API for ExpenseProjects. Kartik Sharma 2025-10-03 15:02:25 +05:30
• b5084ad99d Creating a new weidget in Dashboard for expense. Kartik Sharma 2025-10-03 12:30:52 +05:30
• 3553a7b521 change class to className pramod.mahajan 2025-10-03 10:57:55 +05:30
• aca96c60ae removed console and comment pramod.mahajan 2025-10-02 13:24:36 +05:30
• 25f4f1e7a7 added expense analysis card inisde dashboard pramod.mahajan 2025-10-02 13:10:14 +05:30
• e26c87fd3d added expense graph Kartik_Task#1402 pramod.mahajan 2025-10-02 00:47:01 +05:30
• 3559b0a01c Merge branch 'OnFieldWork_V1' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Task#1402 pramod.mahajan 2025-10-01 23:03:08 +05:30
• 0c1889e1c1 added Ellipsis Pagination pramod.mahajan 2025-10-01 22:45:31 +05:30
• edebc2e471 Implementing api for Expense data Kartik Sharma 2025-10-01 18:56:30 +05:30
• 9884943907 addded imported field added pramod.mahajan 2025-10-01 18:45:26 +05:30
• 2531d91209 fixed dashboard graph pramod.mahajan 2025-10-01 16:21:08 +05:30
• 014012abf3 Adding Weidgets for Expense. Kartik Sharma 2025-10-01 16:04:30 +05:30
• 49b597c833 fixed expense date, added project name at check in checkout modal pramod.mahajan 2025-10-01 15:34:19 +05:30
• 2aae7194b7 implemented singlR pramod.mahajan 2025-10-01 13:00:38 +05:30
• 2921e116a9 Same Employee Displayed in Both Active and Inactive Lists in Project > Teams Kartik_Bug#1394 Kartik Sharma 2025-10-01 10:31:46 +05:30
• ae772d925a remove project permissions pramod.mahajan 2025-10-01 10:13:52 +05:30
• c1e5ff4043 remove dashboard pramod.mahajan 2025-09-30 23:39:41 +05:30
• 2aff3b9e80 changed logins api pramod.mahajan 2025-09-30 19:35:01 +05:30
• fb7d9ea16c Auto trim has been added in Create Organization. Kartik_Bug#1392 Kartik Sharma 2025-09-30 19:32:28 +05:30
• 4e48478fbc update attendnace and expense pramod.mahajan 2025-09-30 19:31:24 +05:30
• 465c42f18c Add “Organization Type” Column in Project > Organization Page Kartik_Bug#1390 Kartik Sharma 2025-09-30 18:23:56 +05:30
• 4ea1e06a9c hide project infra, setting, Organization, and show only all employees and inactive employee pramod.mahajan 2025-09-30 18:16:29 +05:30
• f0ce1e30fb Add “Organization Type” Column in Project > Organization Page Kartik Sharma 2025-09-30 18:03:49 +05:30
• 31aaf14817 UI updation in Organization view and Search button Kartik_Bug#1388 Kartik Sharma 2025-09-30 17:48:11 +05:30
• 4ddb8415cc added gobal create project,change paid by at expense create pramod.mahajan 2025-09-30 17:27:20 +05:30
• d5df200ede Merge pull request 'Organization_Management : Organization Hierarchy' (#443) from Organization_Management into main pramod.mahajan 2025-09-30 09:07:30 +00:00
• 9c6450496e added closed fun after create project and changed label name Organization_Management pramod.mahajan 2025-09-30 14:22:01 +05:30
• cfd3986479 fixed small changed like heading, font change pramod.mahajan 2025-09-30 11:59:16 +05:30
• 764b145ad9 empty select activity, planne work fields after successfully created task pramod.mahajan 2025-09-29 18:31:56 +05:30
• 20c7cf7f37 added right path for organization info show pramod.mahajan 2025-09-29 18:00:48 +05:30
• 6d74940c0c added optional chain at view org details pramod.mahajan 2025-09-29 17:55:56 +05:30
• 02dcd8611f user could not create subtask completed equal to approve task and fixd error imported subTask component pramod.mahajan 2025-09-29 17:29:11 +05:30
• 02600308e8 rmoved unused and console pramod.mahajan 2025-09-29 16:53:24 +05:30
• d1c72291a3 update date utility for localtoUtc fn pramod.mahajan 2025-09-29 15:20:54 +05:30
• fdbd81c5e7 removed console pramod.mahajan 2025-09-29 15:13:36 +05:30
• 28d5ef653d added optional chain for manage project to prevent run time error pramod.mahajan 2025-09-29 15:10:49 +05:30
• 550b142d74 fixed run time date error pramod.mahajan 2025-09-29 15:03:52 +05:30
• 68335f0695 added temp. placeholder for image gallary pramod.mahajan 2025-09-29 14:38:23 +05:30
• 5d002413db Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Image_Gallery_filter Image_Gallery_filter Kartik Sharma 2025-09-29 14:32:25 +05:30
• 4ea20981fc Merge pull request 'Changes in Directory edit' (#407) from Kartik_Bug#1180 into Organization_Management pramod.mahajan 2025-09-29 09:00:27 +00:00
• 965e1e4808 Correction in Edit Bucket in Directory. Kartik Sharma 2025-09-29 11:24:58 +05:30
• 1c376fe91f Changes in Directory edit Kartik Sharma 2025-09-19 11:07:37 +05:30
• fd46f294d7 Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Bug#1180 Kartik_Bug#1180 Kartik Sharma 2025-09-29 14:25:46 +05:30
• 61835cb189 added clear filter pramod.mahajan 2025-09-29 12:55:31 +05:30
• 375c482b61 renamed Inactive to Includes Inactive pramod.mahajan 2025-09-29 12:04:33 +05:30
• 72424eee53 added updation for fllter pramod.mahajan 2025-09-29 11:52:11 +05:30
• 57b1babb51 Correction in Edit Bucket in Directory. Kartik Sharma 2025-09-29 11:24:58 +05:30
• 22514b1fa0 Merge pull request 'ProjectUpdationForOrganizaion : added Two fields inside Project create and update form - Promoter and PMC and added Remember me' (#442) from ProjectUpdationForOrganizaion into Organization_Management pramod.mahajan 2025-09-28 18:44:30 +00:00
• 61b209a082 addded remember me functionality ProjectUpdationForOrganizaion pramod.mahajan 2025-09-29 00:13:52 +05:30
• 198e31290c updated project files pramod.mahajan 2025-09-28 22:15:07 +05:30
• 482f8a9bcb added organization api in repo. and removed unuse files pramod.mahajan 2025-09-27 23:54:44 +05:30
• 2489095b0b Merge pull request 'Date picker in Document Filter shows pre-filled date instead of blank' (#422) from Kartik_Bug#1250 into Organization_Management pramod.mahajan 2025-09-27 09:41:15 +00:00
• eb8d269662 Date picker in Document Filter shows pre-filled date instead of blank Kartik Sharma 2025-09-24 12:06:10 +05:30
• bbd8ed12f6 Merge pull request 'Date field not cleared in Tenant filter after clicking Clear button' (#432) from Kartik_Bug#1306 into Organization_Management pramod.mahajan 2025-09-27 09:40:05 +00:00