Commit Graph

2288 Commits (c5e88ac7ba4de1ebc05b6ed8d3de481eddb3f3bf)

Author SHA1 Message Date
haroon amjad 74b0acefd3 Updates & fixes 3 years ago
Sultan khan 9683b3f42f Dubai Reminder fixed. 3 years ago
haroon amjad 6bdb7a3305 Updates & fixes 3 years ago
haroon amjad 0e01835327 Target SDK & Compile SDK bumped to 33 3 years ago
haroon amjad 2e72d6a550 LiveCare contact added 3 years ago
haroon amjad aafdf3760d added sick leave status text & color 3 years ago
haroon amjad c8ec536267 Sickleave CR done 3 years ago
haroon amjad e5e5bb5352 Dental book appointment changes 3 years ago
haroon amjad 25af2c23ef Sick leave CR, LiveCare support call, Appo calendar changes 3 years ago
haroon amjad c289afb186 Opentok fixes 3 years ago
haroon amjad 22274ebbb0 updates & fixes 3 years ago
Zohaib Iqbal Kambrani 35b129fb68 migrated project to latest flutter sdk 3 years ago
haroon amjad 22a0e456bc Manual Insurance Updates, Service ID fixes, Tamara Fixes 3 years ago
haroon amjad e80ac2481a Ancillary order & manual insurance update 3 years ago
haroon amjad 442a94ac08 Updates & fixes 3 years ago
haroon amjad 3709ebcb32 Updates 3 years ago
haroon amjad f6191d9bf7 updates & fixes 3 years ago
haroon amjad 7ae4e7d616 updates & fixes 3 years ago
haroon amjad d75615a2eb Updates & fixes 3 years ago
haroon amjad e03412214e Ambulance request fixes 3 years ago
haroon amjad 106334c9cf updates & fixes 3 years ago
haroon amjad dfa88b7de7 Updates, fixes & release VersionID 9.1 3 years ago
haroon amjad 21cf9da900 HMS Core & LiveCare Schedule fixes 3 years ago
haroon amjad 58a6dc6a6f Tamara & Apple Pay Fixes + Other Updates 3 years ago
haroon amjad 8be9d3ae6e Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5 3 years ago
haroon amjad 833818e6e3 Rad & Lab email issues fixes 3 years ago
Zohaib Iqbal Kambrani 8c29b5f8e6 WebRTC or Opentok 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
3 years ago
Zohaib Iqbal Kambrani 1aabf08417 no message 3 years ago
haroon amjad 2ba744c3a6 Timezone fixes & Activate/Deactivate file changes 3 years ago
haroon amjad 3896f02d13 Timezone Updates 4 years ago
haroon amjad ca43849d9d CMC Updates 4 years ago
haroon amjad 11529c65c5 updates 4 years ago
haroon amjad 4ba229c436 Updates 4 years ago
haroon amjad eb3f5b5cb5 Updates & fixes 4 years ago
Zohaib Iqbal Kambrani e615ca1a16 no message 4 years ago
haroon amjad 72654757c4 Merge branch 'development_v2.5' into 'zik_development_v2.5'
# Conflicts:
#   lib/pages/login/confirm-login.dart
4 years ago
haroon amjad 7018696328 E-Cens sign off 4 years ago
Zohaib Iqbal Kambrani a69e0da77d Merge branch 'development_v2.5' into zik_development_v2.5
* development_v2.5:
  analytics events update
4 years ago
Zohaib Iqbal Kambrani 7051b3ed63 Analtyics at registration and liveacare payment fail 4 years ago
haroon amjad 4cbccd8efb analytics events update 4 years ago
Zohaib Iqbal Kambrani a01b8b82da no message 4 years ago
Zohaib Iqbal Kambrani 86363a15d6 Merge branch 'development_v2.5' into zik_development_v2.5
* development_v2.5:
  Updates & fixes
  ED Online Check-In
  Calendar fixes
  updates & fixes
