Commit Graph

1090 Commits (142fbb93fd533379857803f1e560cb6280c4f386)

Author SHA1 Message Date
mosazaid c44b3d74bb reply changes 4 years ago
mosazaid 1b47b60155 Merge branch 'development' into reply-doctor_changes
# Conflicts:
#	lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart
4 years ago
mosazaid 10441e4af0 referral changes 4 years ago
Elham Rababah 4cdc654348 fix font size in header 4 years ago
Elham Rababah 36caca0e46 test live care and general result header in lab result 4 years ago
mosazaid 663c8d1104 Merge branch 'development' into referral-outpatient 4 years ago
Elham Rababah 8a8b55d2de move show timer to its own file 4 years ago
Elham Rababah 792c85e28a fix live care icon size 4 years ago
mosazaid ec9f628b67 Merge branch 'development' into procedure_refactoring
# Conflicts:
#	lib/core/service/patient/LiveCarePatientServices.dart
4 years ago
Elham Rababah f80215b6bb fix doctor id spelling in live care service, fix colors in 4 years ago
Elham Rababah d57b331df2 add timer 4 years ago
Elham Rababah 8dbfb92f88 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into live_care_appointment
 Conflicts:
	ios/Podfile.lock
4 years ago
Elham Rababah 9692e54b97 fix login issue
# Conflicts:
#	lib/core/viewModel/authentication_view_model.dart
#	lib/root_page.dart
#	lib/widgets/shared/app_drawer_widget.dart
4 years ago
Mohammad Aljammal 151b69ed17 Merge branch 'favourite_prescription' into 'development'
Favourite prescription

See merge request Cloud_Solution/doctor_app_flutter!714
4 years ago
mosazaid c82a4a05d5 medical report design changes 4 years ago
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
4 years ago
mosazaid b16dc2092b liveCare cahnges 5 years ago
Mohammad Aljammal 280f87e514 fix live care issues 5 years ago
hussam al-habibeh da45f8c4b6 prescription refactoring 5 years ago
mosazaid 73cf681e9d lab-result-special 5 years ago
mosazaid 0cd7fa0cb2 working on livecare 5 years ago
Elham Rababah 6d989e3fc3 finish new service for live care 5 years ago
Elham Rababah d49d52458b fix birthOfDate 5 years ago
Elham Rababah 3557e87b75 fix loading issue 5 years ago
Elham Rababah 33ceb01d67 first step from Live care patient list 5 years ago
Elham Rababah 342477beda add rich editor for MedicalReportPage 5 years ago
Elham Rababah 8cac9b6fe9 add rich editor 5 years ago
Mohammad Aljammal 1cc55d809c fix authentication service 5 years ago
Mohammad Aljammal a97a331d87 fix bugs in change the clinic, login page when get the projects and add the special Result 5 years ago
Mohammad Aljammal 57fcd2cdeb fix home page design 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
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 14a3ca8695 fix login screen design 5 years ago
Elham Rababah 515955663a add verification 5 years ago
Mohammad Aljammal 1187c3b605 fix authentication provider 5 years ago
Elham Rababah 9b34c2c833 first step from live care 5 years ago
Elham Rababah 0d8684481d fix sms error and some design issue 5 years ago
Elham Rababah e0be4ec1be move logout function from helper to authentication view model 5 years ago
Elham Rababah c9e7fb9883 small fix 5 years ago
Elham Rababah 1eeaaa48ca remove comment 5 years ago
Elham Rababah 0adcfeccce fix auth bug 5 years ago
Elham Rababah 6815e47814 remove doctor profile view model 5 years ago
Elham Rababah 2e71706cab add UNVERIFIED status 5 years ago
Elham Rababah fd9f93a936 do some refactor and change the code to view model 5 years ago
mosazaid 50b4b8eb50 dashboard change 5 years ago
mosazaid 27f940b473 home design 5 years ago
mosazaid 12bb283a68 Merge branch 'development' into home-refactoring
# Conflicts:
#	lib/screens/home/home_screen.dart
5 years ago
mosazaid 72ee88d567 working on dashboard 5 years ago
Mohammad Aljammal 8e4321b3da Migration dev to Zohaib branch 5 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
5 years ago