Commit Graph

287 Commits (b63d8906bce93270e18dd690e188b28f532a76f6)

Author SHA1 Message Date
hussam al-habibeh b63d8906bc Merge branch 'hussam' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/screens/profile_screen.dart
4 years ago
hussam alhababieh a02fe9c83d translation stage two 4 years ago
ibrahim albitar fc1d4c9a9b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 4 years ago
ibrahim albitar 57708de8e4 pharmacies screen scrollview 4 years ago
amjad nabil amireh 640829f454 Merge branch 'Amjad_search' into 'development'
Modify patiant screen icon avatar

See merge request Cloud_Solution/doctor_app_flutter!121
4 years ago
Amjad Amireh 4e62947df2 Modify patiant screen icon avatar 4 years ago
Elham 69b02e29c5 Merge branch 'elham' into 'development'
Elham

See merge request Cloud_Solution/doctor_app_flutter!120
4 years ago
Elham Rababah 574a951fcf finish clinic exept design 4 years ago
hussam alhababieh b0005e72f9 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam 4 years ago
hussam alhababieh b4570d7bd1 translation for pages stage one 4 years ago
Elham Rababah 165d697e33 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 4 years ago
Elham Rababah 5779fb9ad7 change profile based on change clinic 4 years ago
Amjad Amireh 230bdb2430 Modify Dr profile data dynamic size 4 years ago
Elham Rababah ef8dfc5b5f first step form change clinic 4 years ago
ibrahim albitar 09ca836ea7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 4 years ago
ibrahim albitar 6fd43a281d fixing 4 years ago
Mohammad Aljammal f6aec27788 Merge branch 'mohammad' into 'development'
fix issues in Patient

See merge request Cloud_Solution/doctor_app_flutter!115
4 years ago
Mohammad ALjammal d52429564d fix issues in Patient 4 years ago
hussam alhababieh dcbf1312b7 translate dashboard/patient search 4 years ago
hussam alhababieh 097d8df8c0 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam 4 years ago
hussam alhababieh b178f08278 translate dashboard and patient search 4 years ago
Mohammad ALjammal b758ae8196 fix issues 4 years ago
Mohammad ALjammal c7f1c6d174 Merge branch 'ibrahim-merge' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/client/base_app_client.dart
	lib/config/config.dart
	lib/screens/auth/login_screen.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/widgets/auth/verfiy_account.dart
4 years ago
Mohammad ALjammal a3730e4efb fix issues with sultan branch 4 years ago
Mohammad ALjammal 79eb6b19d0 Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge
 Conflicts:
	lib/config/config.dart
	lib/presentation/doctor_app_icons.dart
	lib/screens/dashboard_screen.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
4 years ago
Mohammad ALjammal edd25ff437 Merge branch 'Amjad_search' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge
 Conflicts:
	lib/config/config.dart
4 years ago
Mohammad ALjammal 692674fac0 merge ibrahim 4 years ago
Mohammad ALjammal 80664439d9 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge 4 years ago
Mohammad ALjammal ed857d8d54 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/client/base_app_client.dart
	lib/screens/dashboard_screen.dart
4 years ago
Mohammad ALjammal fc2297394e Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/config/config.dart
	lib/presentation/doctor_app_icons.dart
	lib/screens/dashboard_screen.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
4 years ago
Mohammad ALjammal 06f2aaef4b Merge branch 'ibrahim' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into dev-elham
 Conflicts:
	lib/client/base_app_client.dart
	lib/screens/auth/login_screen.dart
	lib/widgets/auth/login_form.dart
	lib/widgets/auth/verfiy_account.dart
4 years ago
Mohammad ALjammal 114edf8924 Merge remote-tracking branch 'origin/development' into development 4 years ago
Mohammad ALjammal 5294948a58 fix issues 4 years ago
ibrahim albitar e0c65222d2 enhancment insurance approvals 4 years ago
Amjad Amireh 68031519e2 Merge branch 'Amjad_search' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/config/config.dart
4 years ago
Amjad Amireh e0b841a4c1 change font size 4 years ago
Amjad Amireh 3eeac2734b Modify Patiant screen List style 4 years ago
Elham b34aec65b8 Merge branch 'elham' into 'development'
Elham

See merge request Cloud_Solution/doctor_app_flutter!107
4 years ago
Elham 25d42c4a26 Revert "Merge branch 'elham' into 'master'"
This reverts merge request !105
4 years ago
Elham 73fd8932d4 Merge branch 'elham' into 'master'
Elham

See merge request Cloud_Solution/doctor_app_flutter!105
4 years ago
Elham Rababah 395a7947c3 improve auth app 4 years ago
Amjad Amireh 3410d691f8 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Amjad_search
 Conflicts:
	lib/config/config.dart
4 years ago
Mohammad ALjammal 513fcd24b1 Merge remote-tracking branch 'origin/development' into development
# Conflicts:
#	lib/config/config.dart
4 years ago
Mohammad ALjammal 9b065036ae fix issues in get patients service 4 years ago
ibrahim albitar 4638ba56a2 jira fixes 4 years ago
Salman Afzal 11f10f1eea Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
#	lib/config/config.dart
#	lib/screens/dashboard_screen.dart
#	lib/screens/patients/patients_screen.dart
4 years ago
Amjad Amireh f3c20d9866 Modify Patiant screen List style 4 years ago
ibrahim albitar 937f8ecd6a fix 4 years ago
ibrahim albitar 480c64d25a complete refer patient 4 years ago
Elham Rababah d4ba01de5b Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 4 years ago