Commit Graph

275 Commits (2bc2fb4770d0956c9ebcfdca9063e5d4ac40d8a1)
 

Author SHA1 Message Date
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
enad hilal 287acae3f1 Merge branch 'delivery_confirmed' into 'development'
Delivery confirmed

See merge request Cloud_Solution/driver-app!18
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
Mohammad Aljammal 4b953be9e7 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/driver-app!17
5 years ago
Elham ecd8c0f2fe Merge branch 'merge_trans_dash_into_dev' into 'development'
Merge trans dash into dev

See merge request Cloud_Solution/driver-app!16
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 8cd2461de1 Merge branch 'merge_delivery_into_dev' into 'development'
Merge delivery into dev

See merge request Cloud_Solution/driver-app!15
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
Mohammad Aljammal af23d6c257 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/driver-app!11
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
Elham 81e4b9e76a Merge branch 'PendingOrders' into 'development'
Pending orders

See merge request Cloud_Solution/driver-app!8
5 years ago
Elham Rababah 2dfe4ca1dd fix bug 5 years ago
hussam al-habibeh 4f0bf61fef Pending Orders list 5 years ago
Elham Rababah bf79a6427e refactor orders Concept 5 years ago