mosazaid
|
2fabe85b30
|
Merge branch 'development' into medical-profile-services
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
|
mosazaid
|
deb126fdd5
|
meical report changes
|
5 years ago |
Mohammad Aljammal
|
a525787c19
|
Merge branch 'live_care' into 'development'
Live care
See merge request Cloud_Solution/doctor_app_flutter!668
|
5 years ago |
|
mosazaid
|
9e80a1879e
|
Merge branch 'development' into medical-profile-services
# Conflicts:
# lib/locator.dart
|
5 years ago |
|
mosazaid
|
fa830cf4da
|
changes
|
5 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
|
5 years ago |
|
Elham Rababah
|
515955663a
|
add verification
|
5 years ago |
|
mosazaid
|
6192d9a84f
|
working on medical-profile
|
5 years ago |
|
Elham Rababah
|
9b34c2c833
|
first step from live care
|
5 years ago |
|
Mohammad Aljammal
|
2c43cfcdde
|
Merge branch 'home-refactoring' into 'development'
Home refactoring
See merge request Cloud_Solution/doctor_app_flutter!648
|
5 years ago |
|
Elham Rababah
|
e0be4ec1be
|
move logout function from helper to authentication view model
|
5 years ago |
|
Elham Rababah
|
0adcfeccce
|
fix auth bug
|
5 years ago |
|
mosazaid
|
25fb8ea5ae
|
hot fix
|
5 years ago |
|
mosazaid
|
2023ce9b55
|
Merge branch 'development' into home-refactoring
# Conflicts:
# lib/core/viewModel/dashboard_view_model.dart
# lib/screens/home/home_screen.dart
|
5 years ago |
|
mosazaid
|
444afa464e
|
working on feature medical profile
|
5 years ago |
|
mosazaid
|
2cf77bac85
|
fit dashboard design
|
5 years ago |
hussam al-habibeh
|
68e9470273
|
hot fix
|
5 years ago |
|
mosazaid
|
fa194f5e00
|
hot fix
|
5 years ago |
|
mosazaid
|
4f817810c2
|
hot fix
|
5 years ago |
Mohammad Aljammal
|
16519d0ccf
|
hot fix
|
5 years ago |
|
Mohammad Aljammal
|
bf86fcc168
|
fix in note and AddReplayOnReferralPatient
|
5 years ago |
|
mosazaid
|
81d518e725
|
hot fix
|
5 years ago |
Sultan Khan
|
5a42184716
|
voice commad updated
|
5 years ago |
|
mosazaid
|
802bd83ddd
|
design-changes
|
5 years ago |
|
mosazaid
|
eb74002cf0
|
hot fix
|
5 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
|
5 years ago |
|
mosazaid
|
b43b7cafcc
|
working on in-patient screen design
|
5 years ago |
|
Elham Rababah
|
fba71b69ce
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_out_patient_filter
Conflicts:
lib/client/base_app_client.dart
|
5 years ago |
|
Elham Rababah
|
7bc897bf39
|
fix profile issue
|
5 years ago |
|
hussam al-habibeh
|
c24bb604d4
|
DashBoard design fix
|
5 years ago |
|
Elham Rababah
|
0b473f630f
|
translate progress_note_screen
|
5 years ago |
|
Elham Rababah
|
d5d57e7997
|
fix new design issue
|
5 years ago |
|
hussam al-habibeh
|
51e9df7401
|
page translation
|
5 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
|
5 years ago |
|
hussam al-habibeh
|
c86a3dabda
|
page translation
|
5 years ago |
|
mosazaid
|
68f405cb21
|
design fixes
|
5 years ago |
|
mosazaid
|
55895496e1
|
Merge branch 'design-changes' into development
|
5 years ago |
|
mosazaid
|
3d6b55681a
|
fix arabic and font style
|
5 years ago |
Haroon Amjad
|
0244334bb5
|
Update on store
|
5 years ago |
|
Mohammad Aljammal
|
60eb7adab1
|
hot fixes
|
5 years ago |
|
Elham Rababah
|
56a5209d92
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_out_patient
Conflicts:
lib/core/model/PatientSearchRequestModel.dart
lib/core/viewModel/PatientSearchViewModel.dart
lib/locator.dart
|
5 years ago |
|
mosazaid
|
40c0f9f4a0
|
Merge branch 'development' into in-patient_re-design
|
5 years ago |
|
mosazaid
|
3e24278d89
|
in-patient re-design
|
5 years ago |
|
Mohammad Aljammal
|
357e01c846
|
hot fixes
|
5 years ago |
|
Elham Rababah
|
cb67dcc9e1
|
first step from search
|
5 years ago |
|
Mohammad Aljammal
|
d18ca12aac
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!587
|
5 years ago |
|
Sultan Khan
|
099bf81d52
|
homepage and sms popup updated
|
5 years ago |
|
mosazaid
|
ddc266416d
|
some functionality and design changes
|
5 years ago |
|
Mohammad Aljammal
|
f708689d00
|
hot fixes
|
5 years ago |
|
Sultan Khan
|
bbdbc3cc25
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |