Commit Graph

6 Commits (a69e048388866c777411677a4aaaf6f82dd8135d)

Author SHA1 Message Date
nextwo 8b7b40b0af Merge branch 'main_latest_merged' into majd_development_new
# Conflicts:
#	assets/subtitles/ar_subtitle.json
#	assets/subtitles/en_subtitle.json
#	lib/main.dart
#	lib/models/service_request/service_request.dart
#	lib/views/pages/splash_screen.dart
#	lib/views/pages/user/notifications/notifications_page.dart
#	lib/views/pages/user/profile_page.dart
#	lib/views/pages/user/requests/create_request.dart
#	lib/views/pages/user/requests/request_details.dart
#	lib/views/pages/user/requests/requests_page.dart
#	lib/views/widgets/equipment/auto_complete_devices_field.dart
#	lib/views/widgets/equipment/single_device_picker.dart
2 years ago
nextwo 756e2a1881 implement searchWorkOrders api and edit on ui 2 years ago
nextwo d869f82020 implement searchWorkOrders api and edit on ui 2 years ago
zaid_daoud a219d81ccc Update Service Request Done 2 years ago
zaid_daoud bdfa26411b Add New Service Body Changed 2 years ago
MaximusAshraf 2d2e22fa11 Initial commit 3 years ago