Commit Graph

38 Commits (208d903e0a57f77fcfa41229bf7d131e370b98c1)

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.
5 years ago
enadhilal 4d5b10e90b add translate to delivery branch. 5 years ago
Elham Rababah 7029cc2dd6 fix issues after merge 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 f1813b0443 fix login issue 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
Elham ed844cf652 Merge branch 'QR' into 'development'
use AppScaffold rather than  of scaffold

See merge request Cloud_Solution/driver-app!13
5 years ago
Elham Rababah 37eb412b23 use AppScaffold rather than of scaffold 5 years ago
enadhilal fac6230205 add route from dashboard and delivery info with item data step 2 5 years ago
enadhilal 5b35d5d09a add route from dashboard and delivery info with item data 5 years ago
Elham d5d675f461 Merge branch 'QR' into 'development'
Qr

See merge request Cloud_Solution/driver-app!10
5 years ago
Elham Rababah 699de4df42 add token 5 years ago
Elham Rababah aa2d4e9ab8 add token 5 years ago
Elham cd115e717b Merge branch 'QR' into 'development'
Qr

See merge request Cloud_Solution/driver-app!9
5 years ago
Elham Rababah 2dfe4ca1dd fix bug 5 years ago
hussam al-habibeh 4f0bf61fef Pending Orders list 5 years ago
Elham Rababah bf79a6427e refactor orders Concept 5 years ago
Elham Rababah b0a207008e first step qr reader 5 years ago
enadhilal 5e604c4778 Merge branch 'master' of gitlab.com:Cloud_Solution/driver-app into delivery_confirmed
# Conflicts:
#	lib/pages/landing/landing_page.dart
5 years ago
enadhilal 89fe5dfbdc add delivery pages and widget 5 years ago
Elham Rababah 5e983bd77d remove clear Shared pref code 5 years ago
Elham 0cde212a13 Merge branch 'merge_dev_dashboared' into 'master'
Merge dev dashboared

See merge request Cloud_Solution/driver-app!4
5 years ago
Elham Rababah b36ec7f490 Merge dashboard into dev 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 57e60178a3 Finish login Functionality 5 years ago
Elham Rababah 7e50545dd1 Finish login Functionality 5 years ago
Elham Rababah 8a8dd6457d Finish login page 5 years ago
Elham Rababah 3aec62dceb First step from login page 5 years ago
Mohammad Aljammal 00d744c0bc add driver app config 5 years ago
Mohammad Aljammal d02151bea8 fix import in main 6 years ago
Mohammad Aljammal 257cc92691 add MVVM and di Mohammad Aljammal and Elham Rababah 6 years ago
Mohammad Aljammal 198a1854a9 add documentation Mohammad Aljammal and Elham Rababah 6 years ago
Mohammad Aljammal 6d6c71655a add new widget by Elham Rababah and Mohammad Aljammal 6 years ago
Mohammad Aljammal 19676549e1 add base client, landing page, bottom_nav_bar , List Container, List Item, drawer progress indicator and asset file 6 years ago
Mohammad Aljammal 3ed5c3878f init project structure By Mohammad and Elham 6 years ago