Commit Graph

1440 Commits (a67e320a8e9b988b1d2cf4bd3a6370e0a54ee88a)
 

Author SHA1 Message Date
Sultan Khan 3a8b889b74 bug fixes 4 years ago
Sultan Khan 724e0098fb bug fixes 4 years ago
Sultan Khan 1cd4d93488 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan cd7845b1a4 bug fix 4 years ago
Fatimah Alshammari 265d13b970 fixed an issue in recommended page 4 years ago
Mohammad Aljammal 2a484ec857 Merge branch 'ZohaibIqbalKambrani' into 'development'
Huawei Location Implementation -> LocationUtils.getCurrentLocation((coordinates){})

See merge request Cloud_Solution/diplomatic-quarter!302
4 years ago
Zohaib Iqbal Kambrani c7c96f913f no message 4 years ago
Mohammad Aljammal e04421079e Merge branch 'fix_bugs_Mar' into 'development'
Fix bugs mar

See merge request Cloud_Solution/diplomatic-quarter!301
4 years ago
Sultan Khan 0245875358 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 3d6858d0ec bug fixes 4 years ago
Elham Rababah 96117fd191 PAP-625: add option “not classified”. 4 years ago
Elham Rababah 6e7f62ca21 PAP-612: show ok and cancel options 4 years ago
Mohammad Aljammal 6fa79ef8d0 Merge branch 'pharmacy-bugs' into 'development'
jira bug PAP-530

See merge request Cloud_Solution/diplomatic-quarter!300
4 years ago
Elham Rababah 66a9239698 PAP-558: Remove the choose Drop-off 4 years ago
Elham Rababah 1b393d6601 PAP-559: remove the km 4 years ago
Elham Rababah 5dd2e9986e PAP-559: fix hospital_service 4 years ago
hussam al-habibeh 1ce10f4d78 jira bug PAP-530 4 years ago
Mohammad Aljammal 0a4f17dc88 Merge branch 'pharmacy-Fatima' into 'development'
Pharmacy fatima

See merge request Cloud_Solution/diplomatic-quarter!298
4 years ago
Mohammad Aljammal dcc98a35ac Merge branch 'fix_advance_payment' into 'development'
fix advance payment

See merge request Cloud_Solution/diplomatic-quarter!299
4 years ago
Mohammad Aljammal 9a850d0ca3 fix advance payment 4 years ago
Fatimah Alshammari bb622f248c Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/pages/pharmacy_categorise.dart
4 years ago
Fatimah Alshammari 235fdfba54 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 4 years ago
Fatimah Alshammari 71a393df68 fixed categories issue 4 years ago
Mohammad Aljammal 008a39f043 Merge branch 'fix_bugs_Mar' into 'development'
Fix bugs mar

See merge request Cloud_Solution/diplomatic-quarter!297
4 years ago
Mohammad Aljammal 565dbf7c33 Merge branch 'sultan-patientapp' into 'development'
bug fix

See merge request Cloud_Solution/diplomatic-quarter!296
4 years ago
Sultan Khan 8e255f1f22 bug fix 4 years ago
Elham Rababah 86dda2b6d6 PAP-560: fix design 4 years ago
Elham Rababah a1ecfbf16a PAP-560: fix design 4 years ago
Elham Rababah efb6ea68b8 PAP-561: fix design 4 years ago
Mohammad Aljammal f2c5c93e2a Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!295
4 years ago
Sultan Khan d4c3b03a5f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 1b770420be bug fixes 4 years ago
Elham Rababah 2e035e2c6b PAP-576: fix design 4 years ago
Elham Rababah fa23c607bd Merge branches 'development' and 'fix_bugs_Mar' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_bugs_Mar 4 years ago
Mohammad Aljammal e5bcc5403a Merge branch 'fix_bugs' into 'development'
Fix bugs

See merge request Cloud_Solution/diplomatic-quarter!294
4 years ago
mosazaid b623bd0dce Merge branch 'development' into fix_bugs 4 years ago
mosazaid e5474b3062 fix perscription pages bugs 4 years ago
Fatimah Alshammari 39daaa16a7 added buttens in categories page 4 years ago
Mohammad Aljammal 256ffd05ea Merge branch 'fix_eye_balance' into 'development'
Fix eye balance

See merge request Cloud_Solution/diplomatic-quarter!293
4 years ago
Mohammad Aljammal 126fad61c0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_eye_balance
 Conflicts:
	lib/core/service/client/base_app_client.dart
4 years ago
Mohammad Aljammal 53e4dfa99d Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!292
4 years ago
Mohammad Aljammal 3468f847d3 Merge branch 'pharmacy-bugs' into 'development'
jira bugs

See merge request Cloud_Solution/diplomatic-quarter!291
4 years ago
Mohammad Aljammal 7c1fd8043b fix chart and eye and balance 4 years ago
Elham Rababah 7bdf31000f PAP-356: fix chart design 4 years ago
Zohaib Iqbal Kambrani b91ce441e2 Merge branch 'development' into ZohaibIqbalKambrani
# Conflicts: Resolved
#	lib/core/model/pharmacies/order_model.dart
#	lib/core/service/client/base_app_client.dart
#	lib/main.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
#	lib/pages/pharmacy/order/TrackDriver.dart
#	lib/routes.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	pubspec.yaml
4 years ago
hussam al-habibeh a6ec7326b2 jira bugs 4 years ago
hussam al-habibeh f9b8191a5e jira bugs 4 years ago
Zohaib Iqbal Kambrani 6f2c947687 Packages And offers.. 4 years ago
Mohammad Aljammal a613fe08e4 Merge branch 'fix_theme_issues' into 'development'
fix the line chart issues

See merge request Cloud_Solution/diplomatic-quarter!289
4 years ago
Mohammad Aljammal ced7761a32 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_theme_issues 4 years ago