Commit Graph

9 Commits (d6de203ba07eed1b4a7df736a5d2e5bf08849270)

Author SHA1 Message Date
Sikander Saleem 487b04514a Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/views/widgets/equipment/single_device_picker.dart
2 years ago
Sikander Saleem 4ffe899ff9 asset list & detail screens, models, added. 2 years ago
zaid_daoud 5b1e067a93 Pick asset screen design 2 years ago
zaid_daoud e419b17bd1 Service request design done 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
zaid_daoud 937c30736e test 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