Commit Graph

7 Commits (287acae3f1ef798666ca3ce7ee2cafb3a2429906)

Author SHA1 Message Date
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.
6 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
6 years ago
hussam al-habibeh dcedc989e1 updates 6 years ago
Elham cd115e717b Merge branch 'QR' into 'development'
Qr

See merge request Cloud_Solution/driver-app!9
6 years ago
hussam al-habibeh 4f0bf61fef Pending Orders list 6 years ago
Elham Rababah bf79a6427e refactor orders Concept 6 years ago
hussam al-habibeh 5dc2756275 Dashboaed page 6 years ago