Issues_July_3W : Fixed Infra Planning #265
Closed
pramod.mahajan
wants to merge 3 commits from
Issues_July_3W into main
pull from: Issues_July_3W
merge into: admin:main
admin:main
admin:Purchase_Order
admin:Finance_Grouping
admin:Purchase_Invoice_Management
admin:Subscription_Plan
admin:Permission_Management
admin:Cards_Theme_Add
admin:PmsGrid
admin:Expense_TransactionId
admin:Adding_Chips_DailyTask
admin:dpr-report
admin:Theme_selection_globally
admin:Implementing_theme_web
admin:Jobs_Weidget
admin:Weidget_Dashboard_Services
admin:DirectorY_Manage_Changes
admin:Kartik_Task#1675
admin:Encrypted_Reponse
admin:Adding_dropdown
admin:Response_Encryption
admin:Branch_Detail_View
admin:Kartik_Enhancement_918
admin:Adding_Toggle_Button
admin:Attendance_Tabs
admin:Implementing_TimeLine
admin:Image_Gallery_FilterChips
admin:Finance_Export_Functionality
admin:Purchase_Invoice_Update
admin:Purchase_Payment
admin:Multiple_File_Uploader
admin:Jobs_Side_Panel
admin:Adding_Multiple_FileUpload
admin:Services_Bugs
admin:Project_Branch_Management
admin:Weidget_Dashoard_Jobs
admin:Adding_New_Dropdown
admin:Issues_Nov_4W
admin:Assigned_Employee_Job_Role
admin:SideBarCollapsed
admin:Service_Project_ListView
admin:Kartik_Bug#1773
admin:Finance_Form_Layout
admin:Service_Project_Managment
admin:Collection_Service_Project
admin:Service_Management_CardView
admin:migrate_main
admin:Kartik_Bug#1391
admin:Organization_Hierarchy
admin:landing-page-consmatic-changes-migration
admin:upgrade_Expense
admin:Issues_Expense_2W
admin:Issues_Oct_4W_V1
admin:Payment_Getway_Management
admin:Kartik_Bug_V1#1539
admin:Kartik_Bug#1666
admin:View_Recurring_Expense
admin:Issues_Expense
admin:Kartik_Bug#1661
admin:Kartik_Bug#1657
admin:Recurring_Expense
admin:issues_Oct_4W
admin:OnFieldWork_V1
admin:Payment_Getway_Management_onField
admin:Kartik_Bug_V1#1543
admin:Kartik_Bug#1496
admin:Kartik_Bug_V1#1569
admin:Kartik_Bug_V1#1564
admin:Kartik_Bug_V1#1525
admin:Kartik_Bug_V1#1572
admin:Kartik_Bug_V1#1537
admin:Kartik_Bug#1534
admin:Inventary_Management
admin:Kartik_Enhancement#1468
admin:Issues_Oct_main_2W
admin:Kartik_Bug#1499
admin:Kartik_Bug#1434
admin:landing_page_with_new_theme
admin:collection_dev
admin:Kartik_Bug#1469
admin:Kartik_Bug#1497
admin:Kartik_Bug#1437
admin:Service_Org_Task_1495
admin:Kartik_Bug#1450
admin:Kartik_Task#1477
admin:Kartik_Bug#1451
admin:Kartik_Bug#1455
admin:HotChanges_11_10_25
admin:Kartik_Bug#1462
admin:HotChanges_10_10_25
admin:Kartik_Bug#1463
admin:Kartik_Task#1459
admin:Kartik_Enhancement#1448
admin:HotChanges_09_10_25
admin:Kartik_Bug#1408
admin:Issues_Oct_1W
admin:Kartik_Bug#1425
admin:Kartik#Enhancement#1444
admin:Kartik_Bug#1381
admin:Kartik_Bug#1395
admin:HotChanges_06-10-25
admin:Kartik_Bug#1350
admin:OnField_Issues_Oct_2W
admin:Adding_Chips_Expense
admin:Kartik_Bug#1417
admin:Kartik_Bug#1418
admin:HotChanges_04_10_25
admin:Kartik_Task#1405
admin:Kartik_Task#1402
admin:Kartik_Bug#1394
admin:Kartik_Bug#1392
admin:Kartik_Bug#1390
admin:Kartik_Bug#1388
admin:Organization_Management
admin:Image_Gallery_filter
admin:Kartik_Bug#1180
admin:ProjectUpdationForOrganizaion
admin:Kartik_Bug#1369
admin:Kartik_Bug#1366
admin:Kartik_Bug#1370
admin:Kartik_Bug#1372
admin:TeamAssignToProject
admin:Kartik_Task#1374
admin:Kartik_Task#1361
admin:Kartik_Bug#1359
admin:Kartik_Bug#1353
admin:Kartik_Bug#1306
admin:Kartik_Task_InfraMask#1266
admin:Kartik_Task#1345
admin:Kartik_Task#1303
admin:Kartik_Bug#1300
admin:Kartik_Bug#1301
admin:Kartik_Bug#1295
admin:Kartik_Bug#1298
admin:Kartik_Bug#1261
admin:Kartik_Bug#1292
admin:Kartik_Bug#1250
admin:Kartik_Task_Att#1236
admin:Kartik_Task_OrgCol_att#1238
admin:Kartik_Task_Infra#1265
admin:Kartik_Task_AtteOrg#1264
admin:organization_management
admin:Kartik_Task_TeamGrid#1259
admin:organization_level_login
admin:Kartik_Task_AttFilter#1235
admin:Kartik_Task_DailyProgress#1232
admin:Kartik_Task_DailyTask#1231
admin:Kartik_Task#1229
admin:Kartik_Task#1227
admin:Kartik_Task#1230
admin:Master_Services
admin:UI_Changes_Add_Skeleton
admin:Intefrating_API_Dashboard
admin:Refactor_Directory
admin:hotchanges_projectPermission
admin:Issues_Sep_1W_V2
admin:Kartik_Bug#1115
admin:Kartik_Bug#1080
admin:Kartik_Bug#909
admin:Kartik_Bug#1064
admin:Kartik_Bug#1123
admin:Kartik_Bug#1113
admin:Kartik_Bug#976
admin:Kartik_Bug#1104
admin:Kartik_Bug#830
admin:Kartik_Bug#962
admin:Landing_pages
admin:Document_Manag
admin:Kartik_Bug#1100
admin:landing_page_1
admin:Kartik_Bug#1015
admin:Kartik_Bug#1016
admin:Kartik_Bug#1071
admin:Issues_Sep_1W
admin:Kartik_Bug#1096
admin:Kartik_Bug#1081
admin:Kartik_Bug#1039
admin:Kartik_Bug#1045
admin:Kartik_Bug#1056
admin:Kartik_Bug#1052
admin:UI_Changes_PMS
admin:Kartik_Bug#1042
admin:Issues_Aug_2W
admin:Kartik_Task#1079
admin:Kartik_Enhancement#1053
admin:Kartik_Bug#1024
admin:Kartik_Bug#1041
admin:Kartik_Bug#1037
admin:Kartik_Bug#1028
admin:Kartik_Bug#955
admin:Kartik_Bug#979
admin:Kartik_Bug#973
admin:Kartik_Bug#978
admin:Kartik_Bug#956
admin:Kartik_Bug#972
admin:Kartik_Bug#974
admin:MasterModalRefactor
admin:UI_Changes_DirectoryFilter
admin:Tenant_Manag
admin:Kartik_Task#953
admin:loader_implmentation
admin:AppMenu
admin:Issues_Aug_1W
admin:Kartik_Task#969
admin:Kartik_Bug#915
admin:Kartik_Enhancement#948
admin:Kartik_Bug#920
admin:Kartik_Bug#944
admin:Kartik_Bug#941
admin:Kartik_Bug#906
admin:Kartik_Bug#907
admin:Kartik_Bug#933
admin:Kartik_Bug#932
admin:Kartik_Bug#895
admin:Kartik_Bug#919
admin:Kartik_Bug#929
admin:Kartik_Bug#886
admin:Kartik_Bug#910
admin:Kartik_Bug#908
admin:Kartik_Bug#891
admin:Document_Manager
admin:Services_Master
admin:profile_page
admin:Kartik_Bug#862
admin:Kartik_Bug#887
admin:Kartik_Bug#888
admin:Kartik_Bug#884
admin:Kartik_Bug#889
admin:Expense_Manangement_Feature
admin:Kartik_Bug#869
admin:Expense_Bugs
admin:Kartik_Bug#873
admin:Kartik_Bug#836
admin:Refactor_Expenses
admin:Kartik_Task#839
admin:Kartik_Task857
admin:HofixedIssues_July_4W
admin:hotfix/MasterActivity
admin:Kartik_Bug#842
admin:Kartik_Bug#841
admin:Feature_Expense
admin:Tenant_Management
admin:Expense_Bug#828
admin:Issues_July_4W
admin:Kartik_Bug#798
admin:Kartik_Task_#832_ProjectSelection
admin:Kartik_Task#832
admin:Kartik_Bug#793
admin:Bug#752RefreshToken
admin:filter_offcanvas
admin:Kartik_Bug#717
admin:Kartik_Enhancement#807
admin:Kartik_Bug#797
admin:Feature-#809_ExpenseStatsuMang
admin:Kartik_ProjectList#628
admin:Kartik_Filter_Changes#800
admin:Kartik_Directory_Changes#805
admin:Kartik_Bug#800
admin:Kartik_Bug#805
admin:kartik_Bug#628
admin:Feature#778_DeletePaymentMode
admin:Feature#777_EditPaymentMode
admin:Feature-#776NewPaymentMode
admin:Feature#774_DeleteExpenseType
admin:Feature#773_EditExpenseType
admin:Feature#772_NEWExpenseType_Master
admin:Feature#804_ExpnseFilter
admin:Kartik_Bug#611
admin:Kartik_Bug#799
admin:Attendance_Regularize_Issues
admin:login-layout-changes
admin:Kartik_Task750
admin:react-query
admin:Issues_July_2W
admin:vikas_widget_project_overview
admin:Kartik_Bug#664
admin:Issues_July_1W
admin:pramod_Task#505
admin:Kartik_Task#512
admin:cosmatic-changes
admin:SingalR_Integration
admin:Kartik_Bug#494
admin:activity_image
admin:GlobalSelectProject
admin:Kartik_Bug#493
admin:newFeature_Directory
admin:Feature_Directory
admin:pramod_Task#482
admin:Kartik_Task#470
admin:Kartik_Task#425
admin:Jun_Widget
admin:Kartik_Task#414
admin:Kartik_Task#400
admin:pramod_Task#111
admin:pramod_Task-#398
admin:pramod_Task#294
admin:pramod_Task#207
admin:pramod_Bug#141
admin:pramod_Bug#152InfraModals
admin:pramod_Bug#128
admin:vikas_deploy
admin:vikas_16_dockerdeployment
3 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
| 34a2753641 | removed unsuded code | |||
| 2c4cc59c7d | Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_3W, correct correct permissions for respective user | |||
| 1954fe8d79 | update Assigned Task modal to pass correct params to employee hook |
