Commit Graph

74 Commits (merge-update-with-lab-changes)

Author SHA1 Message Date
Aamir Muhammad 24a4020f5c fixes 12 months ago
Aamir Muhammad e64d1088a6 changes 12 months ago
Aamir Muhammad ff12e832ab fixes 12 months ago
Aamir Muhammad f04928c3e8 fixes for login & register (Points) 12 months ago
Aamir Muhammad ee4ae657b0 fixes 12 months ago
Aamir Muhammad e306bfd69b saved login fixes & design changes. 12 months ago
Aamir Muhammad 23fc89b40a font changes 12 months ago
Aamir Muhammad 6b96b6fc9e ui fixes 12 months ago
Aamir Muhammad 9704ef232f caleder changes 12 months ago
Aamir Muhammad 2dd823667c register Design. 12 months ago
Aamir Muhammad 93649616b2 translation & register Design changes. 12 months ago
Aamir Muhammad 16b37b847d translation & register Design changes. 12 months ago
Aamir Muhammad 6578baaf34 login using sms done 12 months ago
Aamir Muhammad 7ff7f88e24 updated app to latest flutter sdk with android native changes. 12 months ago
haroon amjad e748712954 Initial Commit 12 months ago
haroon amjad 20bfdc3652 Project Name Top & Bottom changes implemented 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
Sultan khan eee2ccf148 updates 2 years ago
Sultan khan 86f5e81fea merge with 3.3 3 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
3 years ago
haroon amjad 4ac11b2169 LanguageID Fixes 3 years ago
Aamir Muhammad b4bc99369f Changes into Rating Bar 3 years ago
devamirsaleemahmad 9d1b153739 Dropdown Changed 3 years ago
Sultan khan ec13edc28b updates. 3 years ago
devamirsaleemahmad 720c0ac6e9 changes & Deletion 3 years ago
devamirsaleemahmad 2c9e51aef0 changes 3 years ago
devamirsaleemahmad b26f535749 models updates -> 3.13.6 3 years ago
devamirsaleemahmad 9c2948db29 models updates -> 3.13.6 3 years ago
devamirsaleemahmad cb56750e6b models updates -> 3.13.6 3 years ago
haroon amjad 1faf27959a Updates 4 years ago
haroon amjad 40d649dfa4 Updates & fixes 5 years ago
devmirza121 6575456d3b Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
5 years ago
devmirza121 dc3d3bc772 Health Calculator 5.0 5 years ago
haroon amjad 338c646a43 updates 5 years ago
devmirza121 a131f24952 Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart
#	lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_result_page.dart
#	lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart
#	lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart
#	lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_result_page.dart
#	lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
devmirza121 1d1708bdcc Health Calculator 4.0 5 years ago
haroon amjad 75989bdc01 Health Calculators translations 5 years ago
haroon amjad d2834bb3dd Health calculator fixes 5 years ago
devmirza121 6225f2468d Health Calculator 3.0 5 years ago
devmirza121 d4eab13982 Health Calculator 2.0 5 years ago
devmirza121 0b8600605b Health Calculator 1.0 5 years ago
haroon amjad 73822300f9 Health Calculators APIs updated 5 years ago
haroon amjad 7467da7409 Imports organized 5 years ago
haroon amjad 2d7c7239c5 Health Converters fixes 5 years ago
Sikander Saleem 5ab9dd1761 Appointment screen Changes & improvements. 5 years ago
Sikander Saleem 458dc2474b Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
5 years ago
Sikander Saleem 197e7d5742 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/medical/patient_sick_leave_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
5 years ago
hussam al-habibeh fe83b91602 body fat texfield fix 5 years ago
hussam al-habibeh 864f849425 Baby age in ovulation period 5 years ago
Sikander Saleem 56c0adaada Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
5 years ago