Haroon6138
/
driver-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
287 Commits
22 Branches
0 Tags
1.9 MiB
development
ZohaibIqbalKambrani
master
fix_some_issue
ES-179
nav_issue
barcode_scanner
updates_new
location
master_hussam
design_changes
setting_branch
merge_into_dev_9/13_final
order_info_card
merge_into_dev_9/13
DistanceInKilometers
merge_design_canges_into_dev
logut
fix_issues
logout_function
design_update
setting_page
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'development'
${ noResults }
Commit Graph

287 Commits (development)
 

Author SHA1 Message Date
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
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