Commit Graph

3226 Commits (8fd0d13339d4c6b4ccdec86f7e4abef2ff71e8c5)

Author SHA1 Message Date
haroon amjad 1080a59106 Lab report download enabled 11 months ago
Haroon Amjad 2c5be020e9 LanguageID added in Lab Report Email API 11 months ago
haroon amjad f74a3301da SAR new symbol integrated 12 months ago
haroon amjad 744e3978d3 user agreement service privilege added 12 months ago
haroon amjad a24582a578 InPatient check added in Family file switch 12 months ago
taha.alam 9047ebf723 Merge branch 'dev_v3.13.6' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_CR_7211_Lab_report_changes
# Conflicts:
#	android/app/build.gradle
#	android/app/src/main/AndroidManifest.xml
#	android/build.gradle
#	android/gradle.properties
#	android/settings.gradle
#	lib/config/localized_values.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/data_display/medical/LabResult/Lab_Result_details_wideget.dart
#	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
#	pubspec.yaml
12 months ago
Haroon Amjad 04413aa7d6 lab report updates 12 months ago
taha.alam 2a37777b9a Merge branch 'dev_v3.13.6_search_hospital_by_region' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_search_hospital_by_region 12 months ago
taha.alam c2f38f1b7f Merge branch 'dev_v3.13.6' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_search_hospital_by_region
# Conflicts:
#	android/app/build.gradle
#	android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/MainActivity.kt
#	android/app/src/main/res/values/strings.xml
12 months ago
sultan khan 2ab0d0b682 WD:get current location place change and live care ui changes 12 months ago
taha.alam 0221cb1250 WD: search by region added for the doctors to be mapped. 12 months ago
haroon amjad d98f2c31a2 updates 12 months ago
taha.alam 7cafe3aaa9 WD: Arabic name value is handled. 1 year ago
taha.alam 11b83d1276 WD: Grouped by region ui changed and added to other two tabs of Search 1 year ago
haroon amjad c77ffb1730 updates 1 year ago
taha.alam fa87e74b02 WD: Border Added for the directional for multilingual 1 year ago
taha.alam 4c4ae6caef WD: Translation of words added and download button added 1 year ago
haroon amjad 780f645cbe Updates & fixes, CR 6038 Ask Dr changes implemented 1 year ago
taha.alam 3d27fbdea8 WD: lab report changes 1 year ago
Haroon Amjad a31c677919 invoice type check added 1 year ago
haroon amjad 95a4d8dd14 PaymentRequestID added in InPatient Advance Insert API 1 year ago
haroon amjad 880611f7bb Insurance card details button removed, Autofill for WhatsApp for android implemented, Updated to stores VersionID 17.3 1 year ago
taha.alam bd3dca6719 WD: session id issue fixed 1 year ago
taha.alam 59335ac04d WD: reverting changes 1 year ago
taha.alam 8509c3d94d WD: picking otp and providing the code to flutter channel 1 year ago
taha.alam c4de4c1bd9 Merge branch 'dev_v3.13.6' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/uitl/whatsapp_method_channel.dart
1 year ago
haroon amjad b677be9e3c Updates & fixes 1 year ago
taha.alam ff7afe5997 WD: vital sign camera screen added 1 year ago
taha.alam 4bfaf0a0d8 WD: vital sign camera screen added 1 year ago
taha.alam 21b2fae806 WD: vital sign changes 1 year ago
taha.alam f52aed49fd WD: gradle changes 1 year ago
taha.alam c6787ff966 WD: doctor list by region and sorting by name and distance 1 year ago
taha.alam 615f3bfa8e WD: region filter is added. 1 year ago
taha.alam cd460ee31b WIP: doctor list by region 1 year ago
haroon amjad 229efb2e25 Medical report In-App view & share enabled & update sent to stores VersionID 17.2 1 year ago
haroon amjad c72892b1a6 SMS Auto OTP Verify enabled & build sent to stores, VersionID 17.1 1 year ago
haroon amjad 32cf61d1bf Download & Share options added for Ready Medical Report. 1 year ago
haroon amjad b5eaedb721 Update to stores VersionID 17.1, CR 5047 & CR 7241. 1 year ago
haroon amjad 3f22d69058 Merge branch 'dev_v3.13.6' into dev_3.13.6_CR5047_LiveCare_Enhancements
# Conflicts:
#	lib/config/config.dart
#	lib/main.dart
#	lib/splashPage.dart
#	lib/uitl/CalendarUtils.dart
#	lib/uitl/translations_delegate_base.dart
1 year ago
haroon amjad 0e73d6d23e updates 1 year ago
haroon amjad e0de0768b6 CR 7241 changes, ProjectID added in radiology results if navigating from appointment details 1 year ago
haroon amjad ab33d06b91 Fix for VIDA4 Lab Special Result 1 year ago
haroon amjad 6f0f422adf CheckIn button removed as per Mr Rwaid's instructions. 1 year ago
haroon amjad 65d7f3f9b9 Font family fixes 1 year ago
haroon amjad d474eb9a24 Code commented for Lab result widget, ER Online CheckIn QR & location check-in & Patient occupation selection to publish laser clinic changes to store - VersionID 17.0 1 year ago
haroon amjad 9909cfaa57 QRCode & Location checkin implemented in ER Online Check-In 1 year ago
haroon amjad 291cf16d22 Changes for Laser clinic full body part 1 year ago
haroon amjad baa7790b89 Patient occupation selection implemented 1 year ago
haroon amjad 545cfcd6d9 updates 1 year ago
haroon amjad 924c111771 Lab result widget fixes 1 year ago
haroon amjad cfcba179c4 CR 7241 Lab result enhancement code merged 1 year ago
haroon amjad b80e171d25 Merge branch 'dev_3.3_LabReportEnhancementCR' into dev_3.13.6_Development
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/model/labs/patient_lab_orders.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	lib/widgets/charts/show_chart.dart
#	lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
#	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
#	lib/widgets/my_rich_text.dart
1 year ago
haroon amjad 1561a776e3 Merge branch 'dev_v3.13.6' into dev_3.13.6_Development
# Conflicts:
#	lib/config/config.dart
#	lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInBookAppointment.dart
#	lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInHome.dart
#	lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInPaymentDetails.dart
#	lib/pages/landing/fragments/home_page_fragment2.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/services/clinic_services/get_clinic_service.dart
1 year ago
haroon amjad cd7da0dd70 Penguin SDK changes & crashlytics 1 year ago
haroon amjad 21403a2bba InPatient Help PRO error handling issue resolved 1 year ago
haroon amjad 849164be2c Laser appointment booking changes 1 year ago
haroon amjad 931e748a54 updates 1 year ago
haroon amjad dff03796e9 Crashlytics enabled 1 year ago
haroon amjad c58cbae99c InPatient prescription send email issue fixed 1 year ago
haroon amjad 1cadee754e CR Implemented 1 year ago
haroon amjad 20bfdc3652 Project Name Top & Bottom changes implemented 1 year ago
haroon amjad 091f3b0830 CRs 5656, 5801 & 6265 (InPatient CRs & ER Online Check-In) update to stores with versionID 16.8 1 year ago
Aamir 3d2e0a5442 cr 7211 lab report new ui changes 1 year ago
Aamir b74a433798 cr 7211 lab report new ui changes 1 year ago
haroon amjad 8e46738982 bug fixes 1 year ago
haroon amjad 0bdfa9157b updates 1 year ago
haroon amjad 41b0e65e41 iOS Calendar fix 1 year ago
Aamir 0f0b541563 Merge remote-tracking branch 'origin/dev_v3.13.6' into dev_v3.13.6 1 year ago
haroon amjad 068b6c8494 calendar events updates 1 year ago
haroon amjad f58e07d789 Merge branch 'dev_v3.13.6' into dev_3.13.6_CR5047_LiveCare_Enhancements
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/conference/zoom/call_screen.dart
#	lib/uitl/translations_delegate_base.dart
1 year ago
haroon amjad 7188919172 Updates & fixes 1 year ago
haroon amjad 82de56266e InPatient Services issues fixed 1 year ago
haroon amjad 2997f49a95 updates 1 year ago
haroon amjad 9d444ccca3 updates 1 year ago
haroon amjad 71542e9db6 Inpatient module code merged & code fixes 1 year ago
haroon amjad 6a555ace41 ER Online CheckIn & InPatient CR implemented 1 year ago
haroon amjad 42dbe066fd Merge branch 'dev_3.3_ER_Online_CheckIn' into dev_3.13.6_merge_ER_Online_CheckIn
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/pages/landing/fragments/home_page_fragment2.dart
#	lib/pages/landing/widgets/services_view.dart
#	lib/services/payfort_services/payfort_service.dart
#	lib/services/payfort_services/payfort_view_model.dart
#	lib/uitl/translations_delegate_base.dart
1 year ago
haroon amjad 18b4fc5317 Patient app update 1 year ago
haroon amjad 14a5fec61a updates 1 year ago
Aamir 45bc6a91a4 Merge remote-tracking branch 'origin/dev_v3.13.6' into dev_v3.13.6
# Conflicts:
#	android/app/build.gradle
1 year ago
haroon amjad 3d44aa2e64 Sickleave updates 1 year ago
haroon amjad 3071a20b8a VIDA 4 package booking update 1 year ago
haroon amjad c6ee01c652 Waiting appointment bug fix 1 year ago
haroon amjad 605f02afe2 Sickleave CR updates & changes 1 year ago
haroon amjad 073cb9f7e8 Update to stores 16.5:
1. Indoor navigation
2. Walkin Appointment
3. Derma Package
4. NPHIES Eligibility
1 year ago
haroon amjad cee903dd6b changes for the hospital gesture clicked area and nearest check not showing the hospital dropdown area 1 year ago
haroon amjad 7ddd932c51 no message 1 year ago
Aamir da3e266989 local 1 year ago
taha.alam 34ffec93fd WD: calender issue fixed. 1 year ago
haroon amjad a6ee6869cc Merge commit '81b94814ce4f0a1e4626fe07a9b7933246d71336' into dev_v3.13.6 1 year ago
taha.alam 81b94814ce WD: hospital top and bottom name added 1 year ago
Haroon Amjad ecd4422905 updates & fixes 1 year ago
Haroon Amjad fb13096f94 NPHIES Eligibility check implemented in LiveCare Schedule Appointment booking in ToDo list 1 year ago
Haroon Amjad 05abea2d53 NPHIES Eligibility check implemented in LiveCare Schedule Appointment booking 1 year ago
taha.alam fe9d259cbd build context handled 1 year ago
Haroon Amjad b042292f9a code merged 1 year ago
Haroon Amjad 69493934b1 Merge branch 'dev_v3.13.6' into dev_v_3.13.6_CR_6804
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/BookAppointment/QRCode.dart
1 year ago
Haroon Amjad 057994dfd2 Merge branch 'dev_3.13.6_CR6750' of http://34.17.75.184/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/config/localized_values.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/uitl/translations_delegate_base.dart
1 year ago
taha.alam 936682ff95 WD: clinic by hospital 1 year ago
haroon amjad 8cc1e08421 icons for indoor navigation updated 1 year ago
haroon amjad 8862cc6c06 Release issues resolved 1 year ago
haroon amjad 1e98539537 Code merged for PenguinIn Indoor navigation into main branch 1 year ago
haroon amjad fd70387b2d Merge branch 'dev_v3.13.6' into dev_v3.13.6_PenguinIn
# Conflicts:
#	pubspec.yaml
1 year ago
haroon amjad ef36e8bd30 fixes 1 year ago
haroon amjad 06c0580d84 updates 1 year ago
haroon amjad e4d0b93c9f Implemented NPHIES check in WalkIn Appointment 1 year ago
taha.alam f80892b630 WD: header added to location list 1 year ago
taha.alam 633059b0be WD: Location dialog is added. 1 year ago
haroon amjad b64cf0bf6c SFCalendar issue fixed & update to stores 16.4 1 year ago
haroon amjad faeba6a14c CloudFlare & NPHIES in livecare reinstated 1 year ago
haroon amjad 92ccbaa2b5 updates 1 year ago
Haroon Amjad 49c11537b3 updated to latest flutter 3.24 1 year ago
haroon amjad db91921de1 update to stores version 16.3 1 year ago
Aamir.Muhammad 5883b06fcb Updated to 3.24 Flutter & Penguin Fixed. 1 year ago
Aamir.Muhammad e045c375d2 Merge branch 'refs/heads/dev_v3.13.6' into dev_v3.13.6_PenguinIn_3.22-IOS
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
1 year ago
haroon amjad f42223292a Merge branch 'dev_v3.13.6' into dev_v_3.13.6_CR_6804
# Conflicts:
#	lib/config/config.dart
1 year ago
haroon amjad 6c98f9f94f updates & fixes 1 year ago
haroon amjad 536c95c825 Merge branch 'dev_v3.13.6' into dev_3.13.6_CR6750
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/landing/landing_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/drawer/app_drawer_widget.dart
1 year ago
haroon amjad b6ba9fff2f Updates n fixes 1 year ago
haroon amjad dc17576c26 Flutter version upgraded to 3.22.0 1 year ago
haroon amjad 6f0cfebc89 Translation updates as requested by QA 1 year ago
haroon amjad 21c29e6355 LiveCare NPHIES eligibility check implemented 1 year ago
haroon amjad b6adfb2534 ER Online Check-In CR implemented 1 year ago
Haroon Amjad 1c66351011 Updates & fixes 1 year ago
Haroon Amjad 60a35032e5 Merge branch 'dev_v3.13.6_PenguinIn' of http://34.17.75.184/Haroon6138/diplomatic-quarter into dev_v3.13.6_PenguinIn 1 year ago
Aamir.Muhammad 145cd6010a Merge remote-tracking branch 'origin/dev_v3.13.6_PenguinIn' into dev_v3.13.6_PenguinIn 1 year ago
Aamir.Muhammad 7065b00c5c Penguin Map Integration & Permissions Fixes. 1 year ago
Haroon Amjad e27594d017 Merge branch 'dev_v3.13.6_PenguinIn' of http://34.17.75.184/Haroon6138/diplomatic-quarter into dev_v3.13.6_PenguinIn
# Conflicts:
#	android/app/build.gradle
#	lib/services/payfort_services/payfort_service.dart
1 year ago
Haroon Amjad 72d459ce10 PenguinIn updates 1 year ago
taha.alam ae7fbbfb98 WD: penguin view navigation to clinic id added and username modified. 1 year ago
haroon amjad f83d538472 fixes 1 year ago
taha.alam 1ee19ac696 Merge branch 'dev_v3.13.6_PenguinIn' of http://34.17.75.184/Haroon6138/diplomatic-quarter into dev_v3.13.6_PenguinIn 1 year ago
taha.alam e996653253 WD:penguin new sdk 1 year ago
Haroon Amjad 05d0d2d5a7 PenguinIn Params updated 1 year ago
Haroon Amjad 6efb316377 homepage updates 1 year ago
haroon amjad 2d82b97680 updates 1 year ago
haroon amjad a5d68bf470 update 1 year ago
Haroon Amjad 87c7dcb68a Merge branch 'dev_v3.13.6_PenguinIn' of http://34.17.75.184/Haroon6138/diplomatic-quarter into dev_v3.13.6_PenguinIn 1 year ago
Haroon Amjad 029f174a6c Penguin scenarios implemented 1 year ago
taha.alam 96b7fea5c9 WD:payfort services changes reverted 1 year ago
taha.alam 1e8953538a WD: notification for navigation added 1 year ago
haroon amjad 147fb6cee8 updates 1 year ago
haroon amjad 393ea45d2c updates 1 year ago
haroon amjad 6d2484e6ac ClinicID fix 1 year ago
haroon amjad f714d17686 fixes 1 year ago
haroon amjad f8d797f80a updates 1 year ago
haroon amjad 98389e3f68 LiveCare Call Type implemented 1 year ago
haroon amjad 9f629afb9c Merge branch 'dev_v3.13.6' into dev_v_3.13.6_CR_6804
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/uitl/app_shared_preferences.dart
1 year ago
haroon amjad f36fc4d88d ListView accordion fixes 1 year ago
haroon amjad d3d8d1f121 Update to stores 16.0 1 year ago
haroon amjad 50ba0372db language updates 1 year ago
haroon amjad 34778d91d7 language fixes 1 year ago
haroon amjad baaacdb2f8 updates 1 year ago
haroon amjad 0eb0a94f48 updates 1 year ago
haroon amjad cab1854cce Merge branch 'dev_v3.13.6' into dev_3.13.6_CR6750 1 year ago
haroon amjad a39d2840e0 Merge branch 'dev_v3.13.6' into dev_v_3.13.6_CR_6804 1 year ago
haroon amjad 66ec7b5ca4 Derma package appointment booking fixes 1 year ago
haroon amjad ed037edf22 Apple Pay fixes 1 year ago
haroon amjad 8838eb4769 Dr speciality translation fix 1 year ago
haroon amjad 5e8fe20f52 updates 1 year ago
Aamir.Muhammad fb4cf08b89 Penguin Map Integration & Permissions Fixes. 2 years ago
haroon amjad 11a43eb0ae updates 2 years ago
haroon amjad 53015422e5 PenguinIn integration with HMG App 2 years ago
haroon amjad 43741e24cf fixes 2 years ago
haroon amjad 0eaeb75207 Merge branch 'dev_v3.13.6' into dev_3.13.6_CR6750 2 years ago
haroon amjad 82e933a06f updates & fixes for walkin appointment CR 2 years ago
Aamir.Muhammad 4c5ba6048f CR Fixes Search By Clinic & Search By Doctor List Reload Issue 2 years ago
haroon amjad 1b545c4d0b Walkin appointment booking implemented in Appointment Details page 2 years ago
haroon amjad ca8533190a Walkin appointment booking implementation contd 2 years ago
haroon amjad adf00e101f Merge branch 'dev_v3.13.6' into dev_3.13.6_Development 2 years ago
haroon amjad 31aa09e35b translation fix 2 years ago
haroon amjad d65325f998 Payment flow integration for Walk-In appointments 2 years ago
Sultan khan 554548bc9a CR updates 2 years ago
Sultan khan 9501c2ea9a derma CR 6804 CHANGES and language on initial load issue fix. 2 years ago
haroon amjad 984459d314 Walkin appointment implementation contd 2 years ago
haroon amjad b3f2904e9a Waiting appointment implementation contd. 2 years ago
haroon amjad 1094d297f4 Update to stores 15.9 2 years ago
haroon amjad 52e63fe5e4 Update to stores 15.9 2 years ago
haroon amjad d0e743dcc9 Family members issue fixed in android 2 years ago
haroon amjad f6b89e1ae6 ER Online Check-In fixes 2 years ago
haroon amjad 752d5e5944 Appointment timeline fix 2 years ago
haroon amjad 4dc0a3f6c2 ER Online Check-In changes 2 years ago
haroon amjad 84159656b6 updates for ER Online-Checkin 2 years ago
haroon amjad 8a319cc2f2 updates & fixes 2 years ago
haroon amjad 8f9882fc5c Updates 2 years ago
haroon amjad 88d79367ba updates & fixes 2 years ago
haroon amjad de5317ae55 Merge branch 'dev_3.3_ER_Online_CheckIn' into dev_3.13.6_Development
# Conflicts:
#	lib/pages/landing/fragments/home_page_fragment2.dart
2 years ago
haroon amjad 8edf65daf1 Updates & Fixes 2 years ago
haroon amjad c948a1780c Update to stores VersionID 15.8 2 years ago
Aamir.Muhammad be4022cee5 Calender Event Fixes Function Changes 2 years ago
haroon amjad e9404f1656 Prescription reminder fixes 2 years ago
haroon amjad 2b560840aa lab special result fix 2 years ago
Aamir.Muhammad 02878b7df9 Calender Event Fixes 2 years ago
Aamir.Muhammad 0ef716f536 Calender Event Fixes 2 years ago
Aamir.Muhammad 2e25940b62 Calender Event Fixes 2 years ago
Aamir.Muhammad 515896c265 Calender Event Fixes 2 years ago
haroon amjad 5b7b40c732 Updates & fixes 2 years ago
haroon amjad c97fd25cdd Zoom integration updates & other stability fixes 2 years ago
Aamir.Muhammad e962469c7e Null fixes after merge from 3.13 2 years ago
Aamir.Muhammad d9cf383648 Merge branch 'refs/heads/development_v3.3' into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/medical/reports/report_home_page.dart
2 years ago
haroon amjad 9a0a658083 Online CheckIn CR implementation Contd. 2 years ago
haroon amjad 3a64858905 Invalid NFC Scan check added 2 years ago
haroon amjad f65fe26fd2 ER Online CheckIn implementation contd 2 years ago
haroon amjad 3a65113149 Update to stores 15.7 2 years ago
haroon amjad f5df1b1d01 ER Online CheckIn implementation Contd 2 years ago
haroon amjad 704d691816 ER Online Check-In contd. 2 years ago
Sultan khan 51bbc42ca9 security patch for 3 attempt fixed. 2 years ago
Sultan khan 21e4bb5138 error code 699 fixes 2 years ago
haroon amjad 9c957741b4 medical report fix 2 years ago
Aamir.Muhammad 011f5b1f57 Merge remote-tracking branch 'origin/development_v3.3' into dev_v3.13.6 2 years ago
Haroon Amjad eefdb1fa3e Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
Haroon Amjad 582f1f1566 updates 2 years ago
Aamir.Muhammad 29c2fd067e Null fixes after merge from 3.13 2 years ago
Aamir.Muhammad 8441a0ef00 Merge remote-tracking branch 'origin/development_v3.3' into dev_v3.13.6
# Conflicts:
#	lib/pages/login/login.dart
#	lib/pages/medical/medical_profile_page_new.dart
#	lib/services/clinic_services/get_clinic_service.dart
#	lib/uitl/utils.dart
#	lib/widgets/dialogs/radio_selection_dialog.dart
2 years ago
Aamir.Muhammad 0588e68c67 local Auth fix 2 years ago
haroon amjad 672d0b7e8c InPatient medical report enabled 2 years ago
haroon amjad 9a102be7c7 PatientID QR image added 2 years ago
haroon amjad 96d5c3ce1d My Instructions added 2 years ago
haroon amjad 5f90435442 National ID input validation added 2 years ago
haroon amjad 6e30df2a29 WeCare service added 2 years ago
haroon amjad 4c0d758dd1 Zoom updates 2 years ago
haroon amjad 9ab10eebce Zoom Video SDK integrated 2 years ago
Sultan khan d1b13d5ce9 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 2 years ago
haroon amjad a4a638aa37 updates 2 years ago
Sultan khan c9be715436 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/Blood/blood_donation.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/livecare/widgets/clinic_list.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
2 years ago
haroon amjad 69e64fd5fb Blood Donation CR merged into dev_3.3 2 years ago
haroon amjad f8e7ccf73f updates 2 years ago
haroon amjad 7b181192f6 Apple Pay updates 2 years ago
Aamir Muhammad e18ba6822a changes local 2 years ago
Aamir Muhammad 660ec3a207 changes local 2 years ago
Aamir Muhammad 52a5e978a7 changes local 2 years ago
haroon amjad 3dffb26aee updates 2 years ago
Sultan khan 5e9d08b9aa Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
2 years ago
Sultan khan 08b4c8f86e Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/config/config.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/main.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/livecare/widgets/LiveCareHistoryCard.dart
#	lib/pages/medical/eye/ContactLensPage.dart
#	lib/pages/medical/medical_profile_page_new.dart
#	lib/uitl/LocalNotification.dart
#	lib/uitl/gif_loader_dialog_utils.dart
#	lib/widgets/Loader/gif_loader_container.dart
#	lib/widgets/data_display/medical/time_line_new_widget.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	pubspec.yaml
2 years ago
haroon amjad 968e59707e updates 2 years ago
Sultan khan 99e2edea31 lab result change for PMA-892 2 years ago
haroon amjad 2ebaed4841 label updated 2 years ago
haroon amjad d6dacfb743 Load more added in appointments timeline. 2 years ago
haroon amjad 5256d8873f ToDo & Appo Timeline changes 2 years ago
haroon amjad fe37de9621 Loading dialog updates 2 years ago
Sultan khan 63f5f7890e updates 2 years ago
Sultan khan eee2ccf148 updates 2 years ago
haroon amjad 727a9f1363 updates & checks 2 years ago
haroon amjad e0c9914206 Issue for appointment reschedule fixed 2 years ago
haroon amjad 7fc47ebf34 LiveCare invoice fix 2 years ago
haroon amjad 162b2fd22a updates 2 years ago
Sultan khan d255ada2ea eye measurements fixed 2 years ago
Aamir Muhammad b6d222a7ea JIRA Fixes 2 years ago
haroon amjad b42c47f074 Update to stores 2 years ago
Sultan khan 0e04012219 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/BookAppointment/DentalComplaints.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/services/clinic_services/get_clinic_service.dart
2 years ago