Commit Graph

167 Commits (5f90435442f703b248a9946ba522f2328eca3e27)

Author SHA1 Message Date
haroon amjad bea15150aa Merge branch 'development_v3.3' into dev_3.3_faiz_payfort 2 years ago
haroon amjad fddb423451 Updates & fixes 2 years ago
Sultan khan 98a2545a9b Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
# Conflicts:
#	lib/config/config.dart
#	lib/pages/DrawerPages/family/my-family.dart
#	lib/uitl/push-notification-handler.dart
2 years ago
haroon amjad cfa341aba5 Apple Pay Updates 2 years ago
haroon amjad 52b3c196d6 updates 2 years ago
haroon amjad f7dffea2eb Language ID fixes 2 years ago
haroon amjad 724a26ca68 Updates 2 years ago
haroon amjad 4e962bda07 Merge branch 'development_v3.3' into PatientApp_VIDA_Plus_3.3
# Conflicts:
#	lib/config/config.dart
#	lib/core/model/labs/request_send_lab_report_email.dart
#	lib/core/service/medical/ask_doctor_services.dart
#	lib/core/service/medical/labs_service.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/pages/conference/web_rtc/call_home_page_.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/pages/medical/patient_sick_leave_page.dart
#	lib/pages/webRTC/call_page.dart
#	lib/pages/webRTC/signaling.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/uitl/LocalNotification.dart
#	lib/uitl/SignalRUtil.dart
#	lib/uitl/utils.dart
#	lib/widgets/others/floating_button_search.dart
2 years ago
Sultan khan abcf82346e Excluded change 2 years ago
haroon amjad 3e63d80655 Ancillary order updates 2 years ago
haroon amjad b2ec6c76bf ancillary fix 2 years ago
haroon amjad 3fda1da16a updates 2 years ago
Sultan khan c48f393f95 Dubai registration fixed 3 years ago
Sultan khan ea82219e9e Appointment logs 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 f6191d9bf7 updates & fixes 3 years ago
haroon amjad 58a6dc6a6f Tamara & Apple Pay Fixes + Other Updates 3 years ago
Zohaib Iqbal Kambrani 8c29b5f8e6 WebRTC or Opentok 3 years ago
haroon amjad 11529c65c5 updates 3 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
3 years ago
Zohaib Iqbal Kambrani e107d8a1a4 no message 3 years ago
haroon amjad 842e099953 DateTime Fixes 3 years ago
haroon amjad 8d988ba994 updates & fixes 4 years ago
haroon amjad 4ba37d342c RRT Updates 4 years ago
Zohaib Iqbal Kambrani 99bdd25bd3 added more analytics logs 4 years ago
Zohaib Iqbal Kambrani 9890d2caec Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
  mobile number updates
  video call setup with flutter 2.8, firebase modifications
4 years ago
Zohaib Iqbal Kambrani 687bc543ab OpenTok Video Call 4 years ago
haroon amjad ff72b4b31e mobile number updates 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
Zohaib Iqbal Kambrani d974a7430c Google Analytics as per e-Cense document 4 years ago
haroon amjad efced34ffa Updates 4 years ago
haroon amjad e45c2c5652 covid & pharmacy updates 4 years ago
Sikander Saleem 9ba7b3b44b Merge branch 'development_new_design_2.0' into development_v2.5
# Conflicts:
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/medical/smart_watch_health_data/syncHealthData.dart
#	lib/pages/vaccine/my_vaccines_screen.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	pubspec.yaml
4 years ago
haroon amjad 7bc8f69dfb JIRA bug fixes 4 years ago
Sikander Saleem caec2c4ca4 video call improvements. 4 years ago
devmirza121 f9e98c5fa4 Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
devmirza121 7d2a6c794b Clinic Search Dialog 4 years ago
haroon amjad a646677fae Pharmacy & smart watch data fixes 4 years ago
Sikander Saleem 014074c414 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/pages/Blood/blood_donation.dart
#	lib/pages/BookAppointment/components/SearchByClinic.dart
4 years ago
haroon amjad 14b85cc407 Family files API changes 4 years ago
haroon amjad 6ffa07392c Product detail page updates 4 years ago
haroon amjad c253ec3110 LiveCare UI revamped 4 years ago
haroon amjad be771917f0 pharmacy fixes 4 years ago
Sikander Saleem d6a5f68312 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/Blood/blood_donation.dart
#	lib/pages/BookAppointment/components/SearchByClinic.dart
4 years ago
Sikander Saleem cd81f05a8d laser clinic design (cont.) 4 years ago