Elham Rababah
|
bde8ca60d4
|
fix issues on login
|
5 years ago |
enadhilal
|
a928e9f995
|
Merge branch 'master' of gitlab.com:Cloud_Solution/driver-app into setting_branch
# Conflicts:
# lib/pages/delivery/information_page.dart
|
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
|
80b9eea5ea
|
Merge branch 'development' into 'master'
Development
See merge request Cloud_Solution/driver-app!81
|
5 years ago |
|
Elham
|
0cc3f49070
|
Merge branch 'logut' into 'development'
Logut
See merge request Cloud_Solution/driver-app!80
|
5 years ago |
|
Elham Rababah
|
40e822fcb2
|
fix splash_screen_page issue
|
5 years ago |
|
Elham Rababah
|
a0277d39f9
|
add logout function
|
5 years ago |
|
enadhilal
|
3671ade536
|
add logout function 2
|
5 years ago |
Mohammad Aljammal
|
56b9fbabf9
|
Merge branch 'development' into 'master'
Development
See merge request Cloud_Solution/driver-app!79
|
5 years ago |
|
Elham
|
e2093acb67
|
Merge branch 'merge_fix_issues_into_dev' into 'development'
Merge fix issues into dev
See merge request Cloud_Solution/driver-app!78
|
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
|
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 |