Commit Graph

72 Commits (1ae437507a52cfcbb7747ccb9e8789216726e89a)

Author SHA1 Message Date
Elham Rababah 1ae437507a Fix landscape issues 5 years ago
Elham Rababah 43d4002abc make dashboard_screen scrollable 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
Elham Rababah 4f93f8b0db Finish QR code 5 years ago
Elham Rababah 7f15522f67 Improvement on the Ui 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 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
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
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
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 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 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
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
enadhilal 208d903e0a Enad Commit to merge master with delivery_confirmed branch.
there was conflicts in (localized_values.dart) and (translations_delegate_base.dart) and accept both changes.
5 years ago
enadhilal 4d5b10e90b add translate to delivery branch. 5 years ago
Elham Rababah 7029cc2dd6 fix issues after merge 5 years ago
Elham Rababah 8a839a5424 Merge branch 'PendingOrders' of https://gitlab.com/Cloud_Solution/driver-app into merge_trans_dash_into_dev
 Conflicts:
	lib/pages/dashboard/dashboard_screen.dart
5 years ago
Elham Rababah f1813b0443 fix login issue 5 years ago
Elham Rababah 0de2156b1e Merge branch 'delivery_confirmed' of https://gitlab.com/Cloud_Solution/driver-app into merge_delivery_into_dev
 Conflicts:
	lib/pages/dashboard/dashboard_screen.dart
5 years ago
hussam al-habibeh dcedc989e1 updates 5 years ago
enadhilal de394ec807 add changes based on the comment. 5 years ago
Elham ed844cf652 Merge branch 'QR' into 'development'
use AppScaffold rather than  of scaffold

See merge request Cloud_Solution/driver-app!13
5 years ago
Elham Rababah 37eb412b23 use AppScaffold rather than of scaffold 5 years ago
enadhilal fac6230205 add route from dashboard and delivery info with item data step 2 5 years ago
enadhilal 5b35d5d09a add route from dashboard and delivery info with item data 5 years ago
Elham d5d675f461 Merge branch 'QR' into 'development'
Qr

See merge request Cloud_Solution/driver-app!10
5 years ago
Elham Rababah 699de4df42 add token 5 years ago
Elham Rababah aa2d4e9ab8 add token 5 years ago
Elham cd115e717b Merge branch 'QR' into 'development'
Qr

See merge request Cloud_Solution/driver-app!9
5 years ago