Commit Graph

21 Commits (783f7fcbf5209e72880cf0f4212bec2ab638f1a2)

Author SHA1 Message Date
hussam al-habibeh c52a58af23 Merge branch 'master' of https://gitlab.com/Cloud_Solution/driver-app into order_list
 Conflicts:
	lib/core/service/orders_service.dart
5 years ago
hussam al-habibeh 4ab78aa0be deliverd order list 5 years ago
Elham Rababah 384710e9b6 finish next orders service 5 years ago
Elham Rababah aa1332676a First step form next orders service 5 years ago
Elham Rababah 621f594ad9 bottom sheet almost done 5 years ago
hussam al-habibeh 99ad3f1a4a call and location button functionality 5 years ago
Elham Rababah d4b1476d74 Merge branch 'dashboard_landscape' of https://gitlab.com/Cloud_Solution/driver-app into merge_landscape_into_dev
 Conflicts:
	lib/core/service/orders_service.dart
	lib/core/viewModels/orders_view_model.dart
	lib/pages/dashboard/dashboard_screen.dart
	lib/pages/orders/pending_orders_page.dart
5 years ago
hussam al-habibeh e3dbfe8dcb code reformat 5 years ago
hussam al-habibeh 5d53500e66 add pending orders response model 5 years ago
enadhilal 208d903e0a Enad Commit to merge master with delivery_confirmed branch.
there was conflicts in (localized_values.dart) and (translations_delegate_base.dart) and accept both changes.
5 years ago
Elham Rababah 8a839a5424 Merge branch 'PendingOrders' of https://gitlab.com/Cloud_Solution/driver-app into merge_trans_dash_into_dev
 Conflicts:
	lib/pages/dashboard/dashboard_screen.dart
5 years ago
Elham Rababah 0de2156b1e Merge branch 'delivery_confirmed' of https://gitlab.com/Cloud_Solution/driver-app into merge_delivery_into_dev
 Conflicts:
	lib/pages/dashboard/dashboard_screen.dart
5 years ago
hussam al-habibeh dcedc989e1 updates 5 years ago
enadhilal de394ec807 add changes based on the comment. 5 years ago
enadhilal 5b35d5d09a add route from dashboard and delivery info with item data 5 years ago
Elham Rababah b0a207008e first step qr reader 5 years ago
Elham Rababah 124ea81b26 Merge branch 'PendingOrders' of https://gitlab.com/Cloud_Solution/driver-app into merge_dev_dashboared
 Conflicts:
	lib/config/config.dart
5 years ago
hussam al-habibeh 5dc2756275 Dashboaed page 5 years ago
Elham Rababah 7e50545dd1 Finish login Functionality 5 years ago
Elham Rababah 3aec62dceb First step from login page 5 years ago
Mohammad Aljammal 257cc92691 add MVVM and di Mohammad Aljammal and Elham Rababah 6 years ago