Commit Graph

754 Commits (25d884c7749c5aa42527f7fd36b9fc4953621b69)
 

Author SHA1 Message Date
mosazaid 25d884c774 Merge branch 'development' into feature-vital-sign
# Conflicts:
#	lib/config/localized_values.dart
#	lib/locator.dart
#	lib/routes.dart
#	lib/util/helpers.dart
#	lib/util/translations_delegate_base.dart
#	lib/widgets/patients/profile/SOAP/add_SOAP_index.dart
#	pubspec.lock
5 years ago
mosazaid b5c937bd86 Working on vitalSigns,
Merge branch 'development' into feature-vital-sign

# Conflicts:
#	lib/routes.dart
5 years ago
Mohammad Aljammal 94cdce2dea Merge branch 'fix_base_app_client' into 'development'
Fix base app client

See merge request Cloud_Solution/doctor_app_flutter!199
5 years ago
Mohammad Aljammal df83883139 fix base app client 5 years ago
Mohammad Aljammal 7c4e0d929f fix base app client 5 years ago
Elham 531a9f0545 Merge branch 'SOAP' into 'development'
Soap

See merge request Cloud_Solution/doctor_app_flutter!198
5 years ago
Elham Rababah ab9740ccdd remove Vida Auth from config 5 years ago
Elham Rababah edef444534 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
 Conflicts:
	lib/config/config.dart
	lib/core/service/base/lookup-service.dart
5 years ago
Elham Rababah 1672d9a3a0 add assessment_page code 5 years ago
Elham Rababah dc4250a4de Post progress Note 5 years ago
Elham Rababah b22fd3f7ba fix listHisProgNotePhysicalExaminationVM 5 years ago
Elham Rababah f97d11183d progress Note 5 years ago
Elham fb962acbc0 Merge branch 'design-updates' into 'development'
Design updates

See merge request Cloud_Solution/doctor_app_flutter!195
5 years ago
mosazaid a71da8e4ef working on vital signs 5 years ago
hussam al-habibeh 47a350a811 prscription and procedure 5 years ago
hussam al-habibeh d3bf97fdd8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/locator.dart
	lib/routes.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/shared/TextFields.dart
	lib/widgets/shared/app_buttons_widget.dart
	lib/widgets/shared/app_text_form_field.dart
	lib/widgets/shared/app_texts_widget.dart
5 years ago
Elham Rababah 1491a04b39 PostPhysicalExam works 5 years ago
Elham 3ca4dceb77 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!197
5 years ago
hussam al-habibeh 697f17f2cd prescription and procedure 5 years ago
Sultan Khan e45220829f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Elham Rababah e6af5a3e39 remove is Auth for test target 5 years ago
Elham Rababah cd46b4317c fix error null thing 5 years ago
Elham Rababah a362901da8 improve code inside my eam 5 years ago
Elham Rababah 4df3b1fb40 First step from examination 5 years ago
Elham Rababah cde56a82f2 Finish subjective 5 years ago
Elham ac7bbfeb49 Merge branch 'SOAP' into 'development'
Soap

See merge request Cloud_Solution/doctor_app_flutter!196
5 years ago
mosazaid d11a8e6209 Merge branch 'development' into feature-vital-sign
# Conflicts:
#	lib/core/service/base/base_service.dart
#	lib/locator.dart
5 years ago
Sultan Khan 1da12873c7 dashboard 5 years ago
mosazaid aafcd89222 working on vitalSigns feature 5 years ago
hussam al-habibeh 1ce6571668 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/config/localized_values.dart
	lib/locator.dart
	lib/routes.dart
	lib/screens/patients/profile/refer_patient_screen.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
	lib/widgets/shared/TextFields.dart
	lib/widgets/shared/app_text_form_field.dart
5 years ago
Sultan Khan 5585274b18 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Elham Rababah d4a1dcfc81 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
 Conflicts:
	lib/client/base_app_client.dart
	lib/core/service/base/lookup-service.dart
5 years ago
Elham Rababah 18d58e7037 remove is Auth for test target 5 years ago
Sultan Khan 384c7cd58a code merged 5 years ago
Elham debcefe7ce Merge branch 'feature--patient-referral' into 'development'
Feature  patient referral

See merge request Cloud_Solution/doctor_app_flutter!194
5 years ago
hussam al-habibeh 749e870ea2 get procedures get prescription 5 years ago
Elham Rababah 26a25f44e0 fix error null thing 5 years ago
Sultan Khan 5dcc03cfa8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Elham Rababah 74d315b887 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
 Conflicts:
	lib/client/base_app_client.dart
5 years ago
Elham Rababah 4560706d55 improve code inside my eam 5 years ago
mosazaid 47e9d2a558 Merge branch 'development' into feature--patient-referral
# Conflicts:
#	lib/client/base_app_client.dart
5 years ago
mosazaid f6ddf7a9eb make logout button close all screen stack and push to login 5 years ago
Elham 4ca2cc0f41 Merge branch 'login_new' into 'development'
Login new

See merge request Cloud_Solution/doctor_app_flutter!193
5 years ago
Elham Rababah abbe891673 improve code quality 5 years ago
Elham Rababah 2658694b70 remove static value 5 years ago
Elham Rababah 9a614b25b5 Finish the login 5 years ago
Elham Rababah e96d38454c First step from examination 5 years ago
Elham Rababah bb651478a0 Finish subjective 5 years ago
mosazaid 4ac8fe4681 finish refferal module except accept/reject referral
&
Merge branch 'development' into feature--patient-referral

# Conflicts:
#	lib/client/base_app_client.dart
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/locator.dart
#	lib/util/translations_delegate_base.dart
5 years ago
Elham Rababah 9b0731d5c8 check activation code 5 years ago