Elham Rababah
|
543391e73a
|
make app bar gradient
|
5 years ago |
hussam al-habibeh
|
24a9f561ad
|
Merge branch 'design_changes' of https://gitlab.com/Cloud_Solution/driver-app into merge_into_dev_9/13_final
Conflicts:
lib/widgets/delivery/customer_brief_card.dart
|
5 years ago |
hussam al-habibeh
|
e57c8c1d51
|
updates
|
5 years ago |
Elham
|
3156ebdd8a
|
Merge branch 'order_info_card' into 'development'
fix issue
See merge request Cloud_Solution/driver-app!95
|
5 years ago |
Elham Rababah
|
814b3f8893
|
fix issue
|
5 years ago |
hussam al-habibeh
|
b9ec74eeda
|
delivery information page design updates
|
5 years ago |
Mohammad Aljammal
|
f71eb62f60
|
Merge branch 'development' into 'master'
Development
See merge request Cloud_Solution/driver-app!93
|
5 years ago |
Elham
|
203ec948dc
|
Merge branch 'order_info_card' into 'development'
Order info card
See merge request Cloud_Solution/driver-app!92
|
5 years ago |
Elham Rababah
|
9cfeb98643
|
add new custom widget for order info card
|
5 years ago |
Mohammad Aljammal
|
d86dd3c100
|
Merge branch 'development' into 'master'
Development
See merge request Cloud_Solution/driver-app!90
|
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
|
51a1e311f1
|
Merge branch 'merge_design_canges_into_dev' into 'development'
Merge design canges into dev
See merge request Cloud_Solution/driver-app!89
|
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 |
Mohammad Aljammal
|
682a5e8d61
|
Merge branch 'development' into 'master'
Development
See merge request Cloud_Solution/driver-app!88
|
5 years ago |
Elham Rababah
|
2ddf5a6bc2
|
fix issues related to DistanceInKilometers
|
5 years ago |
Elham
|
8113d2db19
|
Merge branch 'DistanceInKilometers' into 'development'
fix issues related to DistanceInKilometers
See merge request Cloud_Solution/driver-app!87
|
5 years ago |
Elham Rababah
|
ca05be718d
|
fix issues related to DistanceInKilometers
|
5 years ago |
Mohammad Aljammal
|
0c3d71b619
|
Merge branch 'development' into 'master'
Development
See merge request Cloud_Solution/driver-app!86
|
5 years ago |
hussam al-habibeh
|
a077e77f71
|
design updates
|
5 years ago |
Elham
|
235103d21d
|
Merge branch 'DistanceInKilometers' into 'development'
Distance in kilometers
See merge request Cloud_Solution/driver-app!85
|
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
|
c60a2a56bd
|
Merge branch 'development' into 'master'
Development
See merge request Cloud_Solution/driver-app!84
|
5 years ago |
Elham
|
45fdc43e98
|
Merge branch 'logut' into 'development'
fix issues on login
See merge request Cloud_Solution/driver-app!83
|
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
|
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 |
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 |
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 |