Commit Graph

1000 Commits (ab91adff00af7174e26b79a2dfd9e224f850f6fa)
 

Author SHA1 Message Date
Mohammad Aljammal ab91adff00 Merge branch 'fix_loader' into 'development'
Fix loader

See merge request Cloud_Solution/doctor_app_flutter!259
5 years ago
Elham Rababah 4a3175830d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_loader
 Conflicts:
	lib/config/localized_values.dart
	lib/screens/dashboard_screen.dart
	lib/util/translations_delegate_base.dart
5 years ago
Elham Rababah eb90fc0161 fix bug in assessment 5 years ago
Mohammad Aljammal 588d98f8ed Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!258
5 years ago
Sultan Khan 40cfad7f7b login 5 years ago
Elham Rababah 9674eb89d9 add modification on so 5 years ago
Sultan Khan 417ca9401b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan a99b3847ac login completed 5 years ago
Elham Rababah 763d6bb49f finish add loader 5 years ago
Mohammad Aljammal 007adea6ec Merge branch 'tasks-translation' into 'development'
Prescription & procedure body update

See merge request Cloud_Solution/doctor_app_flutter!257
5 years ago
hussam al-habibeh 5150f9b93d Prescription & procedure body update 5 years ago
Elham Rababah bc8a90ef2c first step from fix loader 5 years ago
Mohammad Aljammal fd1caac451 Merge branch 'referralPatient' into 'development'
Referral patient

See merge request Cloud_Solution/doctor_app_flutter!254
5 years ago
Mohammad Aljammal f75ab83981 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referralPatient
 Conflicts:
	lib/config/localized_values.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
5 years ago
Mohammad Aljammal 9147cde86e Merge branch 'tasks-translation' into 'development'
medical dile & Order Procedure translation

See merge request Cloud_Solution/doctor_app_flutter!256
5 years ago
Mohammad Aljammal 5e1d482529 Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!255
5 years ago
hussam al-habibeh 1fa52e0394 medical dile & Order Procedure translation 5 years ago
hussam al-habibeh 015c3b53c8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into tasks-translation
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
5 years ago
hussam al-habibeh e67233bb21 medical dile & Order Procedure translation 5 years ago
mosazaid 8a80aaa423 Merge branch 'development' into feature-ucaf 5 years ago
mosazaid eae0bb443f solve problem with vital signs charts depend on date 5 years ago
Mohammad Aljammal 40ba189036 Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!253
5 years ago
mosazaid d9d4e22531 Merge branch 'development' into feature-ucaf 5 years ago
mosazaid dcb71e5c22 Add charts to patient vital signs feature
&
Merge branch 'development' into feature-ucaf

# Conflicts:
#	lib/util/translations_delegate_base.dart
#	pubspec.yaml
5 years ago
Mohammad Aljammal fa489de0c9 Merge branch 'medical-file' into 'development'
Medical file

See merge request Cloud_Solution/doctor_app_flutter!251
5 years ago
Mohammad Aljammal ff701578a7 Merge branch 'procedure-fix' into 'development'
Procedure fix

See merge request Cloud_Solution/doctor_app_flutter!252
5 years ago
hussam alhababieh d87aeb290f Merge branch 'development' into 'procedure-fix'
# Conflicts:
#   lib/landing_page.dart
5 years ago
hussam al-habibeh b0410dc744 Procedure updates 5 years ago
hussam alhababieh a15569d4c2 Merge branch 'development' into 'medical-file'
# Conflicts:
#   lib/landing_page.dart
5 years ago
hussam al-habibeh debcad3a3d prescription 5 years ago
hussam al-habibeh 4b54ca7d47 prescription 5 years ago
Elham Rababah 23fb2e7297 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referralPatient
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
Elham Rababah 6bab2e0b2d fix referral patient issue 5 years ago
mosazaid 8424e92c4b working on vital Sign feature with Charts 5 years ago
Mohammad Aljammal 7d8310e875 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!250
5 years ago
Sultan Khan 722e1a5c41 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan ad99cebf02 login and drug to drug 5 years ago
Mohammad Aljammal 307463865b Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!249
5 years ago
Mohammad Aljammal 3306d6f400 Merge branch 'medical-file' into 'development'
post Procedure

See merge request Cloud_Solution/doctor_app_flutter!248
5 years ago
hussam al-habibeh dd53a9bd4d post Procedure 5 years ago
mosazaid 306d484837 Merge branch 'development' into feature-ucaf 5 years ago
mosazaid 8726653ffb working on Referral feature 5 years ago
Mohammad Aljammal cc14448d48 Merge branch 'soap_update' into 'development'
fix loader in login

See merge request Cloud_Solution/doctor_app_flutter!247
5 years ago
Elham Rababah 1f2aebde33 fix loader in login 5 years ago
Sultan Khan 909940a6d9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 40e9ab864a login changes 5 years ago
Mohammad Aljammal 16481c8524 Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!246
5 years ago
mosazaid 2f17167e2f some design enhancments 5 years ago
mosazaid db502b7f0d Merge branch 'development' into feature-ucaf 5 years ago
mosazaid 421cee49c7 Merge branch 'feature-ucaf' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago