Commit Graph

2422 Commits (html_editor)
 

Author SHA1 Message Date
Elham Rababah d49d52458b fix birthOfDate 5 years ago
Elham Rababah 8e140abee9 make pending service dynamic 5 years ago
Elham Rababah 3557e87b75 fix loading issue 5 years ago
Elham Rababah 1bc01e0ad1 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into html_editor 5 years ago
Elham Rababah 97a855ab70 return condition in home page 5 years ago
Mohammad Aljammal c1fad32a9a Merge branch 'medical-profile-services' into 'development'
Medical profile services

See merge request Cloud_Solution/doctor_app_flutter!681
5 years ago
Elham Rababah 5778a4a887 view list of Live care patient 5 years ago
mosazaid fef70604be Merge branch 'development' into medical-profile-services
# Conflicts:
#	lib/config/config.dart
5 years ago
mosazaid 186461f3a8 hot fix 5 years ago
Mohammad Aljammal 08d72ed121 Merge branch 'prescription_changes' into 'development'
Procedure template service

See merge request Cloud_Solution/doctor_app_flutter!680
5 years ago
Elham Rababah c4b434497a Merge branches 'development' and 'html_editor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into html_editor
 Conflicts:
	lib/screens/home/home_screen.dart
5 years ago
Elham Rababah 33ceb01d67 first step from Live care patient list 5 years ago
hussam al-habibeh d50740b9b9 Procedure template service 5 years ago
Mohammad Aljammal acd709368b Merge branch 'medical-profile-services' into 'development'
Medical profile services

See merge request Cloud_Solution/doctor_app_flutter!679
5 years ago
mosazaid 70d171a599 Merge branch 'development' into medical-profile-services 5 years ago
mosazaid 67e0cac742 add livecare to home 5 years ago
Mohammad Aljammal 9a7d1d457d Merge branch 'expansion_procedure' into 'development'
Fix Expansion Procedure

See merge request Cloud_Solution/doctor_app_flutter!678
5 years ago
Mohammad Aljammal 172b457092 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into expansion_procedure
 Conflicts:
	lib/client/base_app_client.dart
	lib/config/config.dart
5 years ago
Mohammad Aljammal 40b4a83c6b Fix Expansion Procedure 5 years ago
Mohammad Aljammal fa479ce258 Merge branch 'prescription_changes' into 'development'
favourite template Procedure service

See merge request Cloud_Solution/doctor_app_flutter!677
5 years ago
hussam al-habibeh c182928a5d favourite template Procedure service 5 years ago
Mohammad Aljammal 0603ea1e40 Merge branch 'html_editor' into 'development'
add rich editor for MedicalReportPage

See merge request Cloud_Solution/doctor_app_flutter!676
5 years ago
Mohammad Aljammal b57eff1010 Merge branch 'fix_home_design' into 'development'
Fix home design

See merge request Cloud_Solution/doctor_app_flutter!675
5 years ago
Mohammad Aljammal 16dac03b24 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_home_design
 Conflicts:
	lib/locator.dart
	lib/screens/home/home_screen.dart
5 years ago
Elham Rababah 342477beda add rich editor for MedicalReportPage 5 years ago
Mohammad Aljammal f6539c82a6 add live care card in home page 5 years ago
Mohammad Aljammal 061ab6d89c Merge branch 'prescription_changes' into 'development'
Prescription changes

See merge request Cloud_Solution/doctor_app_flutter!674
5 years ago
hussam al-habibeh 3801d7b59a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into prescription_changes
 Conflicts:
	lib/client/base_app_client.dart
	lib/config/config.dart
5 years ago
hussam al-habibeh e1d00b87ad favourite template Procedure service 5 years ago
Mohammad Aljammal 5b94a19b60 Merge branch 'html_editor' into 'development'
add rich editor

See merge request Cloud_Solution/doctor_app_flutter!673
5 years ago
Elham Rababah 8cac9b6fe9 add rich editor 5 years ago
Mohammad Aljammal 5a525a79f0 Merge branch 'medical-profile-services' into 'development'
Medical profile services

See merge request Cloud_Solution/doctor_app_flutter!672
5 years ago
mosazaid 9e552668c7 Merge branch 'development' into medical-profile-services 5 years ago
mosazaid 2fabe85b30 Merge branch 'development' into medical-profile-services
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
Mohammad Aljammal ced2e533f0 Merge branch 'fix_home_design' into 'development'
fix authentication service

See merge request Cloud_Solution/doctor_app_flutter!671
5 years ago
Mohammad Aljammal 1cc55d809c fix authentication service 5 years ago
mosazaid deb126fdd5 meical report changes 5 years ago
Mohammad Aljammal 71955ca694 Merge branch 'fix_home_design' into 'development'
fix bugs in change the clinic, login page when get the projects and add the special Result

See merge request Cloud_Solution/doctor_app_flutter!670
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
hussam al-habibeh 623f2730e8 Procedure card design update 5 years ago
hussam al-habibeh 066acc404a Procedure template service 5 years ago
Mohammad Aljammal 759efa0d68 Merge branch 'fix_home_design' into 'development'
fix home page design

See merge request Cloud_Solution/doctor_app_flutter!669
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
mosazaid 9e80a1879e Merge branch 'development' into medical-profile-services
# Conflicts:
#	lib/locator.dart
5 years ago
mosazaid fa830cf4da changes 5 years ago
Mohammad Aljammal e5cee51ba9 Merge branch 'merge_dev_into_auth_refactor' into 'development'
Merge dev into auth refactor

See merge request Cloud_Solution/doctor_app_flutter!667
5 years ago
Elham Rababah d574dd0b16 return base app client 5 years ago
Elham Rababah 164a7fd2fc fix merge issues 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