Commit Graph

493 Commits (ff72b4b31e64d9d670161172961c75832ddf709c)

Author SHA1 Message Date
Zohaib Iqbal Kambrani ff508de9f7 Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
  Updates & fixes

# Conflicts: resolved
#	lib/pages/medical/balance/confirm_payment_page.dart
3 years ago
haroon amjad aa36154764 Updates & fixes 3 years ago
Zohaib Iqbal 364ff3344a Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5'
# Conflicts:
#   lib/pages/BookAppointment/QRCode.dart
#   lib/pages/login/register-info.dart
#   lib/pages/medical/balance/confirm_payment_page.dart
3 years ago
Zohaib Iqbal Kambrani 940a19d4d7 Merge branch 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into zik_new_design_flutter_v2.5
* 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter:
  ancillary orders update
  Updates & fixes
  fix category issue
  fixes & updates
  lakum fix
  Updates & fixes
  fix translation issue
  Compare duplication fixed
  Updates & fixes
  Updates & fixes
  fix compare issue
  pharmacy fixes
  fix categories & cantact design
  pharmacy fixes
  Updates & fixes
  fix conflict
  Updates & fixes
  Updates & fixes
  Login fixes

# Conflicts: Resolved
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/BookAppointment/SearchResults.dart
3 years ago
Zohaib Iqbal Kambrani d974a7430c Google Analytics as per e-Cense document 3 years ago
haroon amjad efced34ffa Updates 3 years ago
haroon amjad 0acc134e6e Updates & fixes 3 years ago
haroon amjad 4acdad0e99 fixes & updates 3 years ago
haroon amjad 40d649dfa4 Updates & fixes 3 years ago
haroon amjad c175139a29 pharmacy fixes 3 years ago
Sikander Saleem c8b5602d8e flutter 2.8 improvements. 3 years ago
Sikander Saleem 9ba7b3b44b Merge branch 'development_new_design_2.0' into development_v2.5
# Conflicts:
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/medical/smart_watch_health_data/syncHealthData.dart
#	lib/pages/vaccine/my_vaccines_screen.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	pubspec.yaml
3 years ago
haroon amjad 4c2410cfd5 Health plugin updated 3 years ago
haroon amjad 7bc8f69dfb JIRA bug fixes 3 years ago
haroon amjad 330f2d6c86 Fixes & updates 3 years ago
haroon amjad d5b58c07ca Smartwatch fixes 3 years ago
Sikander Saleem 628439ddf8 video call camera view issue fix, barcode plugin change, smart watches improvements. 3 years ago
Sikander Saleem e3bf988df5 map picker, firebase improvement and changes for v2.5 3 years ago
haroon amjad 75423e5501 Updates 3 years ago
haroon amjad 5f0985adaa Updates 3 years ago
haroon amjad a646677fae Pharmacy & smart watch data fixes 3 years ago
haroon amjad 7ffc467552 Lakum fixes 3 years ago
haroon amjad 68294690a1 prescription reminders added 3 years ago
devmirza121 7f8a0320a7 Medical Reminder 1.0 3 years ago
devmirza121 69b1dd6533 Medical Reminder 3 years ago
haroon amjad 4823919fcb Pharmacy fixes 3 years ago
haroon amjad b752b42a34 Updates & fixes 3 years ago
haroon amjad 894cc0e336 Updates & fixes 3 years ago
haroon amjad 72784f68b9 Fixes & updates 3 years ago
haroon amjad f029aaa1c6 Fixes & code optimizations 3 years ago
haroon amjad 0853ecdc27 Body added 3 years ago
haroon amjad 62974b7b72 Updates & fixes 3 years ago
Sikander Saleem 455f65a5e5 Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem d2223da3c2 improvements. 3 years ago
Sikander Saleem 8c27773f7f Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem 40c63ae53b dialog ui changes in wallet & improvements. 3 years ago
haroon amjad b08dfb117c Updates & fixes 3 years ago
Sikander Saleem c1ce3a0489 blood sugar dialog improvement. 3 years ago
haroon amjad 924f685342 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/Blood/blood_donation.dart
3 years ago
haroon amjad ddf764897a Pharmacy Payment method design fix, Blood Donation fix 3 years ago
Sikander Saleem d8476df6dd Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_home_health_care_page.dart
3 years ago
Sikander Saleem 4858f8883a blood donation dialog change & improvements. 3 years ago
haroon amjad be91844868 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad 30c6f1dedb Updates 3 years ago
Mirza.Shafique fe1a287070 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique 5514753288 Zoom Avatar implementation 3 years ago
haroon amjad 1fff2dad25 Smartwatch updates 3 years ago
haroon amjad d409875741 Smartwatch updates 3 years ago
haroon amjad 1f077f71f8 no message 3 years ago
haroon amjad 2032053cb7 Working on Health data 3 years ago