Elham Rababah
|
007005a40d
|
Merge branch 'setting_branch' of https://gitlab.com/Cloud_Solution/driver-app into merge_setting_br_into_dev
Conflicts:
lib/pages/delivery/information_page.dart
lib/pages/orders/pending_orders_page.dart
lib/widgets/delivery/customer_brief_card.dart
|
5 years ago |
enadhilal
|
c62b551c2b
|
in information page make destination show dynamic.
After click on see all in dashboard page make the item redirect to information page.
|
5 years ago |
hussam al-habibeh
|
e81c91debf
|
delivery info design update
|
5 years ago |
hussam al-habibeh
|
979f04de81
|
update apr scaffold
|
5 years ago |
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 Rababah
|
814b3f8893
|
fix issue
|
5 years ago |
hussam al-habibeh
|
b9ec74eeda
|
delivery information page design updates
|
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
|
221ff85471
|
design update
|
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
|
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 |
hussam al-habibeh
|
3eedb7e667
|
service update and design updates
|
5 years ago |
hussam al-habibeh
|
c5987bcbdf
|
delivery information design update
|
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
|
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
|
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 |
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 |
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 Rababah
|
f02af06ac3
|
finish 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 |
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
|
7f15522f67
|
Improvement on the Ui
|
5 years ago |
Elham Rababah
|
ec5af29492
|
Merge branch 'delivery_confirmed' of https://gitlab.com/Cloud_Solution/driver-app into merge_delivery_into_dev
Conflicts:
lib/pages/delivery/information_page.dart
|
5 years ago |
enadhilal
|
6876e1da77
|
change class and file name
|
5 years ago |
enadhilal
|
778fd5374d
|
change class and file name
|
5 years ago |
Elham Rababah
|
c9461bfef8
|
finish update order status function
|
5 years ago |
enadhilal
|
ed27e27244
|
change base on comment in gitlab
|
5 years ago |
Elham Rababah
|
621f594ad9
|
bottom sheet almost done
|
5 years ago |
enadhilal
|
46abb059b6
|
complete fixing design still the icons in delivery info page not change
|
5 years ago |
Elham Rababah
|
6b228e6048
|
First step from add action sheet
|
5 years ago |