Commit Graph

1043 Commits (faa8a137780a19d0f9ae5da090b40cec4c6d5e39)

Author SHA1 Message Date
Fatimah Alshammari faa8a13778 fixed isuue-product details 5 years ago
Fatimah Alshammari 265d13b970 fixed an issue in recommended page 5 years ago
Fatimah Alshammari bb622f248c Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/pages/pharmacy_categorise.dart
5 years ago
Fatimah Alshammari 235fdfba54 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 5 years ago
Fatimah Alshammari 71a393df68 fixed categories issue 5 years ago
Mohammad Aljammal 008a39f043 Merge branch 'fix_bugs_Mar' into 'development'
Fix bugs mar

See merge request Cloud_Solution/diplomatic-quarter!297
5 years ago
Sultan Khan 8e255f1f22 bug fix 5 years ago
Elham Rababah efb6ea68b8 PAP-561: fix design 5 years ago
Sultan Khan d4c3b03a5f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 1b770420be bug fixes 5 years ago
Elham Rababah 2e035e2c6b PAP-576: fix design 5 years ago
Elham Rababah fa23c607bd Merge branches 'development' and 'fix_bugs_Mar' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_bugs_Mar 5 years ago
mosazaid b623bd0dce Merge branch 'development' into fix_bugs 5 years ago
mosazaid e5474b3062 fix perscription pages bugs 5 years ago
Fatimah Alshammari 39daaa16a7 added buttens in categories page 5 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
5 years ago
Mohammad Aljammal 53e4dfa99d Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!292
5 years ago
Mohammad Aljammal 7c1fd8043b fix chart and eye and balance 5 years ago
Elham Rababah 7bdf31000f PAP-356: fix chart design 5 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
5 years ago
hussam al-habibeh a6ec7326b2 jira bugs 5 years ago
hussam al-habibeh f9b8191a5e jira bugs 5 years ago
Zohaib Iqbal Kambrani 6f2c947687 Packages And offers.. 5 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
5 years ago
Mohammad Aljammal ced7761a32 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_theme_issues 5 years ago
Mohammad Aljammal b36e00d2a5 fix the line chart issues 5 years ago
Sultan Khan 60b1688bb4 chatbot 5 years ago
Sultan Khan 9bfd725e4f bug fixes 5 years ago
Sultan Khan ca2a48e860 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 0445011e53 bug fixes 5 years ago
Mohammad Aljammal ad88f6de04 fix theme issues 5 years ago
Sultan Khan 35c940a209 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 80d96ba785 Privilege issue fixed 5 years ago
haroon amjad 454957ebba Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
5 years ago
Sultan Khan 616212828d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 66acce3b40 ancillary order pages added 5 years ago
haroon amjad db0fcd51cc pharmacy updates 5 years ago
haroon amjad 74671d2f25 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/parmacyModule/order-preview-service.dart
#	lib/pages/pharmacies/screens/cart-order-preview.dart
5 years ago
haroon amjad e0ebb922ed pharmacy fixes 5 years ago
Zohaib Iqbal Kambrani f410ce20ca Packages and Offers in Progress 5 years ago
mosazaid ed1626f8ee Merge branch 'development' into fix_order_checkout_payment 5 years ago
mosazaid 74dd274502 working on pharmacy some fixes on cart page and request body 5 years ago
haroon amjad ed3dba3eb3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad b9a12341d5 updates & fixes 5 years ago
Mohammad Aljammal 4dcb70d7eb Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs

See merge request Cloud_Solution/diplomatic-quarter!282
5 years ago
hussam al-habibeh a534b1415e products filtering fix 5 years ago
Mohammad Aljammal 861dba9a94 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ed_online
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal ec401d4848 Done Ed online 5 years ago
Mohammad Aljammal cacb6722b9 Merge branch 'pharmacy-bugs' into 'development'
daynimic listing

See merge request Cloud_Solution/diplomatic-quarter!279
5 years ago
hussam al-habibeh b39e88d9c8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs 5 years ago