Commit Graph

150 Commits (b5c937bd868791d8b3f314a69d81d237dd831931)

Author SHA1 Message Date
mosazaid b5c937bd86 Working on vitalSigns,
Merge branch 'development' into feature-vital-sign

# Conflicts:
#	lib/routes.dart
4 years ago
Sultan Khan e45220829f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Elham Rababah cde56a82f2 Finish subjective 4 years ago
mosazaid d11a8e6209 Merge branch 'development' into feature-vital-sign
# Conflicts:
#	lib/core/service/base/base_service.dart
#	lib/locator.dart
4 years ago
mosazaid aafcd89222 working on vitalSigns feature 4 years ago
Sultan Khan 5585274b18 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 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
4 years ago
Sultan Khan 5dcc03cfa8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 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
4 years ago
mosazaid 47e9d2a558 Merge branch 'development' into feature--patient-referral
# Conflicts:
#	lib/client/base_app_client.dart
4 years ago
Elham Rababah abbe891673 improve code quality 4 years ago
Elham Rababah bb651478a0 Finish subjective 4 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
4 years ago
Elham Rababah 9b0731d5c8 check activation code 4 years ago
Elham Rababah 7001940d0d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into login_new 4 years ago
mosazaid 7cefbb4dbd add referral pages 4 years ago
Elham Rababah a3dff8c9f8 Post Allergies service 4 years ago
Sultan Khan 989c06ae33 prescription changes 4 years ago
Sultan Khan 8d58348267 dashboard changes 4 years ago
Elham Rababah ef6b1bc50e add master lookups 4 years ago
Sultan Khan e61f3f0281 add sick leave 4 years ago
Elham Rababah dcba85c7b9 Finish first step subjective_page.dart 4 years ago
Elham Rababah 518c30bdeb Merge branches 'SOAP' and 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
 Conflicts:
	lib/config/localized_values.dart
4 years ago
Sultan Khan 4f96cff585 sick leave 4 years ago
Sultan Khan e5d542f1d0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Elham Rababah 81352c2b0e small fix. 4 years ago
Elham Rababah 46cdd9482c First step from SOAP 4 years ago
Sultan Khan ba2697c917 sick leave 4 years ago
Elham Rababah 4eee5cd9d8 new login type 4 years ago
mosazaid bb1f101e94 finish re-design refer-patient screen 4 years ago
Sultan Khan 97d915ef99 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan cc1a63786f sick leave 4 years ago
Sultan Khan 06f71a22fb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
mosazaid 16821c17fc re-design in-patient detail page 4 years ago
Sultan Khan ac747e7519 dashboard 4 years ago
mosazaid e5341e3031 Merge branch 'development' into replay-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/screens/patients/patients_screen.dart
4 years ago
mosazaid f9ae2559f0 working on referral reply screen 4 years ago
Elham 664d2b5c2b Merge branch 'design-updates' into 'development'
patients out and patients in screens design updates

See merge request Cloud_Solution/doctor_app_flutter!177
4 years ago
hussam al-habibeh 6bbc629060 patients out and patients in screens design updates 4 years ago
Elham Rababah 58de54997a refactor search medicine Service 4 years ago
Elham Rababah 91cc76a9cf medicine search fix bugs = 4 years ago
Elham Rababah ec3b69f0cb The Patient services Names the words should be in separate line. 4 years ago
Elham Rababah 53862ec1b3 fix bugs in patient search 4 years ago
Elham Rababah 8980fc03aa Finish Patient search design 4 years ago
Elham Rababah 0d8455faa7 Finish medicine search design 4 years ago
Elham Rababah 871bd6ab20 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into medicine_desgin
 Conflicts:
	lib/config/localized_values.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/shared/app_text_form_field.dart
4 years ago
Elham Rababah fbc99d681f First step from medicine search and change the logo 4 years ago
Mohammad Aljammal 2e4f9fa335 Merge remote-tracking branch 'origin/development' into development 4 years ago
Mohammad Aljammal 146a53a6e5 Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/config/config.dart
	lib/models/pharmacies/pharmacies_List_request_model.dart
	lib/screens/medicine/medicine_search_screen.dart
4 years ago
Elham Rababah e37a3e8ce1 Finish dashboard screen design 4 years ago