Commit Graph

42 Commits (bb5e3b5d71bbae93f404a7b70a4fc43b97a4bdbf)

Author SHA1 Message Date
Elham Rababah d47e1c2a43 add splash_screen_page 5 years ago
Elham Rababah 5880b70749 Merge branches 'design_update' and 'merge_branches_into_dev' of https://gitlab.com/Cloud_Solution/driver-app into merge_branches_into_dev
 Conflicts:
	lib/pages/delivery/delivery_confirmed_page.dart
	lib/pages/delivery/information_page.dart
5 years ago
Elham Rababah 94efdef124 Merge branch 'setting_branch' of https://gitlab.com/Cloud_Solution/driver-app into merge_branches_into_dev
 Conflicts:
	lib/pages/dashboard/dashboard_screen.dart
5 years ago
enadhilal be8dd59c6d make driver name and ID dynamic, add translate to logout and settings label. 5 years ago
hussam al-habibeh 3eedb7e667 service update and design updates 5 years ago
enadhilal 6ecda69726 add setting page in setting_branch 5 years ago
enadhilal 36f11f1474 Merge branch 'master' of gitlab.com:Cloud_Solution/driver-app into delivery_confirmed
# Conflicts:
#	lib/pages/delivery/delivery_confirmed_page.dart
#	lib/pages/delivery/information_page.dart
5 years ago
hussam al-habibeh 00e108e36c updates 5 years ago
Elham Rababah ec40f30883 fix issue in merge request 5 years ago
Elham Rababah e3610b0804 Merge branch 'fix_auth_issue' of https://gitlab.com/Cloud_Solution/driver-app into merge_auth_fixes_into_dev
 Conflicts:
	lib/pages/authentication/login_page.dart
	lib/pages/delivery/information_page.dart
5 years ago
Elham Rababah ccea6d730f fix issue in dashboard 5 years ago
Elham Rababah 41c66fc8ff fix auth issue 5 years ago
hussam al-habibeh 3fc3a0fe4b design updates 5 years ago
hussam al-habibeh a6f86572e6 design updates 5 years ago
hussam al-habibeh cf550a00ba text widget removed 5 years ago
hussam al-habibeh a99528baf7 landscape design updates 5 years ago
Elham Rababah 43d4002abc make dashboard_screen scrollable 5 years ago
Elham Rababah e27093311f Merge branch 'dashboard_landscape' of https://gitlab.com/Cloud_Solution/driver-app into merge_dashboard_into_dev
 Conflicts:
	lib/config/localized_values.dart
	lib/pages/dashboard/dashboard_screen.dart
	lib/pages/delivery/information_page.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
hussam al-habibeh 27a070f778 dashboard updates 5 years ago
Elham Rababah 4f93f8b0db Finish QR code 5 years ago
Elham Rababah 7f15522f67 Improvement on the Ui 5 years ago
hussam al-habibeh b814562495 merge conflect 5 years ago
hussam al-habibeh 9006dbd25c Merge branch 'dashboard_landscape' of https://gitlab.com/Cloud_Solution/driver-app into merge_design_update
 Conflicts:
	lib/pages/dashboard/dashboard_screen.dart
	lib/pages/orders/pending_orders_page.dart
5 years ago
hussam al-habibeh 3bd4f17d57 dashboard design update 5 years ago
Elham Rababah 6b228e6048 First step from add action sheet 5 years ago
Elham Rababah 16bb773c05 Merge branch 'dashboard_landscape' of https://gitlab.com/Cloud_Solution/driver-app into merge_delivery_info_into_dev
 Conflicts:
	lib/pages/dashboard/dashboard_screen.dart
	lib/pages/orders/pending_orders_page.dart
5 years ago
hussam al-habibeh 15ae571383 dashboard design updates 5 years ago
enadhilal df0049cd35 add MediaQuery into the design and make Package Content appear dynamic. 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 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 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 fac6230205 add route from dashboard and delivery info with item data step 2 5 years ago
Elham cd115e717b Merge branch 'QR' into 'development'
Qr

See merge request Cloud_Solution/driver-app!9
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
hussam al-habibeh 5dc2756275 Dashboaed page 5 years ago