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 | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								bbdbc3cc25
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								045584bb28
								
							
								
							
						 | 
						
							
							
								
								voice feature added
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								1b8e3eb895
								
							
								
							
						 | 
						
							
							
								
								some fixes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								a34db1b00c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' into fridayf-fix-bug
							
							
							
							
							
							
							
							# Conflicts:
#	lib/util/translations_delegate_base.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								42d8fc0207
								
							
								
							
						 | 
						
							
							
								
								finish in-patient referral
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								94806c3601
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								19f0d7ede9
								
							
								
							
						 | 
						
							
							
								
								voice feature added
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								6d530301b6
								
							
								
							
						 | 
						
							
							
								
								done first page in ReferralInPatient
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								c9150ef088
								
							
								
							
						 | 
						
							
							
								
								bug fixes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								33545d1180
								
							
								
							
						 | 
						
							
							
								
								work on in paitent referral
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								e445b5bb60
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								b52ba524a3
								
							
								
							
						 | 
						
							
							
								
								updated
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								351c9b5e5c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' into in-patient-changes
							
							
							
							
							
							
							
							# Conflicts:
#	lib/config/localized_values.dart
#	lib/screens/home/home_screen.dart
#	lib/util/translations_delegate_base.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								b6a6f16b31
								
							
								
							
						 | 
						
							
							
								
								add vital sign inPatient
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								37edd8cef9
								
							
								
							
						 | 
						
							
							
								
								add in-patient cards and header
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								360b4d22cf
								
							
								
							
						 | 
						
							
							
								
								in patient change
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								4ed8f716db
								
							
								
							
						 | 
						
							
							
								
								dashboard changes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								f55bb4e60e
								
							
								
							
						 | 
						
							
							
								
								add update page
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								da084d889c
								
							
								
							
						 | 
						
							
							
								
								hot ECG,add a new button and hot fixes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								ffab532e94
								
							
								
							
						 | 
						
							
							
								
								bug fix
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								9268b13312
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								1fb59c17bc
								
							
								
							
						 | 
						
							
							
								
								bug fix
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								1716c0925d
								
							
								
							
						 | 
						
							
							
								
								add soap items as widget
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								b178bc418e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Stepper_header
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								9a0555b715
								
							
								
							
						 | 
						
							
							
								
								design fixes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								bd08e00567
								
							
								
							
						 | 
						
							
							
								
								fix issue on expandable_SOAP_widget
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								3047b655cf
								
							
								
							
						 | 
						
							
							
								
								add Validation for customtextfield
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								25c3bf1bb1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' into soap-objective-feature-re-design
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								0128144f83
								
							
								
							
						 | 
						
							
							
								
								working onm referral card and update on ucaf design
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								eb5e5862ec
								
							
								
							
						 | 
						
							
							
								
								fix bugs
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								7fe7b9bd71
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' into 'soap-objective-feature-re-design'
							
							
							
							
							
							
							
							# Conflicts:
#   lib/config/localized_values.dart
#   lib/util/translations_delegate_base.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								8654109500
								
							
								
							
						 | 
						
							
							
								
								login design updated
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								f8f088fe8c
								
							
								
							
						 | 
						
							
							
								
								design changes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								08a22d949c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_new_design
							
							
							
							
							
							
							
							 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								6e96dda6cd
								
							
								
							
						 | 
						
							
							
								
								finish soap objective new design
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								0d42163034
								
							
								
							
						 | 
						
							
							
								
								finish on history design
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								d2bd3b68e1
								
							
								
							
						 | 
						
							
							
								
								small fix on history
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								fc98e75ec3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into doctor_replay
							
							
							
							
							
							
							
							 Conflicts:
	lib/config/localized_values.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								04f39315b5
								
							
								
							
						 | 
						
							
							
								
								finish doctor replay design
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								c642d88804
								
							
								
							
						 | 
						
							
							
								
								some fixes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								caff27923b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' into patients-new-design
							
							
							
							
							
							
							
							# Conflicts:
#	lib/config/config.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								f57a5bbcef
								
							
								
							
						 | 
						
							
							
								
								working on referral page
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								f09692de31
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								bb2b64179b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'schedule' into 'development'
							
							
							
							
							
							
							
							small fix on replay page
See merge request Cloud_Solution/doctor_app_flutter!397 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								4ec8bcaa81
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								96daecee99
								
							
								
							
						 | 
						
							
							
								
								bug fix
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								34c0b0c119
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'patients-new-design' into 'development'
							
							
							
							
							
							
							
							finish Admission request new design
See merge request Cloud_Solution/doctor_app_flutter!394 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								f280ed731d
								
							
								
							
						 | 
						
							
							
								
								finish Admission request new design
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								5714ed9540
								
							
								
							
						 | 
						
							
							
								
								small fix on replay page
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								ba13ea7140
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'patient_app_services' into 'development'
							
							
							
							
							
							
							
							Patient app services
See merge request Cloud_Solution/doctor_app_flutter!389 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								920ec14bc2
								
							
								
							
						 | 
						
							
							
								
								add new design for Lab Result and Radiology Results
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								1f70498982
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' into patients-new-design
							
							
							
							
							
							
							
							# Conflicts:
#	lib/config/config.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								6eaf448d5a
								
							
								
							
						 | 
						
							
							
								
								working on new design for vital sign and admission request
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								9c111b07dd
								
							
								
							
						 | 
						
							
							
								
								design updates
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								e14e004700
								
							
								
							
						 | 
						
							
							
								
								page updated
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								3c1a65f310
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								eadfe2d6bc
								
							
								
							
						 | 
						
							
							
								
								bug fixes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								4f558dc41d
								
							
								
							
						 | 
						
							
							
								
								fix referral card
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								56f2b5f63a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' into patients-new-design
							
							
							
							
							
							
							
							# Conflicts:
#	lib/screens/patients/patients_screen.dart
#	lib/widgets/patients/profile/profile_medical_info_widget.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								0e05b90c6b
								
							
								
							
						 | 
						
							
							
								
								finish patient profile screen
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								17f8b05748
								
							
								
							
						 | 
						
							
							
								
								Add prescriptions and radiology from the patient app
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								7dae41513f
								
							
								
							
						 | 
						
							
							
								
								Add insurance approval services
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								e515265f11
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
							
							
							
							
							
							
							
							 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								0742d64428
								
							
								
							
						 | 
						
							
							
								
								add lab result services
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								103a1bc6fc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into clinic_list
							
							
							
							
							
							
							
							 Conflicts:
	lib/config/localized_values.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/util/translations_delegate_base.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								bbb1a8ff74
								
							
								
							
						 | 
						
							
							
								
								arrival list updated
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								7ebf36f98f
								
							
								
							
						 | 
						
							
							
								
								add radiology open image
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								cf7d494944
								
							
								
							
						 | 
						
							
							
								
								search pages and dashboard updated
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								376653a344
								
							
								
							
						 | 
						
							
							
								
								dashboard changes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								05ef7a4b25
								
							
								
							
						 | 
						
							
							
								
								dashboard page updated
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								bedf6e7bbe
								
							
								
							
						 | 
						
							
							
								
								fix DA-346
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								332caaae2f
								
							
								
							
						 | 
						
							
							
								
								dashboard issue
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								214dfecb3c
								
							
								
							
						 | 
						
							
							
								
								DA-422
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								388c095d7f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								a309acbf46
								
							
								
							
						 | 
						
							
							
								
								dashboard changes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								083b49aa0a
								
							
								
							
						 | 
						
							
							
								
								fix DA-341
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								1207339b01
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' into admission-request
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								8d154239bb
								
							
								
							
						 | 
						
							
							
								
								finish admission request feature
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								a1c60e692f
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
							
							
							
							
							
							
							
							 Conflicts:
	lib/config/localized_values.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								248367fbe9
								
							
								
							
						 | 
						
							
							
								
								fix DA-220
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								753ef3bfb0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								a5a7425a09
								
							
								
							
						 | 
						
							
							
								
								fix DA-149
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								a618292d20
								
							
								
							
						 | 
						
							
							
								
								bug fixes for DA-284-DA-285
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								f87f851100
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' into feature-ucaf
							
							
							
							
							
							
							
							# Conflicts:
#	lib/core/service/base/lookup-service.dart
#	lib/util/translations_delegate_base.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								2b3a7f33d1
								
							
								
							
						 | 
						
							
							
								
								working on some bug fixes and finish addmission request
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								8b7acf7202
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								6a23c2a137
								
							
								
							
						 | 
						
							
							
								
								bug fix
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								8b992b4189
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' into 'fix_issues'
							
							
							
							
							
							
							
							# Conflicts:
