You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Sikander Saleem 47b863c479 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 ... # Conflicts: # lib/main.dart # lib/new_views/common_widgets/app_floating_action_button.dart # lib/new_views/common_widgets/app_text_form_field.dart # lib/new_views/pages/new_gas_refill_request_page.dart # lib/new_views/pages/new_service_request_page.dart # lib/views/pages/device_transfer/device_transfer_details.dart # lib/views/pages/device_transfer/update_device_transfer.dart # lib/views/pages/user/requests/create_request.dart # lib/views/pages/user/requests/request_details.dart # lib/views/widgets/device_trancfer/device_transfer_info_section.dart # lib/views/widgets/device_trancfer/device_transfer_item.dart # lib/views/widgets/device_trancfer/device_transfer_list.dart # lib/views/widgets/equipment/auto_complete_devices_field.dart # lib/views/widgets/equipment/auto_complete_models_field.dart # lib/views/widgets/equipment/device_button.dart # lib/views/widgets/equipment/device_item.dart # lib/views/widgets/equipment/single_device_picker.dart # lib/views/widgets/pentry/auto_complete_fields/auto_complete_devices_field.dart # lib/views/widgets/requests/service_request_item.dart # lib/views/widgets/search/asset_transfer_search_dialog.dart		2 years ago
..
asset_transfer_search_dialog.dart	Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0	2 years ago
filter_item.dart	implement searchWorkOrders api and edit on ui	2 years ago
service_request_search_bar.dart	localization i18 implementation	2 years ago
visits_search_bar.dart	localization i18 implementation	2 years ago