Commit Graph

227 Commits (33329f5c8a98f5e360ea7569a907fde7278e65a9)

Author SHA1 Message Date
haroon amjad aae48f2555 Android permission dialog updates 3 years ago
haroon amjad a918d409fb updates & fixes 3 years ago
haroon amjad 927db41068 Covid updates & other fixes 3 years ago
haroon amjad efced34ffa Updates 3 years ago
haroon amjad 2a22edfdd0 no message 3 years ago
haroon amjad 3107d1e86d Updates & fixes 3 years ago
Zohaib Iqbal Kambrani 1a6a26be75 Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5: (36 commits)
  merge improvements
  Health plugin updated
  fix search issue
  JIRA bug fixes
  updates & fixes
  Fixes & updates
  six issues
  nfc plugin improvement.
  disable lakum on check out page
  fix issue
  fix lakum issues
  Smartwatch fixes
  screen plugin improvement.
  Updates & fixes
  video call camera view issue fix, barcode plugin change, smart watches improvements.
  add quantity filed fixed
  pharmacy uo fix
  Fixes
  fix issue
  Speech to text fix in iOS
  ...

# Conflicts: Resolved
#	android/app/build.gradle
#	android/app/src/main/AndroidManifest.xml
#	android/build.gradle
#	android/gradle/wrapper/gradle-wrapper.properties
#	lib/pages/conference/web_rtc/widgets/cam_view_widget.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/livecare/incoming_call.dart
3 years ago
Zohaib Iqbal Kambrani 63ffabcc86 no message 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
Sikander Saleem 2a92478d01 nfc plugin improvement. 3 years ago
Sikander Saleem 2fd0fd3f85 screen plugin improvement. 3 years ago
Sikander Saleem 628439ddf8 video call camera view issue fix, barcode plugin change, smart watches improvements. 3 years ago
Fatimah Alshammari 7ffb431454 added map luncher 3 years ago
Sikander Saleem e3bf988df5 map picker, firebase improvement and changes for v2.5 3 years ago
haroon amjad cf27c3e796 Incoming call & LiveCare pending UI revamped 3 years ago
haroon amjad 8b1733e917 no message 3 years ago
devmirza121 7d2a6c794b Clinic Search Dialog 3 years ago
Sikander Saleem 00f63cd288 Merge branch 'development_new_design_2.0' into new_design_sikander
# Conflicts:
#	lib/pages/DrawerPages/notifications/notification_details_page.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Sikander Saleem 9a82b9c369 laser clinic added. 3 years ago
Elham Rababh fb1d07fcba fix cart back button 3 years ago
hussam al-habibeh a35e149088 product pagination 3 years ago
devmirza121 6225f2468d Health Calculator 3.0 3 years ago
haroon amjad e82b8d4439 Lakum & other fixes 3 years ago
haroon amjad f029aaa1c6 Fixes & code optimizations 3 years ago
haroon amjad 5692bc66a9 Removing anatomy pub from project 3 years ago
haroon amjad 0853ecdc27 Body added 3 years ago
haroon amjad 5b1f0c163e In App Review 3 years ago
haroon amjad 12a58856e5 Chart fix & In-App update implemented 3 years ago
Sikander Saleem 8f371f87d2 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad b475adb5c3 Updates & fixes 3 years ago
Mirza.Shafique d664a216c6 Profile Page and Back Button Click 3 years ago
Mirza.Shafique 9c7e8e3637 Back Button on Landing Page 1 3 years ago
haroon amjad a819660536 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
haroon amjad 01ccd484f4 Calendar plugin changed 3 years ago
Sikander Saleem 08960867f7 Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem 55df00dcd4 h20 today ui (cont.) 3 years ago
haroon amjad a7ccc73c36 updates 3 years ago
Mirza.Shafique 205b4d6b21 Photo view in CMC 3 years ago
haroon amjad 728c22cc68 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/insurance/insurance_approval_screen.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad bbcf22ddfa Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/landing/fragments/home_page_fragment2.dart
3 years ago
Mirza.Shafique ef2bcc1c65 Web RTC Design implementation 3 years ago
haroon amjad d9d4720ded pubspec updated 3 years ago
haroon amjad 0a90791aca Push notification fixes 3 years ago
Zohaib Iqbal Kambrani 3f178e3e3f Google_Huawei Map -> AppMap 3 years ago
Sikander Saleem 197e7d5742 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/medical/patient_sick_leave_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
3 years ago
Mirza.Shafique d865e97ce1 Vital Sings Home Page 3 years ago
hussam al-habibeh 4b90f16ab9 baby age in ovulation period 3 years ago
Mirza.Shafique 32e867421f Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/uitl/date_uitl.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Mirza.Shafique bbaeec5b85 Medical Profile Complete 3 years ago