4 years ago
Zohaib Iqbal Kambrani 5c32e488d0 no message 4 years ago
haroon amjad 3396b4253b Updates & fixes 4 years ago
Zohaib Iqbal Kambrani 6cd660184a no message 4 years ago
haroon amjad 8b7a6e7689 ED Online Check-In 4 years ago
Zohaib Iqbal Kambrani f42e2fb652 Revert "no message"
This reverts commit da7884ff61.
4 years ago
haroon amjad bbb99667f8 Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5 4 years ago
haroon amjad 27c6837f25 updates & fixes 4 years ago
Zohaib Iqbal Kambrani 1c6a62776c Analytics statements align to bottom of block 4 years ago
Zohaib Iqbal Kambrani 1523fd5ade Analytics for login registration 4 years ago
Zohaib Iqbal Kambrani da7884ff61 no message 4 years ago
haroon amjad f50bfda330 updates 4 years ago
Zohaib Iqbal Kambrani a0e619eec6 fixes 4 years ago
Zohaib Iqbal Kambrani 88b904a4b8 analytics changes 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 8a95daff7c Google analytics events update 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 a9e48e487f HHC Fixes 4 years ago
haroon amjad f1129cc14c updates & fixes 4 years ago
Zohaib Iqbal Kambrani 612d9eb019 Project Filter Applied on Packages & Offers 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 8d988ba994 updates & fixes 4 years ago
haroon amjad 4ba37d342c RRT Updates 4 years ago
haroon amjad 72e5d0a2be Pharma LiveCare 4 years ago
haroon amjad aae48f2555 Android permission dialog updates 4 years ago
haroon amjad 643763764d family files fixes 4 years ago
haroon amjad be2a9380df Analytics change 4 years ago
haroon amjad 9464d543fc updates 4 years ago
haroon amjad bc97cfa95b Update Insurance changes 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
haroon amjad 72e2707d4b updates 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
haroon amjad 60a44f9a42 OpenTok fixes 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 8c96de866b updates 4 years ago
haroon amjad 7d7864a1eb livecare changes 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 a398220033 no message 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 f879991b50 OBGyne updates 4 years ago
haroon amjad 907181a56c Merge branch 'development_v2.5' into haroon_development_2.5
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 4b4ac4819f no message 4 years ago
haroon amjad 3eb7a4325b updates & fixes 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
Zohaib Iqbal Kambrani a2efbf6494 no message 4 years ago
Zohaib Iqbal Kambrani 81a3d1ce87 no message 4 years ago
Zohaib Iqbal Kambrani 940a19d4d7 Merge branch 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into zik_new_design_flutter_v2.5
* 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter:
  ancillary orders update
  Updates & fixes
  fix category issue
  fixes & updates
  lakum fix
  Updates & fixes
  fix translation issue
  Compare duplication fixed
  Updates & fixes
  Updates & fixes
  fix compare issue
  pharmacy fixes
  fix categories & cantact design
  pharmacy fixes
  Updates & fixes
  fix conflict
  Updates & fixes
  Updates & fixes
  Login fixes

# Conflicts: Resolved
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/BookAppointment/SearchResults.dart
4 years ago
Zohaib Iqbal Kambrani d974a7430c Google Analytics as per e-Cense document 4 years ago
haroon amjad 4bc67b37e0 no message 4 years ago
haroon amjad f8b3847d0a Ancillary Orders completed 4 years ago
haroon amjad ea8d700d22 updates & fixes 4 years ago
haroon amjad efced34ffa Updates 4 years ago
haroon amjad 19dadd2b35 Merge branch 'development_v2.5' into haroon_development_2.5 4 years ago
haroon amjad a6c6651363 Updates & fixes 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 7f5f3ababe Registration fix 4 years ago
haroon amjad 0acc134e6e Updates & fixes 4 years ago
haroon amjad e45c2c5652 covid & pharmacy updates 4 years ago
haroon amjad eb6b0aefc0 Merge branch 'fatima_v2' into 'development_v2.5'
Fatima v2

See merge request Cloud_Solution/diplomatic-quarter!580
4 years ago
haroon amjad 693f8cb090 Updates & fixes 4 years ago
Fatimah Alshammari f83adbc6ff Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2 4 years ago
Fatimah Alshammari 0b21252ae7 fix category issue 4 years ago
haroon amjad 4acdad0e99 fixes & updates 4 years ago
haroon amjad 8f91d0a0dc lakum fix 4 years ago
haroon amjad 40d649dfa4 Updates & fixes 4 years ago
haroon amjad e53ba65ddd Merge branch 'development_v2.5' into haroon_development_2.5 4 years ago
Fatimah Alshammari 0985436a10 fix translation issue 4 years ago
haroon amjad 28107f9a48 Compare duplication fixed 4 years ago
haroon amjad 8c3b443f79 Merge branch 'development_v2.5' into haroon_development_2.5 4 years ago
haroon amjad 4e3d99b007 Updates & fixes 4 years ago
Fatimah Alshammari e5f0f5777b Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2
# Conflicts:
#	lib/services/pharmacy_services/product_detail_service.dart
4 years ago
haroon amjad 6d88607631 Updates & fixes 4 years ago
Fatimah Alshammari 57d10d9e1f fix compare issue 4 years ago
haroon amjad 1f19af01c4 Merge branch 'development_v2.5' into haroon_development_2.5 4 years ago
haroon amjad c175139a29 pharmacy fixes 4 years ago
Fatimah Alshammari 71a28e2ed6 Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2 4 years ago
Fatimah Alshammari cc783045bb fix categories & cantact design 4 years ago
haroon amjad c05772c63a pharmacy fixes 4 years ago
haroon amjad b15bd2362b Updates & fixes 4 years ago
haroon amjad c2b0326676 Updates & fixes 4 years ago
haroon amjad eea701907d Login fixes 4 years ago
haroon amjad 0ae4a13c02 Merge branch 'zik_new_design_flutter_v2.5' into 'development_v2.5'
Zik new design flutter v2.5

See merge request Cloud_Solution/diplomatic-quarter!570
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
Sikander Saleem c8b5602d8e flutter 2.8 improvements. 4 years ago
Sikander Saleem 3ad90f1a01 Merge branch 'development_new_design_2.0' into development_v2.5 4 years ago