Commit Graph

275 Commits (2bc2fb4770d0956c9ebcfdca9063e5d4ac40d8a1)
 

Author SHA1 Message Date
Elham Rababah c971e76128 Merge branch 'fix_issues' of https://gitlab.com/Cloud_Solution/driver-app into merge_fix_issues_into_dev
 Conflicts:
	lib/pages/delivery/information_page.dart
5 years ago
Elham bfc1f327f0 Merge branch 'design_changes' into 'development'
design updates

See merge request Cloud_Solution/driver-app!76
5 years ago
Elham Rababah d4c098010c Fix design issues 5 years ago
hussam alhababieh f961e750f3 Merge branch 'development' into 'design_changes'
# Conflicts:
#   lib/pages/orders/deliverd_orders_page.dart
5 years ago
hussam al-habibeh af815a4585 design updates 5 years ago
Elham c149517e37 Merge branch 'fix_issues' into 'development'
Fix 2 loader inside the dashboard_screen

See merge request Cloud_Solution/driver-app!75
5 years ago
Elham Rababah ae8af0ab43 Fix 2 loader inside the dashboard_screen 5 years ago
Elham bb5e3b5d71 Merge branch 'fix_issues' into 'development'
add splash_screen_page

See merge request Cloud_Solution/driver-app!74
5 years ago
Elham Rababah d47e1c2a43 add splash_screen_page 5 years ago
Elham bc08e1c821 Merge branch 'design_changes' into 'development'
Design changes

See merge request Cloud_Solution/driver-app!73
5 years ago
hussam al-habibeh e9223d3e97 delivery info page updates 5 years ago
enadhilal e9f9879526 make driver name and ID dynamic, add translate to logout and settings label. 5 years ago
Mohammad Aljammal 1364cb081c Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/driver-app!72
5 years ago
Elham 199b58a45a Merge branch 'merge_branches_into_dev' into 'development'
Merge branches into dev

See merge request Cloud_Solution/driver-app!71
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
Elham 452a3d78fc Merge branch 'merge_setting_branch_into_dev' into 'development'
fix login issue

See merge request Cloud_Solution/driver-app!70
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 3be1346bdb Merge branch 'merge_fix_bottomsheet_into_dev' into 'development'
Merge fix bottomsheet into dev

See merge request Cloud_Solution/driver-app!68
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 4b73ad4d43 Merge branch 'design_update' into 'development'
delivery information design update

See merge request Cloud_Solution/driver-app!65
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 4e9fdfd103 Merge branch 'master' of https://gitlab.com/Cloud_Solution/driver-app into design_update 5 years ago
hussam al-habibeh c5987bcbdf delivery information design update 5 years ago
Mohammad Aljammal 8382ea895b Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/driver-app!64
5 years ago
Elham 0317ee6620 Merge branch 'order_list' into 'development'
Order list

See merge request Cloud_Solution/driver-app!63
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
Mohammad Aljammal b8b243735d Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/driver-app!62
5 years ago
Elham aa33f0cfe7 Merge branch 'merge_auth_fixes_into_dev' into 'development'
Merge auth fixes into dev

See merge request Cloud_Solution/driver-app!61
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
Elham f646f5879f Merge branch 'merge_into_dev_9/7' into 'development'
Merge into dev 9/7

See merge request Cloud_Solution/driver-app!58
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