hussam al-habibeh
|
7595629c8b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into prescription_refactor
Conflicts:
lib/screens/prescription/add_prescription_form.dart
|
3 years ago |
|
hussam al-habibeh
|
da45f8c4b6
|
prescription refactoring
|
3 years ago |
Mohammad Aljammal
|
ad036f7133
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into text-form-field
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
|
3 years ago |
|
Mohammad Aljammal
|
281a807ec8
|
fix live care
|
3 years ago |
mosazaid
|
41515b311c
|
lab-result-fixes
|
3 years ago |
|
Mohammad Aljammal
|
ac701c9806
|
fix live care issues
|
3 years ago |
|
mosazaid
|
957cf96c16
|
Merge branch 'development' into medical-profile-services
|
3 years ago |
Elham Rababah
|
1367f2bebb
|
add translation
|
3 years ago |
|
mosazaid
|
0ed0dbb5aa
|
livecare changes
|
3 years ago |
|
Elham Rababah
|
d49d52458b
|
fix birthOfDate
|
3 years ago |
|
Elham Rababah
|
33ceb01d67
|
first step from Live care patient list
|
3 years ago |
|
mosazaid
|
2fabe85b30
|
Merge branch 'development' into medical-profile-services
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
3 years ago |
Mohammad Aljammal
|
a525787c19
|
Merge branch 'live_care' into 'development'
Live care
See merge request Cloud_Solution/doctor_app_flutter!668
|
3 years ago |
|
mosazaid
|
9e80a1879e
|
Merge branch 'development' into medical-profile-services
# Conflicts:
# lib/locator.dart
|
3 years ago |
|
Elham Rababah
|
56698a82fd
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into merge_dev_into_auth_refactor
Conflicts:
lib/core/service/home/auth_service.dart
lib/core/viewModel/auth_view_model.dart
lib/core/viewModel/imei_view_model.dart
lib/locator.dart
lib/screens/auth/login_screen.dart
lib/screens/home/home_screen.dart
lib/screens/patients/patient_search/patient_search_screen.dart
lib/widgets/auth/verification_methods.dart
|
3 years ago |
|
Elham Rababah
|
14a3ca8695
|
fix login screen design
|
3 years ago |
|
Elham Rababah
|
515955663a
|
add verification
|
3 years ago |
|
mosazaid
|
6192d9a84f
|
working on medical-profile
|
3 years ago |
|
Elham Rababah
|
9b34c2c833
|
first step from live care
|
3 years ago |
|
Elham Rababah
|
e0be4ec1be
|
move logout function from helper to authentication view model
|
3 years ago |
|
Elham Rababah
|
fd9f93a936
|
do some refactor and change the code to view model
|
4 years ago |
|
mosazaid
|
12bb283a68
|
Merge branch 'development' into home-refactoring
# Conflicts:
# lib/screens/home/home_screen.dart
|
4 years ago |
|
Mohammad Aljammal
|
b3ae86db31
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ZohaibKambrani
Conflicts:
lib/screens/patients/DischargedPatientPage.dart
lib/screens/patients/ReferralDischargedPatientDetails.dart
lib/screens/patients/insurance_approvals_details.dart
lib/screens/patients/patients_screen.dart
lib/screens/patients/profile/note/progress_note_screen.dart
lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart
lib/screens/prescription/update_prescription_form.dart
lib/screens/sick-leave/add-sickleave.dart
lib/widgets/patients/PatientCard.dart
pubspec.lock
|
4 years ago |
|
mosazaid
|
2023ce9b55
|
Merge branch 'development' into home-refactoring
# Conflicts:
# lib/core/viewModel/dashboard_view_model.dart
# lib/screens/home/home_screen.dart
|
4 years ago |
|
mosazaid
|
444afa464e
|
working on feature medical profile
|
4 years ago |
|
mosazaid
|
4f817810c2
|
hot fix
|
4 years ago |
|
Elham Rababah
|
4dcec45603
|
Merge branches 'auth_refactor' and 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into auth_refactor
|
4 years ago |
Sultan Khan
|
302294afad
|
session issue fix
|
4 years ago |
|
Sultan Khan
|
5a42184716
|
voice commad updated
|
4 years ago |
|
Elham Rababah
|
34c58149a0
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into auth_refactor
|
4 years ago |
|
Elham Rababah
|
663d2a942f
|
first step from refactoring auth part
|
4 years ago |
|
mosazaid
|
802bd83ddd
|
design-changes
|
4 years ago |
|
mosazaid
|
7eea1bf4a5
|
Merge branch 'development' into design-changes
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
4 years ago |
|
mosazaid
|
b43b7cafcc
|
working on in-patient screen design
|
4 years ago |
|
Elham Rababah
|
7bc897bf39
|
fix profile issue
|
4 years ago |
|
Elham Rababah
|
0b473f630f
|
translate progress_note_screen
|
4 years ago |
|
hussam al-habibeh
|
51e9df7401
|
page translation
|
4 years ago |
|
hussam al-habibeh
|
b5bebea932
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into app_translation
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
4 years ago |
|
hussam al-habibeh
|
c86a3dabda
|
page translation
|
4 years ago |
|
mosazaid
|
3d6b55681a
|
fix arabic and font style
|
4 years ago |
|
Mohammad Aljammal
|
1dd668ed70
|
hot fixes
|
4 years ago |
|
Mohammad Aljammal
|
21fd90ea8c
|
hot fixes
|
4 years ago |
|
Mohammad Aljammal
|
60eb7adab1
|
hot fixes
|
4 years ago |
|
Mohammad Aljammal
|
c3ac50a859
|
hot fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
4b7688d620
|
showDailog Migration
DateUtils Conflict with Material (DateUtils -> AppDateUtils)
|
4 years ago |
|
mosazaid
|
3e24278d89
|
in-patient re-design
|
4 years ago |
|
mosazaid
|
ddc266416d
|
some functionality and design changes
|
4 years ago |
|
Mohammad Aljammal
|
f708689d00
|
hot fixes
|
4 years ago |
|
Sultan Khan
|
bbdbc3cc25
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
Sultan Khan
|
045584bb28
|
voice feature added
|
4 years ago |