#   lib/config/localized_values.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								494479f1d9
								
							
								
							
						 | 
						
							
							
								
								fix : DA-264 fix merge error
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								437ae3dfb5
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
							
							
							
							
							
							
							
							 Conflicts:
	lib/config/localized_values.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								34692b94c2
								
							
								
							
						 | 
						
							
							
								
								fix : DA-264
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								de1d0283d2
								
							
								
							
						 | 
						
							
							
								
								some lables and translation changes and add search functionality for ListSelectDialog
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								a64088320f
								
							
								
							
						 | 
						
							
							
								
								DA-259 translation bug
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								c2df291029
								
							
								
							
						 | 
						
							
							
								
								DA - 286 Fix
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								6253e2c9a3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_ios
							
							
							
							
							
							
							
							 Conflicts:
	lib/util/translations_delegate_base.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								75efcde0bc
								
							
								
							
						 | 
						
							
							
								
								fix ios
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								cca4e33fce
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' into feature-ucaf
							
							
							
							
							
							
							
							# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								ebc5ba7743
								
							
								
							
						 | 
						
							
							
								
								some fixes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								7db8a42adc
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
							
							
							
							
							
							
							
							 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								e75318799f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' into feature-ucaf
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								ac9fd8c936
								
							
								
							
						 | 
						
							
							
								
								samll fixes for labels and msges
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								c065dbbdb3
								
							
								
							
						 | 
						
							
							
								
								Fixed DA:266
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								913ffc3052
								
							
								
							
						 | 
						
							
							
								
								Fix DA-260,DA-267
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								68d27a451d
								
							
								
							
						 | 
						
							
							
								
								fix general issue
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								9ddfbd3e66
								
							
								
							
						 | 
						
							
							
								
								fix issue  on app drawer
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								484c737836
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								135c852e8c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								735698ce90
								
							
								
							
						 | 
						
							
							
								
								bug fixes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								f0cd33ae43
								
							
								
							
						 | 
						
							
							
								
								fix issue on assessment design
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								1de25aae2f
								
							
								
							
						 | 
						
							
							
								
								fix issue on assessment design
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								537f53c3de
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
							
							
							
							
							
							
							
							 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								cc92fe56c6
								
							
								
							
						 | 
						
							
							
								
								fix DA-154,DA-150
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								e808d48035
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' into feature-ucaf
							
							
							
							
							
							
							
							# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								88f1dc637f
								
							
								
							
						 | 
						
							
							
								
								some fixes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								c11f195e72
								
							
								
							
						 | 
						
							
							
								
								fix DA-192
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								855ed0ac12
								
							
								
							
						 | 
						
							
							
								
								fix 145
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								4a3175830d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_loader
							
							
							
							
							
							
							
							 Conflicts:
	lib/config/localized_values.dart
	lib/screens/dashboard_screen.dart
	lib/util/translations_delegate_base.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								9674eb89d9
								
							
								
							
						 | 
						
							
							
								
								add modification on so
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								f75ab83981
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referralPatient
							
							
							
							
							
							
							
							 Conflicts:
	lib/config/localized_values.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								hussam al-habibeh
							
						 | 
						
							
							
							
							
								
							
								1fa52e0394
								
							
								
							
						 | 
						
							
							
								
								medical dile & Order Procedure translation
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								hussam al-habibeh
							
						 | 
						
							
							
							
							
								
							
								015c3b53c8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into tasks-translation
							
							
							
							
							
							
							
							 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								hussam al-habibeh
							
						 | 
						
							
							
							
							
								
							
								e67233bb21
								
							
								
							
						 | 
						
							
							
								
								medical dile & Order Procedure translation
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								dcb71e5c22
								
							
								
							
						 | 
						
							
							
								
								Add charts to patient vital signs feature
							
							
							
							
							
							
							
							&
Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/util/translations_delegate_base.dart
#	pubspec.yaml 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								23fb2e7297
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referralPatient
							
							
							
							
							
							
							
							 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								6bab2e0b2d
								
							
								
							
						 | 
						
							
							
								
								fix referral patient issue
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								8424e92c4b
								
							
								
							
						 | 
						
							
							
								
								working on vital Sign feature with Charts
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								909940a6d9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								40e9ab864a
								
							
								
							
						 | 
						
							
							
								
								login changes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								97d05c72c2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' into feature-ucaf
							
							
							
							
							
							
							
							# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								21114fc88f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' into 'feature-ucaf'
							
							
							
							
							
							
							
							# Conflicts:
#   lib/config/localized_values.dart
#   lib/util/translations_delegate_base.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								0147e7e49b
								
							
								
							
						 | 
						
							
							
								
								do translation, fix some bugs
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								4f1a892be4
								
							
								
							
						 | 
						
							
							
								
								first step form create episode
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								ca9f1a022b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' into feature-ucaf
							
							
							
							
							
							
							
							# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								fd2a86dca4
								
							
								
							
						 | 
						
							
							
								
								some changes in patientArrivalList And make action when click on vitalSign widget inside pendingReferral
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								a46a61c5cf
								
							
								
							
						 | 
						
							
							
								
								fix get and post issue to make it works with vida
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								7ce1d2dd55
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
							
							
							
							
							
							
							
							 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								87d90a394b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								044ad7b51a
								
							
								
							
						 | 
						
							
							
								
								offtime leave
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								e75e7801aa
								
							
								
							
						 | 
						
							
							
								
								working on UCAF get data
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								ffe7e7c57f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
							
							
							
							
							
							
							
							 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								c3bb408787
								
							
								
							
						 | 
						
							
							
								
								add some translations
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								7983f998bd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' into feature-ucaf
							
							
							
							
							
							
							
							# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								ad967e8aae
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								ceb0cde34c
								
							
								
							
						 | 
						
							
							
								
								finish UCAF design and solve problem on vital signs response
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								68cfbf8fc7
								
							
								
							
						 | 
						
							
							
								
								doctor leave
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								ee9ca72057
								
							
								
							
						 | 
						
							
							
								
								change empty referral message
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								ce164c3cb6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' into feature-ucaf
							
							
							
							
							
							
							
							# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart 
							
						 | 
						
							5 years ago |