Commit Graph

275 Commits (2bc2fb4770d0956c9ebcfdca9063e5d4ac40d8a1)
 

Author SHA1 Message Date
Mohammad Aljammal 3a3fd85a75 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/driver-app!56
5 years ago
Elham Rababah 41c66fc8ff fix auth issue 5 years ago
hussam al-habibeh 3fc3a0fe4b design updates 5 years ago
Elham d6ac83b2df Merge branch 'merge_next_order_service_into_dev' into 'development'
Merge next order service into dev

See merge request Cloud_Solution/driver-app!55
5 years ago
Elham Rababah b5cd2bd791 Merge branch 'next_order_service' of https://gitlab.com/Cloud_Solution/driver-app into merge_next_order_service_into_dev
 Conflicts:
	lib/pages/delivery/information_page.dart
5 years ago
Elham e032c87b5f Merge branch 'order_list' into 'development'
design updates

See merge request Cloud_Solution/driver-app!53
5 years ago
Elham Rababah f02af06ac3 finish next orders service 5 years ago
Elham Rababah 384710e9b6 finish next orders service 5 years ago
hussam al-habibeh a6f86572e6 design updates 5 years ago
Elham 86abf3a7e4 Merge branch 'setting_page' into 'development'
improvement on UI

See merge request Cloud_Solution/driver-app!52
5 years ago
Elham Rababah 1adf76a688 Merge branch 'master' of https://gitlab.com/Cloud_Solution/driver-app into setting_page 5 years ago
Elham Rababah aa1332676a First step form next orders service 5 years ago
Mohammad Aljammal 2aab227e0c Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/driver-app!51
5 years ago
Elham 8f38acc18e Merge branch 'order_list' into 'development'
Order list

See merge request Cloud_Solution/driver-app!50
5 years ago
enadhilal c5cb40fdb4 Merge branch 'master' of gitlab.com:Cloud_Solution/driver-app into delivery_confirmed 5 years ago
enadhilal df3e4b0bfd Merge branch 'master' of gitlab.com:Cloud_Solution/driver-app into delivery_confirmed
# Conflicts:
#	lib/pages/delivery/information_page.dart
5 years ago
Elham Rababah 1ae437507a Fix landscape issues 5 years ago
hussam al-habibeh cf550a00ba text widget removed 5 years ago
hussam al-habibeh a99528baf7 landscape design updates 5 years ago
Mohammad Aljammal 4dd56593df Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/driver-app!49
5 years ago
Elham af3cd9fd0a Merge branch 'setting_page' into 'development'
Setting page

See merge request Cloud_Solution/driver-app!48
5 years ago
Elham Rababah 43d4002abc make dashboard_screen scrollable 5 years ago
enadhilal 5c9417ca6d Merge branch 'master' of gitlab.com:Cloud_Solution/driver-app into delivery_confirmed
# Conflicts:
#	lib/pages/delivery/information_page.dart
5 years ago
enadhilal c8d1c48b9b Merge branch 'delivery_confirmed' of gitlab.com:Cloud_Solution/driver-app into delivery_confirmed
# Conflicts:
#	lib/pages/delivery/information_page.dart
5 years ago
Mohammad Aljammal acacfb419d Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/driver-app!47
5 years ago
Elham f27dca066c Merge branch 'merge_dashboard_into_dev' into 'development'
Merge dashboard into dev

See merge request Cloud_Solution/driver-app!46
5 years ago
Elham Rababah e5890e8e7e fix issue from merge 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
Mohammad Aljammal 7a4612fa07 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/driver-app!41
5 years ago
Elham ec4651c612 Merge branch 'ui_fixes' into 'development'
Finish QR code

See merge request Cloud_Solution/driver-app!42
5 years ago
Elham Rababah 4f93f8b0db Finish QR code 5 years ago
Elham d4f5308886 Merge branch 'ui_fixes' into 'development'
Ui fixes

See merge request Cloud_Solution/driver-app!40
5 years ago
Elham Rababah 7f15522f67 Improvement on the Ui 5 years ago
Elham Rababah 836e9709d9 fix package content style .... please use it 5 years ago
Elham 8c36996cb0 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/driver-app!39
5 years ago
Elham e84602a208 Merge branch 'merge_delivery_into_dev' into 'development'
Merge delivery into dev

See merge request Cloud_Solution/driver-app!38
5 years ago
Elham Rababah 526e8e0f33 fix issue from merge 5 years ago
Elham Rababah ec5af29492 Merge branch 'delivery_confirmed' of https://gitlab.com/Cloud_Solution/driver-app into merge_delivery_into_dev
 Conflicts:
	lib/pages/delivery/information_page.dart
5 years ago
enadhilal 83350d5b01 Merge branch 'master' of gitlab.com:Cloud_Solution/driver-app into delivery_confirmed 5 years ago
enadhilal 6876e1da77 change class and file name 5 years ago
enadhilal 778fd5374d change class and file name 5 years ago
enadhilal 9d9f411bd0 change base on comment in gitlab 5 years ago
Elham 5229718db7 Merge branch 'bottomsheet' into 'development'
Bottomsheet

See merge request Cloud_Solution/driver-app!36
5 years ago
Elham Rababah c9461bfef8 finish update order status function 5 years ago
enadhilal ed27e27244 change base on comment in gitlab 5 years ago
Elham Rababah 04f31aae21 Merge branch 'master' of https://gitlab.com/Cloud_Solution/driver-app into bottomsheet 5 years ago
Elham Rababah 621f594ad9 bottom sheet almost done 5 years ago
enadhilal 46abb059b6 complete fixing design still the icons in delivery info page not change 5 years ago
Mohammad Aljammal 6143aeb700 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/driver-app!34
5 years ago