Commit Graph

91 Commits (dev_3.24.3)

Author SHA1 Message Date
Aamir 3826b854fc Revert "Merge branch 'dev_v3.13.6_amirChanges' into dev_3.24.3"
This reverts commit 74aafad2ec, reversing
changes made to 073cb9f7e8.
1 year ago
Aamir da3e266989 local 1 year ago
taha.alam e14dc10c1c WD: permission updated for android version 31 and later 1 year ago
taha.alam c6e74e73d0 WD: icon updated 1 year ago
taha.alam 771b20f21c WD: clinic_id converted to clinicID. 1 year ago
taha.alam ae7fbbfb98 WD: penguin view navigation to clinic id added and username modified. 1 year ago
taha.alam 7ca806571f WD: base url replaced with data url 1 year ago
taha.alam e996653253 WD:penguin new sdk 1 year ago
Aamir.Muhammad fb4cf08b89 Penguin Map Integration & Permissions Fixes. 1 year ago
haroon amjad 53015422e5 PenguinIn integration with HMG App 1 year ago
haroon amjad 1094d297f4 Update to stores 15.9 1 year ago
haroon amjad 8edf65daf1 Updates & Fixes 2 years ago
haroon amjad c948a1780c Update to stores VersionID 15.8 2 years ago
devamirsaleemahmad 8544b3ce3d changes & Deletion 2 years ago
haroon amjad 555898c822 updates 3 years ago
haroon amjad 6bdb7a3305 Updates & fixes 3 years ago
haroon amjad 0e01835327 Target SDK & Compile SDK bumped to 33 3 years ago
Zohaib Iqbal Kambrani 35b129fb68 migrated project to latest flutter sdk 3 years ago
haroon amjad 52070c8f94 Updates & fixes 3 years ago
haroon amjad 4ba37d342c RRT Updates 4 years ago
haroon amjad 887303fcde updates 4 years ago
Zohaib Iqbal Kambrani 687bc543ab OpenTok Video Call 4 years ago
Zohaib Iqbal Kambrani 23404b4495 Video call at InAppWebView 4 years ago
Zohaib Iqbal Kambrani a8e1ba6b86 no message 4 years ago
Zohaib Iqbal 259e27d4a7 Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5'
# Conflicts:
#   lib/pages/landing/fragments/home_page_fragment2.dart
#   lib/uitl/app_shared_preferences.dart
#   lib/widgets/in_app_browser/InAppBrowser.dart
4 years ago
Zohaib Iqbal Kambrani ab8b62bc3a Packages and offers fixes, HMG Internet work in progress, 4 years ago
haroon amjad 3107d1e86d Updates & fixes 4 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
4 years ago
Zohaib Iqbal Kambrani 63ffabcc86 no message 4 years ago
Sikander Saleem 2a92478d01 nfc plugin improvement. 4 years ago
Sikander Saleem e3bf988df5 map picker, firebase improvement and changes for v2.5 4 years ago
haroon amjad e3b7069aa2 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/parent_categorise_page.dart
#	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
#	lib/pages/webRTC/call_page.dart
#	lib/pages/webRTC/signaling.dart
4 years ago
haroon amjad 8b1733e917 no message 4 years ago
Sikander Saleem 4518a26ff1 video call improvement. 4 years ago
Zohaib Iqbal Kambrani f3462dfc19 Applied cost from api at cart 4 years ago
Zohaib Iqbal Kambrani aad071ac67 Packages and Offers apply token 4 years ago
Zohaib Iqbal Kambrani d0986fcaf6 OpenTok SDK applied and method channels written to native 4 years ago
Mirza.Shafique 9b160958bb Covid New Design 3 4 years ago
haroon amjad 0a90791aca Push notification fixes 4 years ago
Zohaib Iqbal Kambrani 3f178e3e3f Google_Huawei Map -> AppMap 4 years ago
haroon amjad 2669378da4 Insurance Approval API updated 4 years ago
Sikander Saleem ca363adee2 merge & improvements 4 years ago
Sultan Khan 97d7f9225e package name changed 4 years ago
Sultan Khan 14ef096c32 changes and fixes 5 years ago
haroon amjad bcb4f48785 build fix 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 ccd2fc5068 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
haroon amjad 6945230965 Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/pages/Covid-DriveThru/covid-drivethru-location.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/medical/smart_watch_health_data/health_data_list.dart
#	lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart
#	lib/uitl/translations_delegate_base.dart
#	pubspec.yaml
5 years ago
Sultan Khan c65983bfdb code merged 5 years ago
Zohaib Iqbal Kambrani dc83b476d6 Merge branch 'development' into ZohaibIqbalKambrani
# Conflicts:
#	android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt
#	ios/Flutter/.last_build_id
#	lib/pages/landing/landing_page.dart
#	lib/pages/medical/medical_profile_page.dart
#	lib/widgets/drawer/app_drawer_widget.dart
5 years ago