Commit Graph

3381 Commits (fbb029e320273e0dee31e6bc7bfd5c7f7b2e4579)
 

Author SHA1 Message Date
Elham Ali 83bea13b8d Merge branch 'registration' into 'development'
translation and ui fixes

See merge request Cloud_Solution/doctor_app_flutter!904
4 years ago
Elham Rababh 92ceb99212 translation for in patient 4 years ago
hussam al-habibeh f3462385fd Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into registration
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
4 years ago
Elham Rababh 14a43ab53a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fixes_nov 4 years ago
Elham Rababh cce0a8377c small fix 4 years ago
hussam al-habibeh 999c2a920d translation and ui fixes 4 years ago
Elham Ali b3bfda9128 Merge branch 'fixes_nov' into 'development'
fix operation reports

See merge request Cloud_Solution/doctor_app_flutter!903
4 years ago
Elham Ali 5d8b521941 Merge branch 'registration' into 'development'
adding countries to registration

See merge request Cloud_Solution/doctor_app_flutter!902
4 years ago
Elham Rababh c17397bf5e fix operation reports 4 years ago
hussam al-habibeh 1c8d25c95c adding countries to registration 4 years ago
Elham Ali 13c05e87dc Merge branch 'fixes_nov' into 'development'
Fixes nov

See merge request Cloud_Solution/doctor_app_flutter!901
4 years ago
Elham Rababh 6ae4d3a7cd small fixes 4 years ago
Elham Rababh eda9aeb26b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fixes_nov 4 years ago
Elham Rababh d1060ba27a small fixes 4 years ago
Elham Rababh bfd86f533a small fixes 4 years ago
Elham Rababh 8df3cf8a33 fixes ios on flutter 2 4 years ago
Elham Rababh 2d4c0a8f50 d
f

fixes
4 years ago
Elham Rababh e4f452fdbc small fixes 4 years ago
Elham Rababh 7e2bddbce9 small fixes 4 years ago
Elham Rababh 3a8d8f9aa7 fix the last errors 4 years ago
Elham Rababh 02e4a37d00 Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2_by_elham
 Conflicts:
	lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart
	lib/screens/patients/profile/UCAF/page-stepper-widget.dart
	lib/screens/patients/register_patient/RegisterConfirmationPatientPage.dart
	lib/screens/patients/register_patient/RegisterSearchPatientPage.dart
4 years ago
Elham Ali 0c10d49ac7 Merge branch 'hussam_flutter_2' into 'flutter_2_developemt'
Hussam flutter 2

See merge request Cloud_Solution/doctor_app_flutter!897
4 years ago
Elham Rababh 26f5e57417 8 step from fix screen 4 years ago
hussam al-habibeh 7d3e59e060 flutter version 2 4 years ago
hussam al-habibeh f53920d040 Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam_flutter_2
 Conflicts:
	lib/core/viewModel/PatientRegistrationViewModel.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_other.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart
	lib/screens/patients/profile/referral/my-referral-detail-screen.dart
	lib/screens/reschedule-leaves/reschedule_leave.dart
4 years ago
Elham Rababh bd64603e82 7 step from fix screen 4 years ago
hussam al-habibeh 8720e281ff flutter version 2 4 years ago
Elham Ali 209954ca55 Merge branch 'flutter_vervion_2_by_elham' into 'flutter_2_developemt'
Flutter vervion 2 by elham

See merge request Cloud_Solution/doctor_app_flutter!896
4 years ago
Elham Rababh 359b337b27 6 step from fix screen 4 years ago
Elham Rababh 28d8449345 Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2_by_elham
 Conflicts:
	lib/models/SOAP/selected_items/my_selected_allergy.dart
4 years ago
hussam al-habibeh 772c2d300d Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam_flutter_2 4 years ago
Elham Ali 49ab6382c3 Merge branch 'hussam_flutter_2' into 'flutter_2_developemt'
flutter 2 models

See merge request Cloud_Solution/doctor_app_flutter!895
4 years ago
Elham Ali 189864f4ba Merge branch 'revert-8a1d88c1' into 'development'
Revert "Merge branch 'hussam_flutter_2' into 'development'"

See merge request Cloud_Solution/doctor_app_flutter!894
4 years ago
Elham Ali 81ae0b04d3 Revert "Merge branch 'hussam_flutter_2' into 'development'"
This reverts merge request !893
4 years ago
Elham Ali 8a1d88c1f6 Merge branch 'hussam_flutter_2' into 'development'
Hussam flutter 2

See merge request Cloud_Solution/doctor_app_flutter!893
4 years ago
Elham Rababh a54ec0ef78 5 step from fix screen 4 years ago
hussam al-habibeh fe20bfd9b9 Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam_flutter_2 4 years ago
hussam al-habibeh 24618e5232 flutter 2 models 4 years ago
Elham Ali 7d835ee280 Merge branch 'hussam_flutter_2' into 'flutter_2_developemt'
Hussam flutter 2

See merge request Cloud_Solution/doctor_app_flutter!892
4 years ago
hussam al-habibeh 1146f613df flutter 2 models 4 years ago
hussam al-habibeh a8adacfc5c Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam_flutter_2
 Conflicts:
	pubspec.lock
4 years ago
Elham Ali 43c670e5b1 Merge branch 'flutter_vervion_2_by_elham' into 'flutter_2_developemt'
4 step from fix screen

See merge request Cloud_Solution/doctor_app_flutter!891
4 years ago
hussam al-habibeh 948b8c877d flutter 2 models 4 years ago
Elham Rababh d808f8b2ac 4 step from fix screen 4 years ago
Elham Ali 1eb2221a00 Merge branch 'flutter_vervion_2_by_elham' into 'flutter_2_developemt'
Flutter vervion 2 by elham

See merge request Cloud_Solution/doctor_app_flutter!890
4 years ago
Elham Rababh f4a9ab14c8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2_by_elham
 Conflicts:
	lib/core/service/patient/profile/discharge_summary_servive.dart
	lib/core/viewModel/profile/discharge_summary_view_model.dart
	lib/screens/patients/profile/discharge_summary/all_discharge_summary.dart
	lib/screens/patients/profile/discharge_summary/discharge_summary.dart
	lib/screens/patients/profile/discharge_summary/pending_discharge_summary.dart
4 years ago
Elham Rababh 1f28a09043 first step from fix screen 4 years ago
Elham Rababh ec83d72038 first step from fix screen 4 years ago
Elham Ali cb29b1021e Merge branch 'flutter_vervion_2_by_elham' into 'flutter_2_developemt'
Flutter vervion 2 by elham

See merge request Cloud_Solution/doctor_app_flutter!889
4 years ago
Elham Rababh dc0f3e7235 fix utils && widget 4 years ago