nextwo
|
4cc12691ac
|
gas refill
|
1 year ago |
 zaid_daoud
|
39515c48ad
|
Merged
|
1 year ago |
|
zaid_daoud
|
957e3d9e6f
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
# lib/l10n/app_en.arb
|
1 year ago |
|
zaid_daoud
|
3959068858
|
Asset Transfer Done + Multiple Image Picker + Enhancements
|
1 year ago |
|
nextwo
|
d6de203ba0
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
|
1 year ago |
Sikander Saleem
|
487b04514a
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
# lib/views/widgets/equipment/single_device_picker.dart
|
1 year ago |
|
Sikander Saleem
|
4ffe899ff9
|
asset list & detail screens, models, added.
|
1 year ago |
|
zaid_daoud
|
35b67d2cb5
|
_
|
1 year ago |
|
zaid_daoud
|
0c6f4d5156
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
# lib/views/widgets/sound/sound_player.dart
|
1 year ago |
|
nextwo
|
2604d8b253
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
# pubspec.yaml
|
1 year ago |
|
zaid_daoud
|
5b1e067a93
|
Pick asset screen design
|
1 year ago |
|
Sikander Saleem
|
c49b66a401
|
sound player color fix.
|
1 year ago |
|
zaid_daoud
|
7d2afa23cc
|
add record player to the recorder
|
1 year ago |
|
zaid_daoud
|
b4ea88e7db
|
_
|
1 year ago |
|
zaid_daoud
|
84c9efda5a
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
# lib/l10n/app_en.arb
|
1 year ago |
|
zaid_daoud
|
e419b17bd1
|
Service request design done
|
1 year ago |
|
Sikander Saleem
|
0e30fef10c
|
work order list ui changed.
|
1 year ago |
|
Sikander Saleem
|
0170c6f5cb
|
service request status color improvement.
|
1 year ago |
|
Sikander Saleem
|
2d553b56e0
|
service request detail ui changed.
|
1 year ago |
|
nextwo
|
8f11ef577e
|
gas refill
|
1 year ago |
|
nextwo
|
64b249a0cd
|
gas refill
|
1 year ago |
|
Sikander Saleem
|
ec4d4a9193
|
merge conflict resolved.
|
1 year 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
|
1 year ago |
|
Sikander Saleem
|
1ee58eeed9
|
merge conflict resolved.
|
1 year 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
|
1 year ago |
|
zaid_daoud
|
937c30736e
|
test
|
1 year ago |
|
Sikander Saleem
|
7e17bd2558
|
localization i18 implementation
|
1 year ago |
|
zaid_daoud
|
1e1ac215ea
|
Rename asset to be device as it was before
|
1 year ago |
|
zaid_daoud
|
c7d6b68fd2
|
Change Asset & Asset Transfer models
|
1 year ago |
|
Sikander Saleem
|
c8e3f2df48
|
Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
|
1 year ago |
|
Sikander Saleem
|
392182e234
|
track service request cont.
|
1 year ago |
|
zaid_daoud
|
4bffab9c9b
|
Request Gas refill screen Done
|
1 year ago |
|
Sikander Saleem
|
050c710bf8
|
android 1.0.4 released.
|
1 year ago |
|
Sikander Saleem
|
c6c6aa5bce
|
Merge remote-tracking branch 'origin/main_latest_merged' into main_latest_merged
# Conflicts:
# ios/Podfile.lock
# ios/Runner.xcodeproj/project.pbxproj
|
1 year ago |
|
Sikander Saleem
|
150ad60de6
|
track service request
|
1 year ago |
|
Sikander Saleem
|
df4a9a4887
|
revert code for existing functionality
|
1 year ago |
|
zaid_daoud
|
b673cd8a2b
|
Gas refill screen
|
1 year ago |
|
zaid_daoud
|
c66acbd1ee
|
Gas refill screen
|
1 year ago |
|
zaid_daoud
|
b77a36ac50
|
Gas refill screen
|
1 year ago |
|
zaid_daoud
|
b1e93abf4d
|
Gas refill design without submit button
|
1 year ago |
|
zaid_daoud
|
ed759f5dcf
|
Still working on gas refill request
|
1 year ago |
|
zaid_daoud
|
085674ee18
|
adding radio buttons for theme
|
1 year ago |
|
zaid_daoud
|
bb1a516f0a
|
add the old route
|
1 year ago |
|
zaid_daoud
|
a8e7d26355
|
Back to the old dashboard
|
1 year ago |
|
zaid_daoud
|
651477ec0d
|
Improvements
|
1 year ago |
|
zaid_daoud
|
decd48cdd2
|
Improvements
|
1 year 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
|
1 year ago |
|
Sikander Saleem
|
3df1bf70ca
|
improvements
|
1 year ago |
|
zaid_daoud
|
b78da03ae5
|
Improvement
|
1 year ago |
|
zaid_daoud
|
683ff899c2
|
Improvements on login_page.dart
|
1 year ago |