Commit Graph

537 Commits (22274ebbb00a012b2c7ae61b7301ce82b57e474f)

Author SHA1 Message Date
haroon amjad 22274ebbb0 updates & fixes 3 years ago
Zohaib Iqbal Kambrani 35b129fb68 migrated project to latest flutter sdk 3 years ago
haroon amjad 3709ebcb32 Updates 3 years ago
haroon amjad f6191d9bf7 updates & fixes 3 years ago
haroon amjad e03412214e Ambulance request fixes 3 years ago
haroon amjad 106334c9cf updates & fixes 3 years ago
haroon amjad 58a6dc6a6f Tamara & Apple Pay Fixes + Other Updates 3 years ago
Zohaib Iqbal Kambrani 8bd5a71318 Merge branch 'development_v2.5' into zik_webrtc_dev_v2.5
* development_v2.5:
  Timezone fixes & Activate/Deactivate file changes
  Updates
  Timezone Updates
  CMC Updates
  updates
  Updates
  Laser Male back image added
  Updates & fixes
  E-Cens sign off
  Analtyics at registration and liveacare payment fail
  analytics events update
  Analytics
  no message
  Updates & fixes
  ED Online Check-In
  Calendar fixes
  updates & fixes
  Analytics statements align to bottom of block
  Analytics for login registration
  updates

# Conflicts: Fixed
#	lib/analytics/flows/appointments.dart
4 years ago
Zohaib Iqbal Kambrani 1aabf08417 no message 4 years ago
haroon amjad ca43849d9d CMC Updates 4 years ago
haroon amjad 11529c65c5 updates 4 years ago
Zohaib Iqbal Kambrani e615ca1a16 no message 4 years ago
haroon amjad 3396b4253b Updates & fixes 4 years ago
Zohaib Iqbal Kambrani 6cd660184a no message 4 years ago
Zohaib Iqbal Kambrani 1c6a62776c Analytics statements align to bottom of block 4 years ago
Zohaib Iqbal Kambrani a0e619eec6 fixes 4 years ago
Zohaib Iqbal Kambrani fb4fb8d29e Merge branch 'development_v2.5' into zik_webrtc_dev_v2.5
* development_v2.5:
  Google analytics events update
  Updates
  Updates & fixes
  DateTime Fixes
  HHC Fixes
  updates & fixes
  Updates & fixes

# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/fragments/home_page_fragment2.dart
4 years ago
Zohaib Iqbal Kambrani e107d8a1a4 no message 4 years ago
haroon amjad 1faf27959a Updates 4 years ago
haroon amjad 9057a96d7f Updates & fixes 4 years ago
haroon amjad 842e099953 DateTime Fixes 4 years ago
haroon amjad f1129cc14c updates & fixes 4 years ago
haroon amjad fd96869d89 Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5
# Conflicts:
#	lib/pages/landing/fragments/home_page_fragment2.dart
4 years ago
haroon amjad c3538ebdb6 Updates & fixes 4 years ago
Zohaib Iqbal Kambrani 94a99a911e Offer And Packages (View Only) 4 years ago
haroon amjad aae48f2555 Android permission dialog updates 4 years ago
Sikander Saleem 27d0d80017 Merge branch 'development_v2.5' into sikander_family_profile_switch
# Conflicts:
#	lib/pages/DrawerPages/family/my-family.dart
#	lib/widgets/drawer/app_drawer_widget.dart
4 years ago
Sikander Saleem bcf746aa0b Merge remote-tracking branch 'origin/development_v2.5' into development_v2.5 4 years ago
Sikander Saleem 1b82146303 my family switch profile on dashboard. 4 years ago
Sikander Saleem 230444803d Merge remote-tracking branch 'origin/development_v2.5' into development_v2.5 4 years ago
Sikander Saleem fd73c248e2 my family switch profile improvement. 4 years ago
haroon amjad d344169399 Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5
# Conflicts:
#	lib/pages/BookAppointment/BookSuccess.dart
4 years ago
haroon amjad a918d409fb updates & fixes 4 years ago
Zohaib Iqbal Kambrani 99bdd25bd3 added more analytics logs 4 years ago
Zohaib Iqbal Kambrani 687bc543ab OpenTok Video Call 4 years ago
Zohaib Iqbal Kambrani bf7c1d1610 Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
  updates
  livecare changes
  updates
4 years ago
Zohaib Iqbal Kambrani aac15c5a4a partial analytics fixes and updates 4 years ago
haroon amjad 0ea2550246 Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5 4 years ago
haroon amjad 32edb2e71e updates 4 years ago
Zohaib Iqbal Kambrani c61de7cfdc no message 4 years ago
Zohaib Iqbal Kambrani 23404b4495 Video call at InAppWebView 4 years ago
Zohaib Iqbal Kambrani 936b7c28f9 Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
  Covid updates & other fixes

# Conflicts: Resolved
#	lib/config/config.dart
#	lib/pages/webRTC/signaling.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
4 years ago
haroon amjad 927db41068 Covid updates & other fixes 4 years ago
Zohaib Iqbal Kambrani a26b17f52d Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
  Translation fixes
  OBGyne updates
  updates
  OB Gyne appo updates
  no message
  updates & fixes
  no message
  no message
  Ancillary Orders completed
  updates & fixes

# Conflicts: Resolved
#	lib/pages/BookAppointment/widgets/DentalComplaintCard.dart
#	lib/widgets/drawer/app_drawer_widget.dart
4 years ago
Zohaib Iqbal Kambrani a8e1ba6b86 no message 4 years ago
haroon amjad ac5077e9e7 Translation fixes 4 years ago
haroon amjad 4b4ac4819f no message 4 years ago
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
4 years ago
haroon amjad aa36154764 Updates & fixes 4 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
4 years ago