|
|
ee9698f665
|
changed images path for landing page
|
2025-09-12 12:29:54 +05:30 |
|
|
|
25ec5a354c
|
changed path of logo
|
2025-09-12 12:21:40 +05:30 |
|
|
|
8335c42935
|
added direct bucket permission
|
2025-09-12 12:04:24 +05:30 |
|
|
|
3963002a2d
|
Merge branch 'landing_page_1' into Refactor_Directory
# Conflicts:
# src/pages/Home/LandingPage.css
|
2025-09-11 18:14:31 +05:30 |
|
|
|
717264c9f9
|
fixed update and creation for contacts
|
2025-09-11 17:34:56 +05:30 |
|
|
|
1a04dd51fc
|
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Directory
|
2025-09-11 16:25:49 +05:30 |
|
|
|
c83de16466
|
added missed outed confirm modal inside employee for suspend emp
|
2025-09-11 11:09:46 +05:30 |
|
|
|
b51b3db9ec
|
added missing assset
|
2025-09-11 10:51:46 +05:30 |
|
|
|
79553cab4e
|
Merge pull request 'Added new page - Landing Page' (#390) from landing_page_1 into Refactor_Directory
Reviewed-on: #390
Merged
|
2025-09-11 05:01:19 +00:00 |
|
|
|
7a74084841
|
rearrange images in folder
|
2025-09-11 05:01:19 +00:00 |
|
|
|
7638f8bdaa
|
Add blog content
|
2025-09-11 05:01:19 +00:00 |
|
|
|
78f304a490
|
add blog container
|
2025-09-11 05:01:19 +00:00 |
|
|
|
0b38436dfe
|
handle animations
|
2025-09-11 05:01:19 +00:00 |
|
|
|
15581f3f26
|
landing page modifications
|
2025-09-11 05:01:19 +00:00 |
|
|
|
8dc064340b
|
removed unused component
|
2025-09-10 21:01:28 +05:30 |
|
|
|
285b853026
|
removed alreday declare component
|
2025-09-10 20:39:48 +05:30 |
|
|
|
81e5456e1d
|
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Directory
|
2025-09-10 20:36:54 +05:30 |
|
|
|
4741025dcb
|
set Directory page for project
|
2025-09-10 20:35:48 +05:30 |
|
|
|
aec6bd64ff
|
Merge pull request 'Added Document Managment feature' (#388) from Document_Manag into main
Reviewed-on: #388
Merged
|
2025-09-10 14:34:35 +00:00 |
|
|
|
eea36a2722
|
handle delete master modal
|
2025-09-10 20:01:06 +05:30 |
|
|
|
1a7e77c814
|
structured code
|
2025-09-10 19:09:55 +05:30 |
|
|
|
b1a2250c48
|
imported missing routes during merged
|
2025-09-10 19:03:29 +05:30 |
|
|
|
f20c3a64f6
|
added proper modal size for Master Modal - Application Role
|
2025-09-10 19:00:07 +05:30 |
|
|
|
ebab03dc9f
|
updated method for update contact category
|
2025-09-10 18:52:09 +05:30 |
|
|
|
d6de8cbfc1
|
completely refactored directory module
|
2025-09-10 18:13:36 +05:30 |
|
|
|
44cc6c6e81
|
rearrange images in folder
|
2025-09-10 13:44:50 +05:30 |
|
|
|
6604a4db13
|
Add blog content
|
2025-09-10 12:49:30 +05:30 |
|
|
|
b66106c301
|
Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into Refactor_Directory
|
2025-09-10 12:46:38 +05:30 |
|
|
|
691fd9208f
|
fixed alignment address value at emplt about
|
2025-09-10 12:28:07 +05:30 |
|
|
|
45b21d3e73
|
restric open modal when came at admisitrator page
|
2025-09-10 11:33:44 +05:30 |
|
|
|
3db6cc2100
|
added modal, that was missing during merged
|
2025-09-10 11:29:01 +05:30 |
|
|
|
b934527cf5
|
added manually changed
|
2025-09-10 10:41:26 +05:30 |
|
|
|
bac62e1fa7
|
Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into Document_Manag
# Conflicts:
# src/components/Employee/EmpOverview.jsx
|
2025-09-10 10:38:13 +05:30 |
|
|
|
5ec5218dd6
|
Merge branch 'Issues_Sep_1W' into Document_Manag
# Conflicts:
# src/pages/Activities/DailyTask.jsx
# src/pages/master/MasterPage.jsx
|
2025-09-10 10:37:38 +05:30 |
|
|
|
47d0e332f1
|
add blog container
|
2025-09-10 10:35:36 +05:30 |
|
|
|
b02893fd98
|
Merge pull request 'Meaningful Message Required When No Reports Found in Selected Date Range' (#379) from Kartik_Bug#1045 into Issues_Sep_1W
Reviewed-on: #379
Merged
|
2025-09-10 04:45:29 +00:00 |
|
|
|
c9ccd46385
|
Meaningful Message Required When No Reports Found in Selected Date Range
|
2025-09-10 04:45:29 +00:00 |
|
|
|
aa45731d8c
|
Merge pull request 'Invalid Date Displayed Instead of "NA" in Employee List' (#380) from Kartik_Bug#1039 into Issues_Sep_1W
Reviewed-on: #380
Merged
|
2025-09-10 04:43:23 +00:00 |
|
|
|
614d61e6e9
|
Invalid Date Displayed Instead of "NA" in Employee List
|
2025-09-10 04:43:23 +00:00 |
|
|
|
0e35194a82
|
Merge pull request 'Master Page - Grid alignment' (#381) from Kartik_Bug#1081 into Issues_Sep_1W
Reviewed-on: #381
Merged
|
2025-09-10 04:42:46 +00:00 |
|
|
|
20077a137f
|
Master Page - Grid alignment
|
2025-09-10 04:42:46 +00:00 |
|
|
|
1ff1bc9269
|
Merge pull request 'Address field label is breaking into multiple lines in Employee Profile tab' (#382) from Kartik_Bug#1096 into Issues_Sep_1W
Reviewed-on: #382
Merged
|
2025-09-10 04:42:12 +00:00 |
|
|
|
b50b6bc454
|
Address field label is breaking into multiple lines in Employee Profile tab
|
2025-09-10 04:42:12 +00:00 |
|
|
|
d87defbf9a
|
Merge pull request 'Contact Number Field Accepts More Than 10 Digits in Create/Update Contact' (#378) from Kartik_Bug#1090 into Issues_Sep_1W
Reviewed-on: #378
Merged
|
2025-09-10 04:41:43 +00:00 |
|
|
|
e454917763
|
refactored notes list
|
2025-09-10 02:41:59 +05:30 |
|
|
|
b113675cc2
|
contact Active and InActive refactored
|
2025-09-10 00:07:34 +05:30 |
|
|
|
025b13ea64
|
reafctor contact list with filter
|
2025-09-09 20:04:48 +05:30 |
|
|
|
755eb94ae3
|
added padding and marging at project feature permission card
|
2025-09-09 15:41:27 +05:30 |
|
|
|
1138bdf009
|
display properly version list
|
2025-09-09 15:06:25 +05:30 |
|
|
|
2642532b60
|
handle animations
|
2025-09-09 15:02:59 +05:30 |
|
