Commit Graph

310 Commits (a33a6b0b2ff4cf0dd8dde76bbb94edbf65180eb8)

Author SHA1 Message Date
Sultan Khan 6b7eaaafb9 fixes 5 years ago
haroon amjad 709877b5f1 Merge branch 'development' into Haroon
# Conflicts:
#	lib/pages/login/forgot-password.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
5 years ago
haroon amjad 90db04cee1 Jira Fixes 5 years ago
Sultan Khan 7c398ba40d bug fix 5 years ago
Sultan Khan ed20ba65b3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 23ca95b9b6 bug fixes 5 years ago
Mohammad Aljammal ed5079e3a0 Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs

See merge request Cloud_Solution/diplomatic-quarter!334
5 years ago
hussam al-habibeh 50d3a42743 fixing dashboard issue 5 years ago
hussam al-habibeh 1ed76e91aa fixing dashboard issue 5 years ago
Sultan khan a67e320a8e Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!333
5 years ago
hussam al-habibeh 6dc0d89f61 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
 Conflicts:
	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
	lib/uitl/utils.dart
5 years ago
hussam al-habibeh 981e78936e jira bugs 5 years ago
Zohaib Iqbal Kambrani 08e0ce52c8 Merge branch 'development' into ZohaibIqbalKambrani
* development:
  fix bugs
5 years ago
Zohaib Iqbal Kambrani 4abdd9bde7 no message 5 years ago
Zohaib Iqbal Kambrani 882d5f090a Merge branch 'zik-analytics' into ZohaibIqbalKambrani
* zik-analytics:
  no message
5 years ago
mosazaid 2e33c2b240 fix bugs 5 years ago
Zohaib Iqbal Kambrani dbf525c484 no message 5 years ago
Sultan Khan 14ef096c32 changes and fixes 5 years ago
Sultan khan 15f620d720 Merge branch 'Jul_fixes' into 'development'
Jul fixes

See merge request Cloud_Solution/diplomatic-quarter!322
5 years ago
Mirza.Shafique 58d5734f1a Bug Fix: 873, 878 to 881 5 years ago
Elham Rababh c6a68083a4 PAP-667: fix blood type 5 years ago
Elham Rababh c14adccb49 PAP-667: add unit to home page 5 years ago
Sultan Khan cd7845b1a4 bug fix 5 years ago
Sultan Khan 3d6858d0ec bug fixes 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
Zohaib Iqbal Kambrani 6f2c947687 Packages And offers.. 5 years ago
haroon amjad e0ebb922ed pharmacy fixes 5 years ago
haroon amjad b9a12341d5 updates & fixes 5 years ago
Fatimah Alshammari 747763c4be Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/config/localized_values.dart
#	lib/locator.dart
#	lib/uitl/translations_delegate_base.dart
#	pubspec.yaml
5 years ago
Fatimah Alshammari a46dddea9a Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/core/model/pharmacies/order_model.dart
#	lib/pages/pharmacies/product-brands.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacy/order/Order.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
#	lib/pages/pharmacy/profile/profile.dart
5 years ago
Sultan Khan 1a35fe37b6 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan e61c26b853 Auto SMS, Themes, Voice Command 5 years ago
haroon amjad da3ad90ddd added app-wide route transition animation 5 years ago
haroon amjad d8e11f7187 Merge branch 'development' into Haroon 5 years ago
haroon amjad deb0b40cfe fixes 5 years ago
enadhilal 0cb493d56c Merge branch 'development' into enad_pharmacy2
# Conflicts:
#	lib/pages/pharmacies/product_detail.dart
5 years ago
enadhilal 0c6fb67718 fixed issues 5 years ago
mosazaid 125dd27a00 Merge branch 'development' into fix-pharmacy 5 years ago
mosazaid 5d0a122689 fix bugs 5 years ago
Sultan Khan 144ef52c70 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan b3e6c4efda voice command changes 5 years ago
haroon amjad f72c860516 Merge branch 'development' into Haroon 5 years ago
haroon amjad 69649ff7f8 added verified icon in homepage when patient is logged in 5 years ago
Elham Rababah 8a1924cca2 fix images in hhc 5 years ago
Sultan Khan d33918c932 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 9fca52efca voice command 5 years ago
Mohammad Aljammal d477481856 fix security issues in pharmacy 5 years ago
Sikander Saleem 8f37fbf260 Qr icon added, notify me api added & improvements 5 years ago
Sultan Khan 3ac69692be Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 0213264b7f bug fixes 5 years ago