|
|
b36120f73d
|
Merge pull request 'In ExpensePanel add new Toggle button.' (#421) from Kartik_Task#1303 into Organization_Management
Reviewed-on: #421
|
2025-09-24 11:14:01 +00:00 |
|
|
|
e2ae2e5fbd
|
change labels as per guidance
|
2025-09-24 16:43:36 +05:30 |
|
|
|
521e6690cb
|
uncommit important stuff
|
2025-09-24 15:09:34 +05:30 |
|
|
|
1f4a7e5e9c
|
forgot uncomment important stuff- tenant
|
2025-09-24 15:08:42 +05:30 |
|
|
|
1d3fcff859
|
Merge pull request 'Activities redirection issue – Redirects to “Marco Secure Solution Pvt Ltd” project by default' (#423) from Kartik_Bug#1292 into Organization_Management
Reviewed-on: #423
Merged
|
2025-09-24 07:20:45 +00:00 |
|
|
|
1286184e1f
|
Activities redirection issue – Redirects to “Marco Secure Solution Pvt Ltd” project by default
|
2025-09-24 07:20:45 +00:00 |
|
|
|
4e315aafcf
|
added small ui changed like table b-padding, button size and fixd delete activity and group
|
2025-09-24 12:49:00 +05:30 |
|
|
|
52e12426af
|
Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management
|
2025-09-23 17:49:01 +05:30 |
|
|
|
d975664023
|
integrated service group wise activity operation delete,edit and create
|
2025-09-23 17:48:56 +05:30 |
|
|
|
d87dae4799
|
In ExpensePanel add new Toggle button.
|
2025-09-23 16:35:48 +05:30 |
|
|
|
4683eff749
|
In the ProjectList view, when we select 'View Details', the project is automatically set to 'marcosecure' instead of the selected project.
|
2025-09-23 11:06:16 +05:30 |
|
|
|
772a3e2829
|
Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management
|
2025-09-22 18:44:13 +05:30 |
|
|
|
ca7b0cda13
|
initially setup of service management
|
2025-09-22 18:44:05 +05:30 |
|
|
|
a380a7ab29
|
Changes in Choose Organization1 popup increase the space.
|
2025-09-22 16:25:02 +05:30 |
|
|
|
c609387924
|
Changes in Organization popup
|
2025-09-22 16:00:24 +05:30 |
|
|
|
69cc3b9383
|
Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management
|
2025-09-22 13:13:22 +05:30 |
|
|
|
6ebbc853bc
|
optimized logout fun and intergrated inside Tenant selection page
|
2025-09-22 13:13:13 +05:30 |
|
|
|
71dd35adc2
|
Changes in Services Dropdown.
|
2025-09-22 12:40:00 +05:30 |
|
|
|
533b40d1bf
|
Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management
|
2025-09-22 10:31:06 +05:30 |
|
|
|
42a80bbd68
|
removed unused code
|
2025-09-22 10:30:57 +05:30 |
|
|
|
397020ccb4
|
Merge pull request 'Creating a Services in Master Compoenents.' (#408) from Master_Services into Organization_Management
Reviewed-on: #408
|
2025-09-22 05:00:06 +00:00 |
|
|
|
71932ea6dc
|
Merge pull request 'Integrate the API for Work Area and fetch data filtered by serviceId.' (#419) from Kartik_Task_Infra#1265 into Organization_Management
Reviewed-on: #419
|
2025-09-22 04:07:58 +00:00 |
|
|
|
693cabf63d
|
Merge pull request 'Calling api for Attendance component for Organization.' (#420) from Kartik_Task_Att#1236 into Organization_Management
Reviewed-on: #420
|
2025-09-22 04:07:09 +00:00 |
|
|
|
4afe43d116
|
handle one tenant have , directly move to dashboard once logged
|
2025-09-22 00:09:34 +05:30 |
|
|
|
b9b3788dda
|
configured tenant level login
|
2025-09-21 18:59:34 +05:30 |
|
|
|
5e1ccc9b05
|
Calling api for Attendance component for Organization.
|
2025-09-21 18:17:47 +05:30 |
|
|
|
aee510f527
|
revert pramod changed - (tenant login mistake
|
2025-09-21 16:58:29 +05:30 |
|
|
|
7e6020e3db
|
Merge branch 'organization_management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management
|
2025-09-21 16:42:26 +05:30 |
|
|
|
cf78d17cf5
|
Merge pull request 'Add an Organization column in the Attendance grid across all tabs.' (#414) from Kartik_Task_OrgCol_att#1238 into Organization_Management
Reviewed-on: #414
|
2025-09-21 11:11:21 +00:00 |
|
|
|
72dbdb0fe0
|
Changes in Attendance
|
2025-09-21 16:40:23 +05:30 |
|
|
|
afcd1934f9
|
Integrate the API for Work Area and fetch data filtered by serviceId.
|
2025-09-21 15:10:31 +05:30 |
|
Pramod
|
3e5afe0bc6
|
revertlogin initial steup in organization_management brnach
|
2025-09-21 10:13:12 +05:30 |
|
Pramod
|
070fa93fca
|
initially setup login
|
2025-09-21 10:06:38 +05:30 |
|
|
|
53a9cbc30b
|
Merge pull request 'Changes in the Teams Services dropdown will reflect the Services data.' (#418) from Kartik_Task_TeamGrid#1259 into Organization_Management
Reviewed-on: #418
|
2025-09-20 15:01:16 +00:00 |
|
|
|
70acf57266
|
Remove message from Services dropdwon.
|
2025-09-20 20:05:25 +05:30 |
|
|
|
b2d7349fc9
|
Adding search funcionality in Teams for Organization and Services.
|
2025-09-20 19:37:47 +05:30 |
|
|
|
a0f7e5c57b
|
Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Task_TeamGrid#1259
|
2025-09-20 19:32:41 +05:30 |
|
|
|
fa7dc2860c
|
Changes in the Teams Services dropdown will reflect the Services data.
|
2025-09-20 19:30:47 +05:30 |
|
|
|
a1a935b0d5
|
Merge pull request 'changed Uii for org. or project assigned' (#417) from organization_level_login into Organization_Management
Reviewed-on: #417
|
2025-09-20 13:27:30 +00:00 |
|
Pramod
|
e610cc08c1
|
changed Uii for org. or project assigned
|
2025-09-20 18:47:09 +05:30 |
|
|
|
9711144236
|
Adding a new Grid in Teams Grid.
|
2025-09-20 15:40:17 +05:30 |
|
|
|
1a88f5fec5
|
chenages msg
|
2025-09-20 14:02:57 +05:30 |
|
|
|
ce73cfad21
|
Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management
|
2025-09-20 13:59:24 +05:30 |
|
|
|
7dafd4a45f
|
fetched assigned organozation to project
|
2025-09-20 13:59:20 +05:30 |
|
|
|
2e3e3aa6ca
|
Merge pull request 'Adding Filter Icon in Attendance tab and add functionality in all Attendance component.' (#416) from Kartik_Task_AttFilter#1235 into Organization_Management
Reviewed-on: #416
|
2025-09-20 06:45:11 +00:00 |
|
|
|
158c934a9f
|
Merge branch 'Organization_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Organization_Management
|
2025-09-20 12:14:40 +05:30 |
|
|
|
f6d864d42e
|
assign to project and Tenant flow is integrated with api
|
2025-09-20 12:14:34 +05:30 |
|
|
|
90b96864be
|
Changes in Attendance filter
|
2025-09-20 12:13:49 +05:30 |
|
|
|
5a048f7066
|
Merge pull request 'Adding Dropdown and API call in Daily Progress Report.' (#413) from Kartik_Task_DailyProgress#1232 into Organization_Management
Reviewed-on: #413
|
2025-09-20 06:22:43 +00:00 |
|
|
|
731d2dbed7
|
Changes in Infrastructure.
|
2025-09-20 11:51:32 +05:30 |
|
