Commit Graph

894 Commits (ff9eaeb09f2f4c7b59b162f3cf97b51a117760d3)
 

Author SHA1 Message Date
Mohammad Aljammal ff9eaeb09f Merge branch 'sultan' into 'development'
reschdule leave

See merge request Cloud_Solution/doctor_app_flutter!230
6 years ago
Sultan Khan ad48415038 reschdule leave 6 years ago
Mohammad Aljammal e404e971c9 Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!227
6 years ago
mosazaid a51239447b Merge branch 'development' into feature-ucaf 6 years ago
Mohammad Aljammal dc9a9ad4f6 Merge branch 'medical-file' into 'development'
medical file

See merge request Cloud_Solution/doctor_app_flutter!229
6 years ago
mosazaid 7983f998bd Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
6 years ago
Mohammad Aljammal f3c3cac09e Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!228
6 years ago
hussam al-habibeh 76cc4d11f8 medical file 6 years ago
Sultan Khan ad967e8aae Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
mosazaid 2f9d4a1034 Merge branch 'development' into feature-ucaf 6 years ago
mosazaid ceb0cde34c finish UCAF design and solve problem on vital signs response 6 years ago
Mohammad Aljammal cb244c02e7 Merge branch 'soap_update' into 'development'
hot fix

See merge request Cloud_Solution/doctor_app_flutter!226
6 years ago
Elham Rababah 3dffd33728 hot fix 6 years ago
Sultan Khan 68cfbf8fc7 doctor leave 6 years ago
Mohammad Aljammal 5e7594f4cd Merge branch 'soap_update' into 'development'
delete Allergy

See merge request Cloud_Solution/doctor_app_flutter!225
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
Mohammad Aljammal 065ce97d57 Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!224
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 cd23186f7b Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!222
6 years ago
mosazaid b5a102add3 Merge branch 'development' into feature-ucaf 6 years ago
Mohammad Aljammal 0e34f60cad Merge branch 'pesrcription-post' into 'development'
Pesrcription post

See merge request Cloud_Solution/doctor_app_flutter!221
6 years ago
mosazaid ee9ca72057 change empty referral message 6 years ago
hussam al-habibeh eef5d57d2f Merge branches 'development' and 'pesrcription-post' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into pesrcription-post 6 years ago
hussam al-habibeh 16b949461d prescription post 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
Mohammad Aljammal e8229e6f12 Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!218
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 0c39dc6693 change on vital signs for uncoment the service 6 years ago
mosazaid 4b5bec8c50 working on UCAF design 6 years ago
Mohammad Aljammal 50c834d740 Merge branch 'design-updates' into 'development'
Design updates

See merge request Cloud_Solution/doctor_app_flutter!213
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
Mohammad Aljammal e70406c954 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!214
6 years ago
Sultan Khan 9adc5ddd8e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 6a8c37e0d7 doctor leave 6 years ago
Elham Rababah 7d550ca15f prevent null 6 years ago
Elham 00e2bb616d Merge branch 'soap_update' into 'development'
small fix remove todo

See merge request Cloud_Solution/doctor_app_flutter!216
6 years ago
Elham Rababah cece85cda7 small fix remove todo 6 years ago
Elham dd47bb3d1e Merge branch 'soap_update' into 'development'
Soap update

See merge request Cloud_Solution/doctor_app_flutter!215
6 years ago
Elham Rababah 2f80af6b74 small fix 6 years ago
Elham Rababah 71b50c8404 First step translations 6 years ago
Sultan Khan 6c894c3d3b sick leave 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
Sultan Khan 9bf07d7117 reschedule leave 6 years ago