Commit Graph

430 Commits (ff9eaeb09f2f4c7b59b162f3cf97b51a117760d3)

Author SHA1 Message Date
Elham Rababah 3dffd33728 hot fix 6 years ago
Elham Rababah 1cda486268 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
 Conflicts:
	lib/widgets/patients/profile/soap_update/subjective/update_allergies_widget.dart
6 years ago
Elham Rababah 9194d8a44b delete Allergy 6 years ago
mosazaid 3b471aebdc Merge branch 'development' into feature-ucaf 6 years ago
mosazaid 88ee50f7cb change make referral page loading behaviour 6 years ago
Elham b291572767 Merge branch 'soap_update' into 'development'
Fix profile widget

See merge request Cloud_Solution/doctor_app_flutter!223
6 years ago
Elham Rababah 8284f1d475 Fix profile widget 6 years ago
Mohammad Aljammal 812fe10db8 Merge branch 'soap_update' into 'development'
Soap update

See merge request Cloud_Solution/doctor_app_flutter!219
6 years ago
Elham Rababah e054c28234 hide text 6 years ago
mosazaid ce164c3cb6 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
6 years ago
mosazaid 4b5bec8c50 working on UCAF design 6 years ago
Mohammad Aljammal f0f98280b4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/widgets/patients/profile/soap_update/subjective/update_allergies_widget.dart
6 years ago
Sultan Khan 9adc5ddd8e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Elham Rababah 7d550ca15f prevent null 6 years ago
Elham Rababah 2f80af6b74 small fix 6 years ago
Elham Rababah 71b50c8404 First step translations 6 years ago
Elham Rababah ba14d23c05 Merge branches 'development' and 'soap_update' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
 Conflicts:
	lib/widgets/patients/profile/profile_medical_info_widget.dart
6 years ago
Elham Rababah e65740761a add improvement on create episode 6 years ago
Sultan Khan 43a1e56a8b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
hussam al-habibeh 4ffeb31181 update procedure fixes 6 years ago
Mohammad Aljammal d975fb021c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
 Conflicts:
	lib/routes.dart
	lib/util/helpers.dart
6 years ago
Sultan Khan 4587fdda59 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Elham Rababah 423bd49aee Merge branches 'development' and 'soap_update' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
 Conflicts:
	lib/routes.dart
6 years ago
mosazaid b4f813fc2d Merge branch 'development' into feature_admission_request
# Conflicts:
#	lib/locator.dart
#	lib/routes.dart
6 years ago
Mohammad Aljammal 3cb96f35ca Merge branch 'design-updates' into 'development'
Design updates

See merge request Cloud_Solution/doctor_app_flutter!211
6 years ago
hussam al-habibeh 75eda8832d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates 6 years ago
hussam al-habibeh d1a261c847 procedure update 6 years ago
Elham Rababah 856777c648 finish updating functions 6 years ago
mosazaid 0e645c2b1f Merge branch 'development' into feature_admission_request 6 years ago
mosazaid b60bac6d6e working on UCAF design 6 years ago
Elham Rababah f8b195e368 parseHtmlString now working :) 6 years ago
Elham Rababah 3cadd532d8 finish Updating 6 years ago
Sultan Khan 70d11bfe9e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Mohammad Aljammal 93c0bdf32a return login 6 years ago
Sultan Khan b2aef274bb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 3c968f0de1 doctor leave 6 years ago
Elham Rababah 6a7f0e605f Merge branch 'SOAP' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP 6 years ago
Elham Rababah 4caf40a2ab finish plan page 6 years ago
Mohammad Aljammal 1af5f1040f add search in soap update 6 years ago
Mohammad Aljammal d5bde6228a add search in update assessment page 6 years ago
Elham Rababah d8ac550357 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP 6 years ago
Elham Rababah 311bee5136 try to fix get 6 years ago
Elham Rababah 46043efb42 Finish Update objective code Page 6 years ago
Elham Rababah c92a848851 Finish Update Subjective Page 6 years ago
mosazaid 095a915a89 Merge branch 'development' into feature_admission_request
# Conflicts:
#	lib/routes.dart
6 years ago
mosazaid cb4ee05b40 working on ucaf 6 years ago
Mohammad Aljammal a723ecbf1d fix merger 6 years ago
Mohammad Aljammal 5669021add Merge branch 'SOAP' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_in_soap
 Conflicts:
	lib/widgets/patients/profile/SOAP/assessment_page.dart
	lib/widgets/patients/profile/SOAP/subjective/add_allergies_widget.dart
	lib/widgets/patients/profile/SOAP/subjective/subjective_page.dart
6 years ago
Mohammad Aljammal 9bf08e81da Add search button name and hint search text in MasterKeyCheckboxSearchWidget 6 years ago
Elham Rababah 39970fe1a8 get update_subjective_page.dart 6 years ago