Commit Graph

100 Commits (acacfb419dd786cee4c8becaf90a17cf3757b95c)
 

Author SHA1 Message Date
Mohammad Aljammal acacfb419d Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/driver-app!47
5 years ago
Elham f27dca066c Merge branch 'merge_dashboard_into_dev' into 'development'
Merge dashboard into dev

See merge request Cloud_Solution/driver-app!46
5 years ago
Elham Rababah e5890e8e7e fix issue from merge 5 years ago
Elham Rababah e27093311f Merge branch 'dashboard_landscape' of https://gitlab.com/Cloud_Solution/driver-app into merge_dashboard_into_dev
 Conflicts:
	lib/config/localized_values.dart
	lib/pages/dashboard/dashboard_screen.dart
	lib/pages/delivery/information_page.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
hussam al-habibeh 27a070f778 dashboard updates 5 years ago
Mohammad Aljammal 7a4612fa07 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/driver-app!41
5 years ago
Elham ec4651c612 Merge branch 'ui_fixes' into 'development'
Finish QR code

See merge request Cloud_Solution/driver-app!42
5 years ago
Elham Rababah 4f93f8b0db Finish QR code 5 years ago
Elham d4f5308886 Merge branch 'ui_fixes' into 'development'
Ui fixes

See merge request Cloud_Solution/driver-app!40
5 years ago
Elham Rababah 7f15522f67 Improvement on the Ui 5 years ago
Elham 8c36996cb0 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/driver-app!39
5 years ago
Elham e84602a208 Merge branch 'merge_delivery_into_dev' into 'development'
Merge delivery into dev

See merge request Cloud_Solution/driver-app!38
5 years ago
Elham Rababah 526e8e0f33 fix issue from merge 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 83350d5b01 Merge branch 'master' of gitlab.com:Cloud_Solution/driver-app into delivery_confirmed 5 years ago
enadhilal 6876e1da77 change class and file name 5 years ago
enadhilal 778fd5374d change class and file name 5 years ago
enadhilal 9d9f411bd0 change base on comment in gitlab 5 years ago
Elham 5229718db7 Merge branch 'bottomsheet' into 'development'
Bottomsheet

See merge request Cloud_Solution/driver-app!36
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 04f31aae21 Merge branch 'master' of https://gitlab.com/Cloud_Solution/driver-app into bottomsheet 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
Mohammad Aljammal 6143aeb700 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/driver-app!34
5 years ago
Elham 23bbd55848 Merge branch 'merge_design_update' into 'development'
Merge design update

See merge request Cloud_Solution/driver-app!33
5 years ago
hussam al-habibeh b814562495 merge conflect 5 years ago
hussam al-habibeh 9006dbd25c Merge branch 'dashboard_landscape' of https://gitlab.com/Cloud_Solution/driver-app into merge_design_update
 Conflicts:
	lib/pages/dashboard/dashboard_screen.dart
	lib/pages/orders/pending_orders_page.dart
5 years ago
hussam al-habibeh 3bd4f17d57 dashboard design update 5 years ago
Mohammad Aljammal a2fb7e82a0 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/driver-app!31
5 years ago
Elham 29407e66a5 Merge branch 'bottomsheet' into 'development'
Bottomsheet

See merge request Cloud_Solution/driver-app!30
5 years ago
Elham Rababah 6b228e6048 First step from add action sheet 5 years ago
enadhilal c9d74b75a9 Merge branch 'master' of gitlab.com:Cloud_Solution/driver-app into delivery_confirmed
# Conflicts:
#	lib/widgets/delivery/customer_brief_card.dart
5 years ago
enadhilal 9892976526 improve design implementation in delivery_confirmed branch. 5 years ago
Mohammad Aljammal a4b593f9c4 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/driver-app!29
5 years ago
Elham ac1cd81912 Merge branch 'merge_delivery_info_into_dev' into 'development'
Merge delivery info into dev

See merge request Cloud_Solution/driver-app!28
5 years ago
Elham Rababah 16bb773c05 Merge branch 'dashboard_landscape' of https://gitlab.com/Cloud_Solution/driver-app into merge_delivery_info_into_dev
 Conflicts:
	lib/pages/dashboard/dashboard_screen.dart
	lib/pages/orders/pending_orders_page.dart
5 years ago
Elham d4738f560a Merge branch 'merge_delivery_info_into_dev' into 'development'
Merge delivery info into dev

See merge request Cloud_Solution/driver-app!27
5 years ago
Elham Rababah dc2e1ab785 Merge branch 'delivery_confirmed' of https://gitlab.com/Cloud_Solution/driver-app into merge_delivery_info_into_dev
 Conflicts:
	lib/pages/delivery/information_page.dart
5 years ago
hussam al-habibeh 15ae571383 dashboard design updates 5 years ago
enadhilal df0049cd35 add MediaQuery into the design and make Package Content appear dynamic. 5 years ago
hussam alhababieh 6f74d32523 Merge branch 'dashboard_landscape' into 'development'
Dashboard landscape

See merge request Cloud_Solution/driver-app!24
5 years ago
hussam al-habibeh a87efbe7dd orders service changes 5 years ago
hussam al-habibeh 99ad3f1a4a call and location button functionality 5 years ago
enadhilal a61ecb8cec add routing to see all 5 years ago
Mohammad Aljammal 259cc3810a Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/driver-app!23
5 years ago
Elham 151abcf955 Merge branch 'merge_landscape_into_dev' into 'development'
Merge landscape into dev

See merge request Cloud_Solution/driver-app!22
5 years ago
Elham Rababah d4b1476d74 Merge branch 'dashboard_landscape' of https://gitlab.com/Cloud_Solution/driver-app into merge_landscape_into_dev
 Conflicts:
	lib/core/service/orders_service.dart
	lib/core/viewModels/orders_view_model.dart
	lib/pages/dashboard/dashboard_screen.dart
	lib/pages/orders/pending_orders_page.dart
5 years ago
hussam al-habibeh e3dbfe8dcb code reformat 5 years ago
hussam al-habibeh 5d53500e66 add pending orders response model 5 years ago