You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
HMG_Patient_App/lib
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
4 years ago
..
analytics merge changes-4 5 years ago
config Health plugin updated 4 years ago
core Merge branch 'development_new_design_2.0' into development_v2.5 4 years ago
extensions Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
generated/json Offers & discounts UI updating 4 years ago
models Merge branch 'development_new_design_2.0' into development_v2.5 4 years ago
pages Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5 4 years ago
services Fixes & updates 4 years ago
theme Fixes & code optimizations 4 years ago
uitl Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5 4 years ago
widgets merge improvements 4 years ago
Constants.dart
d_q_icons_icons.dart add pharmacy icons for bottom nav 4 years ago
locator.dart pharmacy home page update 4 years ago
main.dart no message 4 years ago
routes.dart Incoming call & LiveCare pending UI revamped 4 years ago
splashPage.dart Merge branch 'new_design_sikander' into development_new_design_2.0 5 years ago