admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 9 Actions Packages Projects Releases Wiki Activity
1,849 Commits 247 Branches 0 Tags
Commit Graph

1849 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gitea Admin
b2cdd7c02e Merge pull request 'Removing extra gap in Assign employee popup from project list >Team.' (#117) from Kartik_Bug#301 into Issue_May_3W 
Reviewed-on: #117
 2025-05-17 10:54:45 +00:00
kartik.sharma
ad3533a567 Removing extra gap in Assign employee popup from project list >Team. 2025-05-17 10:54:45 +00:00
kartik.sharma
f6cbc3acc9 Info-icon add 2025-05-17 16:10:11 +05:30
kartik.sharma
72d557ad90 Removing extra gap in Assign employee popup from project list >Team. 2025-05-17 14:21:28 +05:30
kartik.sharma
1b92c30d33 modified assign task popup from daily task planning. 
1. adjusting margin and padding.
2. All the fonts are same.
3. Bold the 1 number and adding line into the unit.
 2025-05-17 13:14:17 +05:30
pramod.mahajan
431a541a89 Merge pull request 'pramod_Task#295 : Create Contact Modal for Directory' (#116) from pramod_Task#295 into Feature_Directory 
Reviewed-on: #116
 2025-05-16 15:15:58 +00:00
Pramod Mahajan
745673b3f3 added create contact and get bucket api in Directory repo 2025-05-16 19:16:03 +05:30
Pramod Mahajan
cfa8571079 called submit function inside Directory component from manageDirectory 2025-05-16 19:15:15 +05:30
Pramod Mahajan
c7b5a0ba7d created new contact form 2025-05-16 19:14:34 +05:30
Pramod Mahajan
a1ee9dac38 added useBuckets hook and set up cached data if have 2025-05-16 19:13:56 +05:30
Pramod Mahajan
085f45210e changed coulmn 2025-05-16 19:09:24 +05:30
Pramod Mahajan
7cfe04de2e modified TagInput, for array an object 2025-05-16 19:08:41 +05:30
Pramod Mahajan
1c1a1da8a0 removed backdrop 2025-05-16 19:07:15 +05:30
kartik.sharma
115b49ac44 Modified assign task popup from Daily task planning component. 2025-05-16 16:53:51 +05:30
Gitea Admin
c2c00fa175 Merge pull request 'Change name daily task to Daily Progress Report' (#113) from Kartik_Enhancement#277 into Issue_May_3W 
Reviewed-on: #113
 2025-05-16 09:57:17 +00:00
kartik.sharma
4e74d8fce5 Change name daily task to Daily Progress Report 2025-05-16 09:57:17 +00:00
pramod.mahajan
9a0482071a Merge pull request 'pramod_Task#294' (#112) from pramod_Task#294 into Feature_Directory 
Reviewed-on: #112
 2025-05-15 17:33:16 +00:00
Pramod Mahajan
2922cca22d integrated Contact Tag list API and display in master table 2025-05-15 22:58:50 +05:30
Pramod Mahajan
a3d21ba098 updated incorrect API endpoint 2025-05-15 22:58:02 +05:30
pramod.mahajan
cdc52ae947 Merge pull request 'Task#225 : integrate Get Contact List API in useMaster hook' (#111) from pramod_Task#225 into Feature_Directory 
Reviewed-on: #111
 2025-05-15 17:03:45 +00:00
Pramod Mahajan
04297346fa feat: integrate Get Contact List API in useMaster hook 2025-05-15 22:21:20 +05:30
pramod.mahajan
70cfa36ba8 Merge pull request 'pramod_Task-#293' (#110) from pramod_Task-#293 into Feature_Directory 
Reviewed-on: #110
 2025-05-15 16:23:13 +00:00
Pramod Mahajan
d8df891370 added createContactTg component inside MasterModal 2025-05-15 21:48:44 +05:30
Pramod Mahajan
dcc611b768 created new createContactMaster component 2025-05-15 21:47:51 +05:30
Pramod Mahajan
413dba4f5c added Tag master inside masterList 2025-05-15 21:47:20 +05:30
kartik.sharma
0a1f76afb6 Modified popup of Assign Task. 2025-05-15 19:40:09 +05:30
Gitea Admin
9a4c5df14f Merge pull request 'pramod_Task#224 : Created New Master - Contact Category' (#108) from pramod_Task#224 into Feature_Directory 
Reviewed-on: #108
 2025-05-15 12:28:37 +00:00
Pramod Mahajan
cd21bc14ff created new repo for tag and contact category mastes 2025-05-15 12:28:37 +00:00
Pramod Mahajan
40df12de86 added CreateContactCategory in master modal 2025-05-15 12:28:37 +00:00
Pramod Mahajan
74ed8d3c4f created new constact category master 2025-05-15 12:28:37 +00:00
Pramod Mahajan
784eebafea added one more master in masterList - Contact Category 2025-05-15 12:28:37 +00:00
Gitea Admin
88d23fc765 Merge pull request 'pramod_Task-#280 - Fetched & Display Contact List in Directory' (#107) from pramod_Task-#280 into Feature_Directory 
Reviewed-on: #107
 2025-05-15 12:27:59 +00:00
Pramod Mahajan
50ef045479 display contact in list view 2025-05-15 12:20:55 +05:30
Pramod Mahajan
cc98f34b44 displaye contacts in List View 2025-05-15 12:19:57 +05:30
Pramod Mahajan
5415210d70 created new hook for get a contacts 2025-05-15 12:19:30 +05:30
Pramod Mahajan
3670409977 created new repo for get contact list 2025-05-15 12:18:05 +05:30
Gitea Admin
7d3bffe0cd Merge pull request 'pramod_Bug-#271' (#106) from pramod_Bug-#271 into Issue_May_3W 
Reviewed-on: #106
 2025-05-15 05:46:40 +00:00
Pramod Mahajan
7d07002555 visible assign task button in mobile view 2025-05-15 05:46:40 +00:00
Pramod Mahajan
2ebd1a074f show 'No Reports Found' message when task list is empty and loading is complete 2025-05-15 05:46:40 +00:00
Pramod Mahajan
ce4b517ce5 Add condition to move entries to 'approved' if checkOut and date are in the past. 2025-05-15 05:46:40 +00:00
Gitea Admin
1e57e6fc03 Merge pull request 'Changed the Id value of Assign_To_Project permission and ASSIgn_Report_Task Permission' (#105) from Ashutosh_Frature_Permission into Issue_May_3W 
Reviewed-on: #105
 2025-05-14 09:59:08 +00:00
ashutosh.nehete
ca9f744d01 Changed the Id value of Assign_To_Project permission and ASSIgn_Report_Task Permission 2025-05-14 15:00:39 +05:30
Gitea Admin
197abedfe2 Merge pull request 'Implemented Pushover to display permission descriptions when editing or creating application role' (#104) from Kartik_permission_description into Issue_May_3W 
Reviewed-on: #104
 2025-05-14 08:04:12 +00:00
kartik.sharma
aa0bdb7a57 Implemented Pushover to display permission descriptions when editing or creating application role 2025-05-13 18:48:40 +05:30
Vikas Nale
c8ad72a2da added Assign_view progress task permission. 2025-05-13 12:40:10 +05:30
Vikas Nale
f94e8a1f88 Merge branch 'pramod_Bug#221' into Issue_May_2W 
# Conflicts:
#	src/components/Project/Infrastructure/WorkItem.jsx
 2025-05-13 12:31:09 +05:30
Pramod Mahajan
31286eff0a Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Bug#221 2025-05-13 12:14:50 +05:30
Pramod Mahajan
0ca7acb140 added Assign_view progress task permission. 2025-05-13 12:14:36 +05:30
Pramod Mahajan
ba6b15a12e custimize accordation css 2025-05-13 11:33:25 +05:30
Pramod Mahajan
d398a6cb39 added dropdwon for action view 2025-05-13 11:32:09 +05:30