Commit Graph

189 Commits (3547b96c21676b712b8303e63abca7dd4bc3342c)

Author SHA1 Message Date
Sikander Saleem e03038caba Merge branch 'refs/heads/main_production' into main_production_audio_video_call
# Conflicts:
#	ios/Podfile
#	lib/controllers/api_routes/urls.dart
#	lib/controllers/notification/firebase_notification_manger.dart
2 days ago
Sikander Saleem 7490544084 Merge branch 'refs/heads/main_production' into main_production_attahment_type
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/models/helper_data_models/spare_part/activity_spare_part_model.dart
#	lib/models/plan_preventive_visit/plan_preventive_visit_model.dart
#	lib/modules/cm_module/views/forms/spare_part/spare_part_request.dart
2 weeks ago
Sikander Saleem 2ab2abd693 site are changed as per organization 3 weeks ago
Sikander Saleem 97d60b3031 huawei calling added 4 weeks ago
Sikander Saleem 42effa2db0 call declined when app is killed. 4 weeks ago
Sikander Saleem f9274e070e improvements 1 month ago
Sikander Saleem a01f40e20d code merged from main production. 2 months ago
Sikander Saleem 3ebb1d7fab Merge branch 'refs/heads/main_production' into main_production_attahment_type
# Conflicts:
#	lib/main.dart
#	lib/modules/asset_delivery_module/helper_function.dart
#	lib/modules/asset_delivery_module/pages/attachment_view.dart
#	lib/modules/demo_module/demo_request_item_view.dart
#	lib/modules/incident_module/incident_detail_page.dart
2 months ago
WaseemAbbasi22 448a85522a bug fixes 2 months ago
Sikander Saleem 3afcb220a7 Merge branch 'refs/heads/main_production' into ui_ux_rollout_merge_notification_settings 3 months ago
Sikander Saleem 09ecf4fab4 traf added. 3 months ago
Sikander Saleem 313df6da8b improvements 3 months ago
WaseemAbbasi22 63d4c79a73 document library CR implementation 3 months ago
Sikander Saleem b97f310d9d Merge branch 'refs/heads/main_production' into ui_ux_rollout_merge_notification_settings
# Conflicts:
#	lib/main.dart
#	lib/modules/asset_delivery_module/pages/delivery_inspection/cost_center_form_view.dart
#	lib/new_views/common_widgets/app_drawer.dart
#	lib/new_views/pages/settings_page.dart
3 months ago
Sikander Saleem f62f5c9db7 Merge branch 'refs/heads/main_production' into export_module_ui_ux_enhancement_signup
# Conflicts:
#	lib/extensions/context_extension.dart
#	lib/main.dart
#	lib/new_views/common_widgets/default_app_bar.dart
3 months ago
Sikander Saleem 957b6eddea cont- 3 months ago
Sikander Saleem b26538b3d6 cont 3 months ago
Sikander Saleem 2a0f27f4d7 audio/video cont 3 months ago
WaseemAbbasi22 5137f2dd34 bug fixes 4 months ago
WaseemAbbasi22 7186fb13c0 improvements 4 months ago
WaseemAbbasi22 9ab4ed6964 notifications apis integrated 4 months ago
Sikander Saleem d136fd990e Merge branch 'refs/heads/main_production_ai_enhancement_rollout_changes' into ui_ux_rollout_merge
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/dashboard_latest/widgets/progress_fragment.dart
#	lib/dashboard_latest/widgets/request_category_fragment.dart
#	lib/models/new_models/dashboard_count.dart
#	lib/modules/cleaner_module/pages/cleaner_request_item_view.dart
#	lib/modules/cleaner_module/pages/cleaner_search_form_view.dart
#	lib/modules/cleaner_module/widgets/cleaner_checklist_widget.dart
#	lib/modules/pm_module/recurrent_wo/components/task_info_widget.dart
#	lib/modules/pm_module/recurrent_wo/recurrent_work_order_view.dart
#	lib/modules/tm_module/device_transfer/device_filter_screen.dart
#	lib/modules/traf_module/traf_request_detail_page.dart
#	lib/modules/traf_module/traf_request_item_view.dart
#	lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart
#	lib/new_views/pages/land_page/requests/recurrent_wo_item_view.dart
#	lib/new_views/pages/land_page/widgets/request_item_view_list.dart
5 months ago
WaseemAbbasi22 f116c96578 site , signup and demo completed 5 months ago
Sikander Saleem 9574937596 Merge branch 'refs/heads/main_production_ai_enhancement' into main_production_ai_enhancement_rollout_changes
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/controllers/providers/api/all_requests_provider.dart
5 months ago
WaseemAbbasi22 7fc19d9058 added the site and department dropdown 5 months ago
WaseemAbbasi22 450cb91268 site deparment dropdown added for create traf request 5 months ago
WaseemAbbasi22 d9eb1ae835 site implementation inprogress 5 months ago
WaseemAbbasi22 3109e87cee inprogress 5 months ago
WaseemAbbasi22 14e845b18a signup inprogress 5 months ago
WaseemAbbasi22 c35162fd88 cleaner module implementation new flow complete 5 months ago
Sikander Saleem f356d5efcd improvements. 6 months ago
WaseemAbbasi22 77f5d41757 export feature added for asset and my request 6 months ago
WaseemAbbasi22 33f1f07e86 housekeeping module completed 6 months ago
Sikander Saleem b3ec1f0a63 code enhancement with ai. 7 months ago
Sikander Saleem b09609f692 commented files/codes deleted. 7 months ago
Sikander Saleem b94d5d1fbd android sdk upgraded to 36, 16kb page size support added. 8 months ago
Sikander Saleem 65c0566eef Merge branch 'design_3.0_incident_module' into design_3.0_demo_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/main.dart
#	lib/new_views/common_widgets/single_item_drop_down_menu.dart
#	lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart
#	lib/new_views/pages/land_page/my_request/my_requests_page.dart
#	lib/new_views/pages/land_page/requests/request_paginated_listview.dart
#	lib/new_views/pages/land_page/widgets/request_item_view_list.dart
8 months ago
Sikander Saleem 0a06edd883 improvements 9 months ago
Sikander Saleem cb2329a6c2 incident create request completed. 9 months ago
Sikander Saleem 58ee00b00a incident module dev -1 9 months ago
WaseemAbbasi22 60051af331 Merge remote-tracking branch 'origin/design_3.0_demo_module' into design_3.0_demo_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/modules/demo_module/create_demo_request_page.dart
#	lib/modules/demo_module/demo_provider.dart
9 months ago
Sikander Saleem 3372f7d38d demo attachment document type added. 9 months ago
WaseemAbbasi22 e0ed594072 API's implemented 10 months ago
WaseemAbbasi22 56252716b3 Merge remote-tracking branch 'origin/design_3.0_demo_module' into design_3.0_demo_module 10 months ago
Sikander Saleem 9eaae96c84 Merge branch 'design_3.0_medical_gas' into design_3.0_demo_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/main.dart
#	lib/modules/medical_gas_inspection/create_medical_gas_request_page.dart
#	lib/modules/medical_gas_inspection/medical_gas_inspection_detail_page.dart
#	lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart
10 months ago
Sikander Saleem 178309eb1e Merge branch 'design_3.0_asset_delivery_module' into design_3.0_medical_gas
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/main.dart
#	lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart
#	lib/new_views/pages/land_page/my_request/my_requests_page.dart
10 months ago
Sikander Saleem da85a2b639 Merge branch 'design_3.0_loan_module' into design_3.0_asset_delivery_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
10 months ago
Sikander Saleem 48b4b5e368 Merge branch 'design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
#	lib/controllers/notification/firebase_notification_manger.dart
#	lib/modules/cm_module/cm_detail_page.dart
#	lib/modules/cx_module/chat/chat_widget.dart
#	lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart
#	lib/new_views/pages/land_page/requests/service_request_item_view.dart
#	lib/views/pages/user/requests/pending_requests_screen.dart
10 months ago
WaseemAbbasi22 bff132ec6b API implementation inprogress 10 months ago
Sikander Saleem 7a5db103e0 api integrate cont. 10 months ago