Commit Graph

65 Commits (8c3b443f79045542a52013ea197deae5a2c1cefb)

Author SHA1 Message Date
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 5 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
Mohammad Aljammal 72290f041f fix design 5 years ago
Zohaib Kambrani f03adb37ce no message 5 years ago
Zohaib Kambrani 57925e3b02 Geofence fixes by JobScheduler 5 years ago
Zohaib Kambrani 3392a2431b Added Location Provider Changed Receiver to Reregister the geofences 5 years ago
Zohaib Kambrani 187d2bcd8b Geofence error logging in shared_preferences 5 years ago
Zohaib Kambrani a11d93332d Wifi check network available - android
tweaking at geofence code
5 years ago
Zohaib Kambrani 4c00f9b3f2 Merge branch 'ZohaibIqbalKambrani' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ZohaibIqbalKambrani
* 'ZohaibIqbalKambrani' of https://gitlab.com/Cloud_Solution/diplomatic-quarter:
  geofencing login check fix
5 years ago
Zohaib Kambrani 7b4a2b9e64 no message 5 years ago
Zohaib Kambrani 508bc191be geofencing login check fix 5 years ago
Zohaib Kambrani d8996cf879 Geofence Android Finished 5 years ago
Zohaib Kambrani 0f64c45e67 no message 5 years ago
Zohaib Kambrani 1dc9400ffc Geofencing work in progress on android 5 years ago
Zohaib Kambrani 8d5d55a150 Geofencing in progress 5 years ago
haroon amjad e495d3e5ad Health Data integration implementing 5 years ago
Zohaib Kambrani 55ad82147f Wifi internet 5 years ago
Zohaib Kambrani 27182ee8db no message 5 years ago
haroon amjad a03d5c6d57 App initial release to stores 5 years ago
Sultan Khan 571bda9100 permission 5 years ago
Zohaib Kambrani c2be303418 Move code from java to kotlin package 5 years ago
Zohaib Kambrani 3264b82118 Complete Native Wifi connection and LoadingView Android 5 years ago
Zohaib Kambrani 8fcf1b6708 Swipe the Native loading « arguments 5 years ago
Zohaib Kambrani 8e554970f3 Wifi Connectivity and loading View 5 years ago
Zohaib Kambrani 69d1e4bb0b no message 5 years ago
haroon amjad 22ef24c4ff Merge branch 'master' into Haroon
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
5 years ago
jammal 9328f942ba done ER service 5 years ago
jammal bd2254491c done ER service 5 years ago