Commit Graph

363 Commits (a3984a7c1a6fb301f1cd1b1abea123e675019648)

Author SHA1 Message Date
Zohaib Iqbal Kambrani f442cc251c Pre Post Images Dental Doctor Profile 4 years ago
Zohaib Iqbal Kambrani 429fcb1e60 Merge branch 'development' into ZohaibIqbalKambrani
* development: (32 commits)
  changes
  package name changed
  Jira Fixes
  Jira fixes
  PAP-664
  PAP-664
  PAP-664
  langauge issue
  bug fix
  PAP-777
  PAP-729
  fix button
  fix translate issues
  CONFIG
  PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.
  bug fixes
  fix bugs
  fixing dashboard issue
  fixing dashboard issue
  jira bugs
  ...

# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
4 years ago
Zohaib Iqbal Kambrani bf303a7be0 RRT Implementation 4 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
4 years ago
haroon amjad 90db04cee1 Jira Fixes 4 years ago
Sultan Khan d88e3faa6b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan khan ba32a37a17 Merge branch 'ZohaibIqbalKambrani' into 'development'
RRT in progress

See merge request Cloud_Solution/diplomatic-quarter!339
5 years ago
Zohaib Iqbal Kambrani 4da163d186 RRT in progress in stage 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
Haroon Amjad 47e521fe1d Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/pages/feedback/send_feedback_page.dart
#	lib/pages/landing/home_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
5 years ago
Sultan Khan 6442ce178d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Zohaib Iqbal Kambrani 4abdd9bde7 no message 5 years ago
Sultan Khan c88bea4461 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 9acb5b087d bug fixes 5 years ago
Sultan khan 9196367da4 Merge branch 'bug_fix_mirza' into 'development'
Medical Profile Buttons Lock

See merge request Cloud_Solution/diplomatic-quarter!329
5 years ago
Sultan khan f54b9a63aa Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!328
5 years ago
Mirza.Shafique 2fda47baf6 Medical Profile Buttons Lock 5 years ago
Haroon Amjad 213d104d57 Covid test procedure selection implemented 5 years ago
Sultan Khan 14ef096c32 changes and fixes 5 years ago
Mirza.Shafique b31813770e Check-In NFC done 5 years ago
Mirza.Shafique fb0a67e5bd PAP 828 and 792 issue fix 5 years ago
haroon amjad 7b6270c67f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
Sultan Khan b4a7235fc8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sikander Saleem 1f01f40ad8 PAP-681 fixed, H2O Unit changing & reflection. 5 years ago
Sultan Khan da2df9b348 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan bcabd81f88 BUG FIXES 5 years ago
Mohammad Aljammal 25d5105caf Merge branch 'Apr-fixes' into 'development'
PAP-607: fix issue

See merge request Cloud_Solution/diplomatic-quarter!312
5 years ago
Elham Rababah 2a47564c37 PAP-607: fix issue 5 years ago
Fatimah Alshammari 174e0d9673 Merge branch 'development' into pharmacy-Fatima 5 years ago
Fatimah Alshammari 2481e4c9ea fixed categories issues and home page button 5 years ago
Sultan Khan 8c9c309abb bug fixes 5 years ago
haroon amjad 353a5157f2 fixes 5 years ago
Sultan Khan 3d6858d0ec bug fixes 5 years ago
haroon amjad f754e48034 Merge branch 'development' into Haroon
# Conflicts:
#	lib/widgets/in_app_browser/InAppBrowser.dart
5 years ago
haroon amjad 49c454b132 fixes 5 years ago
mosazaid b623bd0dce Merge branch 'development' into fix_bugs 5 years ago
mosazaid e5474b3062 fix perscription pages bugs 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
haroon amjad 9c1fdf96f4 Merge branch 'development' into Haroon 5 years ago
haroon amjad 33e1bf8103 Jira fixes 5 years ago
haroon amjad accc39d972 jira 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
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 e0ebb922ed pharmacy fixes 5 years ago
Zohaib Iqbal Kambrani f410ce20ca Packages and Offers in Progress 5 years ago