Elham Rababah
|
814b3f8893
|
fix issue
|
5 years ago |
Elham Rababah
|
9cfeb98643
|
add new custom widget for order info card
|
5 years ago |
Mohammad Aljammal
|
027ad23c8e
|
Merge branch 'DistanceInKilometers' into 'development'
Distance in kilometers
See merge request Cloud_Solution/driver-app!91
|
5 years ago |
Elham Rababah
|
e5044b7d2e
|
LINEAR_GRADIENT added to config.dart
|
5 years ago |
Elham Rababah
|
dc290caca6
|
Merge branch 'design_changes' of https://gitlab.com/Cloud_Solution/driver-app into merge_design_canges_into_dev
Conflicts:
lib/pages/dashboard/dashboard_screen.dart
lib/pages/orders/deliverd_orders_page.dart
lib/pages/orders/pending_orders_page.dart
|
5 years ago |
Elham Rababah
|
2ddf5a6bc2
|
fix issues related to DistanceInKilometers
|
5 years ago |
Elham Rababah
|
ca05be718d
|
fix issues related to DistanceInKilometers
|
5 years ago |
hussam al-habibeh
|
a077e77f71
|
design updates
|
5 years ago |
Elham Rababah
|
8191106efd
|
fix issues related to DistanceInKilometers
|
5 years ago |
hussam al-habibeh
|
7178f693e7
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/driver-app into design_changes
|
5 years ago |
Elham Rababah
|
bde8ca60d4
|
fix issues on login
|
5 years ago |
hussam al-habibeh
|
4b77d2d787
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/driver-app into design_changes
|
5 years ago |
hussam al-habibeh
|
221ff85471
|
design update
|
5 years ago |
Elham Rababah
|
40e822fcb2
|
fix splash_screen_page issue
|
5 years ago |
Elham Rababah
|
a0277d39f9
|
add logout function
|
5 years ago |
Elham Rababah
|
be76c2f21f
|
Merge branches 'development' and 'merge_fix_issues_into_dev' of https://gitlab.com/Cloud_Solution/driver-app into merge_fix_issues_into_dev
Conflicts:
lib/pages/orders/deliverd_orders_page.dart
|
5 years ago |
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 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 |
hussam al-habibeh
|
e9223d3e97
|
delivery info page updates
|
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 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 |