Commit Graph

135 Commits (7dc55f3378981cd745e872a54ea17ef8f5cec842)

Author SHA1 Message Date
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
jammal bd2254491c done ER service 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 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
Sultan Khan 8095e56b32 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Amjad amireh 83735ab68d modified Child vaccintion note 4 years ago
haroon amjad a8ee7db62b fixes
# Conflicts:
#	lib/config/config.dart
4 years ago
Mohammad Aljammal 84bb68789d Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into haroon_s
 Conflicts:
	lib/config/config.dart
	lib/pages/BookAppointment/widgets/DoctorView.dart
	lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
	lib/pages/ContactUs/findus/hospitrals_page.dart
	lib/pages/ContactUs/findus/pharmacies_page.dart
4 years ago
Mohammad Aljammal 06416b4934 add Not authenticated Page 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
Amjad amireh 67e3a13a95 child Vaccines add new child modified 4 years ago
Elham Rababah 9ebc6980dd change the checkup item based on service 4 years ago
Amjad amireh 1d29aa36a2 child Vaccines 4 years ago
Amjad amireh fe17c20bdf child Vaccines 4 years ago
Elham Rababah 31b217aa19 First step from CMC 4 years ago
Sultan Khan 227731f8f8 Merge 4 years ago
Amjad amireh e14d619edd child Vaccines 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
Mohammad Aljammal 0d12210116 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers 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
Mohammad Aljammal f543126152 Ambulance Service 4 years ago
haroon amjad 929e289a6f started implementing Covid-19 DriveThru Test Module 4 years ago
Amjad amireh a00b3a133c Blood Denote 4 years ago
haroon amjad 7fdc0da9dc livecare scheduling implemented 4 years ago
Amjad amireh 5e50c0dc32 Blood Denote 4 years ago
Elham Rababah bf6a8cecc6 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/landing/landing_page.dart
	pubspec.yaml
4 years ago
Mohammad Aljammal bae6fe4ad6 fix marge issues 4 years ago
Elham Rababah 37d9eae9ea improve E-referral 4 years ago
Mohammad Aljammal 3946f0355c Merge branches 'master' and 'my_trackers' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
 Conflicts:
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/locator.dart
	lib/pages/landing/landing_page.dart
4 years ago
Mohammad Aljammal 3ffff9686d Done allergies service 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
Elham Rababah b1b6c77d62 Finish H2O Services 4 years ago
Elham Rababah b853bede68 first step from h2o 4 years ago
Mohammad Aljammal 82c2577d36 Done ask doctor service 4 years ago
Elham Rababah ae147b5988 first step from search referrals 4 years ago
Mohammad Aljammal 2952fd56ab Done Active Medications Service 4 years ago
Elham Rababah 1e3ff89dbd finish new e-referral except calling the service 4 years ago
Amjad amireh 24693f2992 Contact us 4 years ago
Elham Rababah f582eee991 make index page of add new referral as page controller 4 years ago
Amjad amireh c2b7507005 Contact us 4 years ago
Elham Rababah 7840ec4c3b finish activation process until step 2 4 years ago
Mohammad Aljammal c01e6095f2 done my trackers 4 years ago
Elham Rababah f1f3b6bd56 first step from e-referral 4 years ago
Mohammad Aljammal 14f3e08077 Merge branch 'amjad_amireh' into 'master'
edit card_position.dart

See merge request Cloud_Solution/diplomatic-quarter!47
4 years ago
Mohammad Aljammal a0300738e8 done My balance 4 years ago