Commit Graph

55 Commits (d5afb50ed33dde9f65953d1e84fe2ff6372d32fa)

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
Amjad amireh 83735ab68d modified Child vaccintion note 4 years ago
Amjad amireh 67e3a13a95 child Vaccines add new child modified 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
Amjad amireh e14d619edd child Vaccines 4 years ago
Elham Rababah 293c557b54 First step from Home health care service 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 a00b3a133c Blood Denote 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 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 b853bede68 first step from h2o 4 years ago
Mohammad Aljammal 82c2577d36 Done ask doctor service 4 years ago
Mohammad Aljammal 2952fd56ab Done Active Medications Service 4 years ago
Amjad amireh 24693f2992 Contact us 4 years ago
Mohammad Aljammal 9f06ce7d1d done EyeMeasurements service 4 years ago
Amjad amireh c2b7507005 Contact us 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
Amjad amireh 368db03ab8 edit card_position.dart 4 years ago
Mohammad Aljammal 11f9daa3ff add PatientSickLeave 4 years ago
Mohammad Aljammal fbb4b326a8 Merge branch 'amjad_amireh' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
 Conflicts:
	lib/locator.dart
	pubspec.yaml
4 years ago
Mohammad Aljammal 20f9f6f06c ER 4 years ago
Mohammad Aljammal fe66ee5993 fix lab result issues 4 years ago
Mohammad Aljammal d52e612bff Merge branch 'insurance' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/medical/medical_profile_page.dart
	pubspec.yaml
4 years ago
hussam al-habibeh 3a79ddb488 vaccine service 4 years ago
Mohammad Aljammal 895c09efa4 parking service 4 years ago
Mohammad Aljammal 30c0963063 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/localized_values.dart
	lib/locator.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 8989fbc9b7 done design dashboard 4 years ago
haroon amjad 760db6a873 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/locator.dart
4 years ago
haroon amjad 5f1413a2ac implementing Twilio in LiveCare 4 years ago
Mohammad Aljammal 9cf5c80aae add time line and appointment rate 4 years ago
Mohammad Aljammal b6319c558c Merge branch 'report_service' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
 Conflicts:
	lib/locator.dart
	lib/pages/medical/medical_profile_page.dart
4 years ago
Mohammad Aljammal 2b0e35a907 fix issues in base app client 4 years ago
Amjad Amireh 97dbe62f93 done report service 4 years ago
Mohammad Aljammal a1fa2c0727 done vital sign 4 years ago
Mohammad Aljammal 2e0afdb49c Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into insurance
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/prescriptions/prescriptions_home_page.dart
4 years ago
hussam al-habibeh 492cfa084b insurance card and insurance update and insurance approval 4 years ago
Mohammad Aljammal cfd5b2ccff feedback Service done 4 years ago
Mohammad Aljammal 05222207da Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
 Conflicts:
	lib/config/config.dart
	lib/core/service/client/base_app_client.dart
4 years ago
Mohammad Aljammal a12197fe70 labs result done add some file to git ignore for ios 4 years ago
Mohammad Aljammal 1bbbd18373 labs services 4 years ago