Commit Graph

31 Commits (ui_ux_rollout_merge)

Author SHA1 Message Date
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
1 week ago
Sikander Saleem 471ce223e1 bug 1955 fixed. 1 month ago
WaseemAbbasi22 af067099ec Ui fixes for Ppm and device transfer request 1 month ago
WaseemAbbasi22 474a244b55 Merge remote-tracking branch 'origin/export_module_ui_ux_enhancement' into export_module_ui_ux_enhancement
# Conflicts:
#	lib/new_views/common_widgets/app_text_form_field.dart
#	lib/views/widgets/date_and_time/date_picker.dart
#	lib/views/widgets/timer/app_timer.dart
2 months ago
WaseemAbbasi22 312de208e7 Bug Fixes 2 months ago
Sikander Saleem 6be8e94d67 improvements 2 months ago
WaseemAbbasi22 80ee95cbd2 All requests detail pages text and spacing refactoring 2 months ago
Sikander Saleem 1da0ff7d14 bottom sheet color scheme, 2 months ago
Sikander Saleem 620945d1c1 attachment color scheme changed. 2 months ago
Sikander Saleem 6a01df319d session expired dialog color scheme. 2 months ago
Sikander Saleem 1699acc27c improvements 2 months ago
Sikander Saleem b9aabf8691 improvements 2 months ago
Sikander Saleem 5a61d52455 improvements 2 months ago
Sikander Saleem c12a0ce88d bug fixes for clear filters. 2 months ago
Sikander Saleem 789ef59b0b filter chips added. 2 months ago
Sikander Saleem e0fda1e00a ui changes 2 months ago
WaseemAbbasi22 77f5d41757 export feature added for asset and my request 2 months ago
Sikander Saleem d1a94df33d improvements. 2 months ago
Sikander Saleem b09609f692 commented files/codes deleted. 3 months ago
Sikander Saleem c6a6f24774 asset transfer improvement 4 months ago
Sikander Saleem 619c643367 Merge branch 'refs/heads/design_3.0_eng_role_module' into design_3.0_demo_module 4 months ago
Sikander Saleem 31a9296a8e improvements 5 months ago
Sikander Saleem 2997eef5ad chat sync fixes. 5 months ago
Sikander Saleem df8d22f792 chat employee id changes. 5 months ago
Sikander Saleem 5391cc324c improvements 5 months ago
Sikander Saleem 8db4094716 assign to me & cancel added for asset transfer. 5 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
5 months ago
Sikander Saleem 883210e61b merge conflict fixed 7 months ago
Sikander Saleem ea05e965d5 Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
#	lib/modules/tm_module/device_transfer/device_transfer_details.dart
#	lib/views/widgets/gas_refill/gas_refill_list.dart
7 months ago
Sikander Saleem 1a3861d816 files refactoring 7 months ago
Sikander Saleem 16a2fa2b26 files refactoring 7 months ago