Commit Graph

60 Commits (b6d310c65f547e02797d22e8114614be881f0801)

Author SHA1 Message Date
haroon amjad f265c605ca Merge branch 'merge-update-with-lab-changes' into update-to-3.32-sdk
# Conflicts:
#	android/app/local.properties
#	android/app/src/main/AndroidManifest.xml
#	android/gradle.properties
#	android/gradle/wrapper/gradle-wrapper.properties
#	ios/Podfile
#	ios/Runner.xcodeproj/project.pbxproj
#	ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
#	ios/Runner/Info.plist
#	ios/Runner/Runner.entitlements
#	lib/config/localized_values.dart
#	lib/core/model/labs/LabOrderResult.dart
#	lib/core/model/labs/lab_result.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/medical/labs_service.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/new_ui/exception_widget/ExceptionBottomSheet.dart
#	lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/cmc_location_page.dart
#	lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_tow_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/location_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_tow_page.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/forgot-password.dart
#	lib/pages/login/register_new.dart
#	lib/pages/login/saved_login.dart
#	lib/pages/login/welcome.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/uitl/app_toast.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	lib/widgets/Loader/gif_loader_container.dart
#	lib/widgets/data_display/medical/LabResult/FlowChartPage.dart
#	lib/widgets/data_display/medical/LabResult/Lab_Result_details_wideget.dart
#	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	lib/widgets/pickupLocation/PickupLocationFromMap.dart
#	pubspec.yaml
8 months ago
haroon amjad e748712954 Initial Commit 8 months ago
Aamir Muhammad 8f8769d99a updated app to latest flutter sdk with android native changes. 10 months ago
Aamir Muhammad 5fb40a7c5f updated app to latest flutter sdk. 10 months ago
haroon amjad 9eb0947d12 Initial Commit 10 months ago
Sultan khan 86f5e81fea merge with 3.3 2 years ago
Sultan khan d0c7b08eac 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/core/service/client/base_app_client.dart
	lib/core/viewModels/er/EdOnlineViewModel.dart
	lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bariatrics-screen.dart
	lib/pages/BookAppointment/DentalComplaints.dart
	lib/pages/BookAppointment/components/SearchByClinic.dart
	lib/pages/BookAppointment/widgets/DentalComplaintCard.dart
	lib/pages/BookAppointment/widgets/DoctorView.dart
	lib/pages/DrawerPages/family/my-family.dart
	lib/pages/MyAppointments/MyAppointments.dart
	lib/pages/landing/landing_page.dart
	lib/pages/livecare/widgets/clinic_card.dart
	lib/pages/login/login.dart
	lib/pages/rateAppointment/rate_appointment_clinic.dart
	lib/pages/rateAppointment/rate_appointment_doctor.dart
	lib/services/clinic_services/get_clinic_service.dart
	lib/uitl/push-notification-handler.dart
	lib/widgets/others/bottom_bar.dart
	pubspec.yaml
2 years ago
haroon amjad 4ac11b2169 LanguageID Fixes 2 years ago
Sultan khan 8c46d2577d updated with assets 2 years ago
devamirsaleemahmad d6f51f6c82 changes 2 years ago
devamirsaleemahmad c1fd6313b1 changes 3 years ago
devamirsaleemahmad 9c2948db29 models updates -> 3.13.6 3 years ago
haroon amjad 0e01835327 Target SDK & Compile SDK bumped to 33 3 years ago
haroon amjad 21cf9da900 HMS Core & LiveCare Schedule fixes 4 years ago
haroon amjad 3896f02d13 Timezone Updates 4 years ago
haroon amjad ca43849d9d CMC Updates 4 years ago
haroon amjad eb3f5b5cb5 Updates & fixes 4 years ago
haroon amjad 842e099953 DateTime Fixes 4 years ago
haroon amjad aae48f2555 Android permission dialog updates 4 years ago
haroon amjad a6c6651363 Updates & fixes 4 years ago
Sikander Saleem e3bf988df5 map picker, firebase improvement and changes for v2.5 4 years ago
haroon amjad 79d99dd48a Pharmacy security updates applied 4 years ago
haroon amjad 894cc0e336 Updates & fixes 5 years ago
haroon amjad a710406317 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_page.dart
#	lib/pages/DrawerPages/family/my-family.dart
5 years ago
haroon amjad 494b1f221d Updates & fixes 5 years ago
Mirza.Shafique 0ba4e9047b design fixes 1.0 5 years ago
haroon amjad 5f963b0327 Translation updates, CMC, HHC & RRT APIs updates 5 years ago
haroon amjad e62e3dae1b CMC APIs coverting to RC 5 years ago
Mirza.Shafique 06c5ee269b Bug Fixes 5 years ago
haroon amjad 46cc73bdd7 CMC changes 5 years ago
haroon amjad 8cc36ae848 Merge branch 'development_new_design_2.0' into haroon-new-design 5 years ago
haroon amjad dfafb6b664 fixes 5 years ago
Mirza.Shafique 205b4d6b21 Photo view in CMC 5 years ago
Mirza.Shafique 5e383e57d9 CMC error Fixes 5 years ago
Mirza.Shafique f0566fb069 CMC Images 5 years ago
Sikander Saleem 74432b6bbb cmc order log ui changes 5 years ago
haroon amjad e8bb4e962c Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
5 years ago
Zohaib Iqbal Kambrani 581bbe63bb Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
* 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter:
  Images deleted from assets
  CMC 1.7
  CMC 1.6
  CMC 1.5
5 years ago
Zohaib Iqbal Kambrani 3f178e3e3f Google_Huawei Map -> AppMap 5 years ago
haroon amjad 7467da7409 Imports organized 5 years ago
Mirza.Shafique 96b971ef01 CMC 1.6 5 years ago
Mirza.Shafique f20883184e CMC 1.5 5 years ago
haroon amjad 948f4fc6b8 CMC Add address fixes 5 years ago
Mirza.Shafique 2d38e8905b CMC 1.4 5 years ago
Mirza.Shafique d1bc46f451 CMC Marge 5 years ago
Mirza.Shafique e890c80831 CMC 1.3 5 years ago
Mirza.Shafique 831780555c CMC 1.0 5 years ago
Elham Rababh 2e2f7334d5 fix issues PAP-910,PAP-911 5 years ago
Mohammad Aljammal 8b3a0b3ada Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
5 years ago
Elham Rababh ab2fc6aa2c fix issues related to footer 5 years ago