Commit Graph

405 Commits (84c9efda5ac224cb9c2bedf2646ff7dfca5bdcaa)
 

Author SHA1 Message Date
zaid_daoud 84c9efda5a Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/l10n/app_en.arb
2 years ago
zaid_daoud e419b17bd1 Service request design done 2 years ago
Sikander Saleem 0e30fef10c work order list ui changed. 2 years ago
Sikander Saleem 0170c6f5cb service request status color improvement. 2 years ago
Sikander Saleem 2d553b56e0 service request detail ui changed. 2 years ago
Sikander Saleem ec4d4a9193 merge conflict resolved. 2 years ago
Sikander Saleem eaa9bb62ee Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	assets/translations/ar.json
#	lib/views/widgets/equipment/pick_asset.dart
2 years ago
Sikander Saleem 1ee58eeed9 merge conflict resolved. 2 years ago
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
zaid_daoud 937c30736e test 2 years ago
Sikander Saleem 7e17bd2558 localization i18 implementation 2 years ago
zaid_daoud 1e1ac215ea Rename asset to be device as it was before 2 years ago
zaid_daoud c7d6b68fd2 Change Asset & Asset Transfer models 2 years ago
Sikander Saleem c8e3f2df48 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
Sikander Saleem 392182e234 track service request cont. 2 years ago
zaid_daoud 4bffab9c9b Request Gas refill screen Done 2 years ago
Sikander Saleem 150ad60de6 track service request 2 years ago
Sikander Saleem df4a9a4887 revert code for existing functionality 2 years ago
zaid_daoud b673cd8a2b Gas refill screen 2 years ago
zaid_daoud c66acbd1ee Gas refill screen 2 years ago
zaid_daoud b77a36ac50 Gas refill screen 2 years ago
zaid_daoud b1e93abf4d Gas refill design without submit button 2 years ago
zaid_daoud ed759f5dcf Still working on gas refill request 2 years ago
zaid_daoud 085674ee18 adding radio buttons for theme 2 years ago
zaid_daoud bb1a516f0a add the old route 2 years ago
zaid_daoud a8e7d26355 Back to the old dashboard 2 years ago
zaid_daoud 651477ec0d Improvements 2 years ago
zaid_daoud decd48cdd2 Improvements 2 years ago
Sikander Saleem 97555aa3fb Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/new_views/common_widgets/app_filled_button.dart
2 years ago
Sikander Saleem 3df1bf70ca improvements 2 years ago
zaid_daoud b78da03ae5 Improvement 2 years ago
zaid_daoud 683ff899c2 Improvements on login_page.dart 2 years ago
zaid_daoud e49399de45 Improvements on login_page.dart 2 years ago
zaid_daoud 1db543710e Working on gas request screen 2 years ago
zaid_daoud 3bdae42769 1- change text form field code
2- app bar design
3- working on request gas refill screen
2 years ago
zaid_daoud 5ded8e4386 Enhancements 2 years ago
zaid_daoud 9c25b6d2e0 Add Submit Button To the new requests screens 2 years ago
zaid_daoud 8e315d54d0 Default App Bar 2 years ago
zaid_daoud 42deeeb104 new service request page 2 years ago
zaid_daoud 1f4fbee83b floating button animation 2 years ago
zaid_daoud 5bfd6924e1 text form field alignment 2 years ago
zaid_daoud 83980f9b0c Add Language Switch to the drawer 2 years ago
zaid_daoud 22e3067d05 Floating button theme 2 years ago
zaid_daoud 95eac4b196 Call Us bottomsheet 2 years ago
zaid_daoud ebb7c114a2 Dashboard Name 2 years ago
zaid_daoud a0373de566 Fix Home App Bar 2 years ago
zaid_daoud 0513fe1bc0 Fix Home App Bar 2 years ago
zaid_daoud 905e430549 Enhancements 2 years ago
zaid_daoud 06152bee2f Fix Bottom Nav Bar Style 2 years ago
zaid_daoud c10cb10fe0 Merged with Majd 2 years ago