Commit Graph

64 Commits (4e2979cd64fc630fecf1f474d5180d5c832edf12)

Author SHA1 Message Date
Zohaib Kambrani 27182ee8db no message 4 years ago
Zohaib Kambrani 69d1e4bb0b no message 4 years ago
Sultan Khan deb828b4dd Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Mohammad Aljammal 50dffe9af9 Merge branch 'Haroon' into 'master'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!74
4 years ago
Mohammad Aljmma d0ed776ff6 new home health service 4 years ago
haroon amjad dfa7e0e02f updates & fixes 4 years ago
jammal 9328f942ba done ER service 4 years ago
jammal 7dc55f3378 Merge branch 'home_health_care' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ios_issues
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/locator.dart
	lib/pages/AlHabibMedicalService/E-Referral/e_referral_index_page.dart
	lib/pages/AlHabibMedicalService/h2o/h2o_index_page.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
Sultan Khan f03a711dff symptom checker gender page updated 4 years ago
Mohammad Aljammal 29f0402cbd Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
 Conflicts:
	lib/config/config.dart
	lib/config/shared_pref_kay.dart
	lib/core/service/client/base_app_client.dart
	lib/pages/AlHabibMedicalService/​ health_calculators.dart
	lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/login/confirm-login.dart
	lib/pages/login/login.dart
	lib/services/appointment_services/GetDoctorsList.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/drawer/app_drawer_widget.dart
	lib/widgets/others/app_scaffold_widget.dart
4 years ago
Mohammad Aljammal d3d0fa00e7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
 Conflicts:
	lib/pages/landing/home_page.dart
4 years ago
Mohammad Aljammal e7cf452a79 Merge branch 'insurance' into 'master'
files import fix

See merge request Cloud_Solution/diplomatic-quarter!66
4 years ago
Mohammad Aljammal a31796322b fix icons issue 4 years ago
Mohammad Aljammal 15ac74fadb Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into haroon_s
 Conflicts:
	lib/pages/AlHabibMedicalService/​ health_calculators.dart
4 years ago
Mohammad Aljammal 53bbafdc2b fix Authenticated User Object 4 years ago
hussam al-habibeh cd36749e4e files import fix 4 years ago
Sultan Khan 8095e56b32 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 3ad928902b voice command 4 years ago
Elham Rababah a359a6cd1a fix the loader issue 4 years ago
Mohammad Aljammal b0fa7811e5 Merge branch 'insurance' into 'master'
women health

See merge request Cloud_Solution/diplomatic-quarter!65
4 years ago
hussam al-habibeh c6a9b66538 women health 4 years ago
haroon amjad a8ee7db62b fixes
# Conflicts:
#	lib/config/config.dart
4 years ago
haroon amjad 41d50e23e3 covid drivethru implemented 4 years ago
Sultan Khan da317431ba Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Elham Rababah 83ab1b4d61 fix issues in the services logic and add some translation 4 years ago
Elham Rababah da7131015e remove print statements 4 years ago
Mohammad Aljammal 847ccb9c07 Merge branch 'child_vaccines' into 'master'
Child vaccines

See merge request Cloud_Solution/diplomatic-quarter!62
4 years ago
Sultan Khan 7b6135a6c7 voice search 4 years ago
Sultan Khan 83bc2cddce Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
hussam al-habibeh 84f429e559 merge 4 years ago
hussam al-habibeh bafcc4331e Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into insurance
 Conflicts:
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	pubspec.yaml
4 years ago
hussam al-habibeh dbda69baa1 health Calculator'General Health' 4 years ago
Elham Rababah 9ebc6980dd change the checkup item based on service 4 years ago
Elham Rababah 31b217aa19 First step from CMC 4 years ago
Elham Rababah 0b9a834673 Finish cancel order 4 years ago
Elham Rababah 293c557b54 First step from Home health care service 4 years ago
Sultan Khan ea86e88e2e Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 5c859034d6 voice search 4 years ago
Amjad amireh 42fd2e0eee Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into child_vaccines
 Conflicts:
	lib/core/viewModels/base_view_model.dart
4 years ago
Amjad amireh 98947d5f6b Blood Denote 4 years ago
Elham Rababah fdc8ef36ef Refactor today page 4 years ago
Elham Rababah 0a60b27ab4 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
 Conflicts:
	lib/locator.dart
4 years ago
Mohammad Aljammal ac871bb416 Merge branch 'Blood_Donation' into 'master'
Blood donation

See merge request Cloud_Solution/diplomatic-quarter!58
4 years ago
Elham Rababah dd76ae05a7 fix H2O page issue 4 years ago
Amjad amireh 5e50c0dc32 Blood Denote 4 years ago
Mohammad Aljammal 020d10fccc Merge branch 'insurance' into 'master'
Health Converter

See merge request Cloud_Solution/diplomatic-quarter!56
4 years ago
Elham Rababah 37d9eae9ea improve E-referral 4 years ago
Elham Rababah c994c39c6b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral 4 years ago
Elham Rababah a00bc8268e improve E-referral 4 years ago
Elham Rababah 91a8b94382 Merge branch 'E_referral' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/landing/landing_page.dart
4 years ago