Commit Graph

892 Commits (e404e971c9e7d539e879cfce75d7c30cc2f17a3a)
 

Author SHA1 Message Date
Mohammad Aljammal ed1107ff94 Merge branch 'soap_update' into 'development'
Soap update

See merge request Cloud_Solution/doctor_app_flutter!212
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
Mohammad Aljammal 13be95a0bb Merge branch 'feature_admission_request' into 'development'
Feature admission request

See merge request Cloud_Solution/doctor_app_flutter!210
6 years ago
Sultan Khan 4587fdda59 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan e23bb7ce94 reschedule leave 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 15b0f5c9f6 Merge branch 'login_back' into 'development'
return login

See merge request Cloud_Solution/doctor_app_flutter!209
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 33bb7dd652 Merge branch 'SOAP' into 'development'
Soap

See merge request Cloud_Solution/doctor_app_flutter!208
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
hussam al-habibeh b3567df020 medical file model 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 e9ffbf06a6 Merge branch 'development' into feature_admission_request 6 years ago
hussam al-habibeh 9210600e15 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates 6 years ago
mosazaid 3578c82f62 solve hacking patient screen 6 years ago
mosazaid 095a915a89 Merge branch 'development' into feature_admission_request
# Conflicts:
#	lib/routes.dart
6 years ago
hussam al-habibeh 62984ffb03 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates 6 years ago
mosazaid cb4ee05b40 working on ucaf 6 years ago
hussam al-habibeh ce0303fbce Merge branch 'search_in_soap' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/config/config.dart
6 years ago
hussam al-habibeh adb8033138 update prescription 6 years ago
Mohammad Aljammal 27735c23d5 Merge branch 'search_in_soap' into 'development'
Search in soap

See merge request Cloud_Solution/doctor_app_flutter!207
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
Mohammad Aljammal 45edddb49f Add search in Procedure Screen 6 years ago
Mohammad Aljammal b60b45ab53 Merge branch 'design-updates' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_in_soap
 Conflicts:
	lib/screens/patients/patient_search_screen.dart
6 years ago
Mohammad Aljammal 93bece09d7 add search in SOAP 6 years ago
Elham Rababah f0fd5d30e1 First step from update process 6 years ago
mosazaid ae6cd0e5f8 Merge branch 'development' into feature_admission_request 6 years ago
mosazaid 5142b5b6c7 finish admission request design 6 years ago
hussam al-habibeh b3345a86ef post prescription 6 years ago