Pramod Mahajan
|
4f45a805e1
|
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Images_gallery_filter
|
2025-07-07 12:43:24 +05:30 |
|
Pramod Mahajan
|
04ffa0f645
|
fixed filter button of image galllary
|
2025-07-07 12:42:19 +05:30 |
|
|
|
c88af2441f
|
Added condition to check if number of images uploaded is greater than 0
|
2025-07-07 11:25:41 +05:30 |
|
|
|
e97031c0e1
|
Merge pull request 'Changes in Image gallery and integrating singnalR.' (#231) from Kartik_Task#661 into Images_gallery_filter
Reviewed-on: #231
|
2025-07-07 04:35:50 +00:00 |
|
|
|
9eb8418330
|
Change the design of Filter drower.
|
2025-07-06 13:37:42 +05:30 |
|
|
|
52eeede904
|
Merge branch 'Issues_July_1W'
|
2025-07-06 11:21:24 +05:30 |
|
|
|
3be9f7aadb
|
Change brand log and remove some demo css
|
2025-07-06 11:15:25 +05:30 |
|
|
|
4adfbc8e8e
|
Adding next and previous button hide and correction in filter logic.
|
2025-07-05 21:59:18 +05:30 |
|
|
|
aebae577df
|
Changes in Image gallery and integrating singnalR.
|
2025-07-05 18:09:06 +05:30 |
|
|
|
eb1f048059
|
Merge pull request 'Project Not Visible When Created with "In Progress" Status Selected from Filter' (#230) from Kartik_Bug#641 into Issues_July_1W
Reviewed-on: #230
|
2025-07-05 11:15:39 +00:00 |
|
|
|
0af211a218
|
Merge pull request 'Image_Gallery' (#229) from Image_Gallery into main
Reviewed-on: #229
|
2025-07-05 11:14:41 +00:00 |
|
|
|
6914b1cd90
|
Merge pull request 'Reduce the checkbox size and remove unnecessary spacing within the Directory Notes and Contact filters.' (#228) from Kartik_Bug#612 into Issues_July_1W
Reviewed-on: #228
|
2025-07-05 11:13:57 +00:00 |
|
|
|
981a7b121e
|
Project Not Visible When Created with "In Progress" Status Selected from Filter
|
2025-07-05 11:45:13 +05:30 |
|
|
|
87a7b49948
|
Changes in Image Gallery creating changing the filter icon adding box at the time of Work Category.
|
2025-07-04 15:21:18 +05:30 |
|
|
|
1f9dcbbc82
|
Merge branch 'Issues_July_1W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_1W
# Conflicts:
# src/pages/authentication/ChangePassword.jsx
|
2025-07-04 14:14:37 +05:30 |
|
|
|
8f9f0091ea
|
modify change password UI
|
2025-07-04 14:13:19 +05:30 |
|
|
|
115740c4dc
|
modify change password UI
|
2025-07-04 13:24:47 +05:30 |
|
|
|
a6169c106f
|
Changes in Filter drower increase its size.
|
2025-07-04 11:31:35 +05:30 |
|
|
|
09906420a6
|
Adding Date Range picker in filter dropdown.
|
2025-07-04 10:18:18 +05:30 |
|
|
|
a94facb062
|
Changes in Directory filter adding clear and apply button and calling api at the time apply filter.
|
2025-07-03 14:49:18 +05:30 |
|
|
|
99601095b5
|
To show ImageGallery in our project.
|
2025-07-02 18:28:08 +05:30 |
|
|
|
5bb27b6106
|
Modify project landing page
|
2025-07-02 15:11:31 +05:30 |
|
|
|
475f7b564e
|
Merge pull request 'In Attendance Log Tab date Range show set to today -1 to past 7 days.' (#227) from Kartik_Bug#629 into Issues_July_1W
Reviewed-on: #227
|
2025-07-01 12:24:53 +00:00 |
|
|
|
b74c863794
|
Reduce the checkbox size and remove unnecessary spacing within the Directory Notes and Contact filters.
|
2025-07-01 17:14:03 +05:30 |
|
|
|
e85dfb3922
|
In Attendance Log Tab date Range show set to today -1 to past 7 days.
|
2025-07-01 16:47:03 +05:30 |
|
|
|
c1a31e6b3e
|
Merge pull request 'Issues_Jun_3W' (#226) from Issues_Jun_3W into main
Reviewed-on: #226
|
2025-07-01 10:24:37 +00:00 |
|
|
|
73b693f826
|
Merge pull request 'Missing Error Message When Required Fields Are Not Selected in Infrastructure > Create Task' (#225) from Kartik_Bug#521 into Issues_Jun_3W
Reviewed-on: #225
|
2025-07-01 09:36:03 +00:00 |
|
|
|
50f941aef6
|
Merge pull request '"OTP Sent Successfully" Message Displayed After Sending OTP' (#224) from Kartik_Bug#625 into Issues_Jun_3W
Reviewed-on: #224
|
2025-07-01 09:34:14 +00:00 |
|
|
|
520a0e679e
|
Merge pull request 'Correction in Login Password text box design.' (#223) from Kartik_Bug#627 into Issues_Jun_3W
Reviewed-on: #223
|
2025-07-01 09:33:32 +00:00 |
|
|
|
85d8434c5f
|
Merge pull request '401 Unauthorized Error on Attendance Menu.' (#222) from KartikBug#623 into Issues_Jun_3W
Reviewed-on: #222
|
2025-07-01 09:32:19 +00:00 |
|
|
|
2226d54f24
|
Missing Error Message When Required Fields Are Not Selected in Infrastructure > Create Task
|
2025-07-01 12:37:22 +05:30 |
|
|
|
5d99f11297
|
"OTP Sent Successfully" Message Displayed After Sending OTP
|
2025-07-01 12:33:57 +05:30 |
|
|
|
390a0b2b67
|
Correction in Login Password text box design.
|
2025-07-01 12:29:39 +05:30 |
|
|
|
2c0800f0e3
|
Unnecessary Blank Space Appears Below Employees in Regularization Tab.
|
2025-07-01 12:21:49 +05:30 |
|
|
|
e09413b23a
|
401 Unauthorized Error on Attendance Menu.
|
2025-07-01 12:19:25 +05:30 |
|
|
|
bb9c351189
|
Changes in Search text.
|
2025-06-30 18:29:03 +05:30 |
|
|
|
fb4275fb05
|
Merge branch 'Issues_Jun_3W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Jun_3W
|
2025-06-30 17:12:28 +05:30 |
|
|
|
be0577e6d8
|
Changing link of ProjectNames to Projects.
|
2025-06-30 17:12:05 +05:30 |
|
|
|
5861288a9d
|
Merge branch 'Issues_Jun_3W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Jun_3W
|
2025-06-30 17:03:56 +05:30 |
|
|
|
7615bb9c24
|
Added line after each module
|
2025-06-30 17:03:52 +05:30 |
|
|
|
7dffae8957
|
Merge pull request 'Changes in the employee popup size.' (#221) from Kartik_Bug#524 into Issues_Jun_3W
Reviewed-on: #221
|
2025-06-30 11:16:51 +00:00 |
|
|
|
84563812b7
|
Adding cross button in Employee popup.
|
2025-06-30 16:42:58 +05:30 |
|
|
|
562a4ca46d
|
"Changes in the employee popup size."
|
2025-06-30 16:27:12 +05:30 |
|
|
|
9c2b2d0b0e
|
Merge pull request 'Changes in Directory in Filter, removing unnessary gaps and changing color of HideEditor.' (#220) from Kartik_Enhancement#624 into Issues_Jun_3W
Reviewed-on: #220
|
2025-06-30 10:49:47 +00:00 |
|
|
|
0b54e0b5f1
|
Changes in Directory Notes Filter.
|
2025-06-30 10:49:47 +00:00 |
|
|
|
9554caf25f
|
Changes in Directory in Filter, removing unnessary gaps and changing color of HideEditor.
|
2025-06-30 10:49:47 +00:00 |
|
|
|
a96d3696bb
|
Changed the Ids of view infra and manage infra
|
2025-06-30 13:15:30 +05:30 |
|
|
|
d86c8a2c0b
|
Merge pull request '"Pagination overlaps on '+' (Add) button in Directory – bottom right corner"' (#218) from Kartik_Bug#611 into Issues_Jun_3W
Reviewed-on: #218
|
2025-06-30 06:43:00 +00:00 |
|
|
|
111325968d
|
"Adding margin-bottom to the pagination section in Directory Notes."
|
2025-06-30 06:41:44 +00:00 |
|
|
|
baf6a4cf54
|
"Pagination overlaps on '+' (Add) button in Directory – bottom right corner"
|
2025-06-30 06:41:44 +00:00 |
|
