Commit Graph

181 Commits (2bc2fb4770d0956c9ebcfdca9063e5d4ac40d8a1)

Author SHA1 Message Date
hussam al-habibeh 7178f693e7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/driver-app into design_changes 5 years ago
Elham Rababah bde8ca60d4 fix issues on login 5 years ago
hussam al-habibeh 4b77d2d787 Merge branch 'master' of https://gitlab.com/Cloud_Solution/driver-app into design_changes 5 years ago
hussam al-habibeh 221ff85471 design update 5 years ago
Elham Rababah 40e822fcb2 fix splash_screen_page issue 5 years ago
Elham Rababah a0277d39f9 add logout function 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 c149517e37 Merge branch 'fix_issues' into 'development'
Fix 2 loader inside the dashboard_screen

See merge request Cloud_Solution/driver-app!75
5 years ago
Elham Rababah ae8af0ab43 Fix 2 loader inside the dashboard_screen 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
Elham Rababah 5880b70749 Merge branches 'design_update' and 'merge_branches_into_dev' of https://gitlab.com/Cloud_Solution/driver-app into merge_branches_into_dev
 Conflicts:
	lib/pages/delivery/delivery_confirmed_page.dart
	lib/pages/delivery/information_page.dart
5 years ago
Elham Rababah 94efdef124 Merge branch 'setting_branch' of https://gitlab.com/Cloud_Solution/driver-app into merge_branches_into_dev
 Conflicts:
	lib/pages/dashboard/dashboard_screen.dart
5 years ago
Elham Rababah c85b82d553 fix login issue 5 years ago
enadhilal 99a2233733 make driver name and ID dynamic, add translate to logout and settings label. 5 years ago
enadhilal be8dd59c6d make driver name and ID dynamic, add translate to logout and settings label. 5 years ago
hussam al-habibeh 3eedb7e667 service update and design updates 5 years ago
Elham Rababah 301f0cc8a5 Merge branch 'fix_bottomsheet' of https://gitlab.com/Cloud_Solution/driver-app into merge_fix_bottomsheet_into_dev
 Conflicts:
	lib/pages/delivery/information_page.dart
5 years ago
Elham Rababah f3bea772b5 fix bottom sheet design + make the latitude and longitude dynamic 5 years ago
enadhilal 9bc404fa2a add scroll for landscape 5 years ago
enadhilal 6ecda69726 add setting page in setting_branch 5 years ago
hussam al-habibeh c5987bcbdf delivery information design update 5 years ago
enadhilal 36f11f1474 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 00e108e36c updates 5 years ago
hussam al-habibeh 237f0b12a8 Merge branch 'master' of https://gitlab.com/Cloud_Solution/driver-app into order_list
 Conflicts:
	lib/core/service/orders_service.dart
	lib/pages/dashboard/dashboard_screen.dart
5 years ago
hussam al-habibeh 651c1e85d6 add order list info 5 years ago
hussam al-habibeh 783f7fcbf5 add order list info 5 years ago
Elham Rababah ec40f30883 fix issue in merge request 5 years ago
Elham Rababah e3610b0804 Merge branch 'fix_auth_issue' of https://gitlab.com/Cloud_Solution/driver-app into merge_auth_fixes_into_dev
 Conflicts:
	lib/pages/authentication/login_page.dart
	lib/pages/delivery/information_page.dart
5 years ago
Elham Rababah caa2306218 fix issue in merge request 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 ee067c4001 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
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 c52a58af23 Merge branch 'master' of https://gitlab.com/Cloud_Solution/driver-app into order_list
 Conflicts:
	lib/core/service/orders_service.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
hussam al-habibeh 4ab78aa0be deliverd order list 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
Elham Rababah ccea6d730f fix issue in dashboard 5 years ago
Elham Rababah 41c66fc8ff fix auth issue 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 e032c87b5f Merge branch 'order_list' into 'development'
design updates

See merge request Cloud_Solution/driver-app!53
5 years ago
Elham Rababah f02af06ac3 finish next orders service 5 years ago
Elham Rababah 384710e9b6 finish next orders service 5 years ago
hussam al-habibeh a6f86572e6 design updates 5 years ago
Elham Rababah 1adf76a688 Merge branch 'master' of https://gitlab.com/Cloud_Solution/driver-app into setting_page 5 years ago
Elham Rababah aa1332676a First step form 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
hussam al-habibeh cf550a00ba text widget removed 5 years ago
hussam al-habibeh a99528baf7 landscape design updates 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 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 836e9709d9 fix package content style .... please use it 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