Commit Graph

115 Commits (1364cb081cc9261870a0c35fb1a3e2bf5a686ba3)

Author SHA1 Message Date
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
Elham Rababah c85b82d553 fix login issue 5 years ago
enadhilal 99a2233733 make driver name and ID dynamic, add translate to logout and settings label. 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
Elham Rababah 301f0cc8a5 Merge branch 'fix_bottomsheet' of https://gitlab.com/Cloud_Solution/driver-app into merge_fix_bottomsheet_into_dev
 Conflicts:
	lib/pages/delivery/information_page.dart
5 years ago
Elham Rababah f3bea772b5 fix bottom sheet design + make the latitude and longitude dynamic 5 years ago
enadhilal 9bc404fa2a add scroll for landscape 5 years ago
enadhilal 6ecda69726 add setting page in setting_branch 5 years ago
hussam al-habibeh c5987bcbdf delivery information design update 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
hussam al-habibeh 237f0b12a8 Merge branch 'master' of https://gitlab.com/Cloud_Solution/driver-app into order_list
 Conflicts:
	lib/core/service/orders_service.dart
	lib/pages/dashboard/dashboard_screen.dart
5 years ago
hussam al-habibeh 651c1e85d6 add order list info 5 years ago
hussam al-habibeh 783f7fcbf5 add order list info 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 caa2306218 fix issue in merge request 5 years ago
Elham ded5f4a572 Merge branch 'delivery_confirmed' into 'development'
Delivery confirmed

See merge request Cloud_Solution/driver-app!59
5 years ago
enadhilal ee067c4001 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
enadhilal 4096288fc6 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 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 5fa4c55ab3 Merge branch 'order_list' of https://gitlab.com/Cloud_Solution/driver-app into merge_into_dev_9/7
 Conflicts:
	lib/core/service/orders_service.dart
5 years ago
hussam al-habibeh 4ab78aa0be deliverd order list 5 years ago
enadhilal 1f6acfcb5d update the item ID and change the icon , icon label, remove description and fix the stack issue in delivery_confirmed. 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
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 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
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
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
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
Elham Rababah 4f93f8b0db Finish QR code 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