Commit Graph

384 Commits (4e62947df203c8c7ea9464eb046a71eabb2fe803)

Author SHA1 Message Date
Amjad Amireh 4e62947df2 Modify patiant screen icon avatar 6 years ago
Amjad Amireh 230bdb2430 Modify Dr profile data dynamic size 6 years ago
Mohammad Aljammal 7be7d715fe Merge branch 'mohammad' into 'development'
Mohammad

See merge request Cloud_Solution/doctor_app_flutter!117
6 years ago
Mohammad ALjammal 94dbecca4a fix issues in login 6 years ago
ibrahim albitar 73844dd4f2 Merge branch 'ibrahim' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 6 years ago
ibrahim albitar 8da67db69f fix patient type dropdown 6 years ago
ibrahim albitar 09ca836ea7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 6 years ago
ibrahim albitar 6fd43a281d fixing 6 years ago
Mohammad ALjammal 0dad77bfa2 fix issues in login 6 years ago
Mohammad ALjammal 69173e8c46 fix issues in login focus 6 years ago
amjad nabil amireh 67c0531fe1 Merge branch 'Amjad_search' into 'development'
Modify date in time in search patient

See merge request Cloud_Solution/doctor_app_flutter!116
6 years ago
Amjad Amireh 66627534a9 Modify date in time in search patiant 6 years ago
Mohammad Aljammal f6aec27788 Merge branch 'mohammad' into 'development'
fix issues in Patient

See merge request Cloud_Solution/doctor_app_flutter!115
6 years ago
Mohammad ALjammal d52429564d fix issues in Patient 6 years ago
hussam alhababieh dcbf1312b7 translate dashboard/patient search 6 years ago
hussam alhababieh 097d8df8c0 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam 6 years ago
hussam alhababieh b178f08278 translate dashboard and patient search 6 years ago
Mohammad ALjammal b758ae8196 fix issues 6 years ago
Mohammad ALjammal fa9e1a344a fix issues 6 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
6 years ago
Mohammad ALjammal a3730e4efb fix issues with sultan branch 6 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
6 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
6 years ago
Mohammad ALjammal 2877aa171e Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge
 Conflicts:
	lib/widgets/auth/verfiy_account.dart
6 years ago
Mohammad ALjammal 692674fac0 merge ibrahim 6 years ago
Mohammad ALjammal 80664439d9 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge 6 years ago
Mohammad ALjammal 2b1391a6bb Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 6 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
6 years ago
Mohammad ALjammal e545d4992c fix issues in dev 6 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
6 years ago
Mohammad ALjammal c8a3beb530 fix issues in dev 6 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
6 years ago
Mohammad ALjammal 114edf8924 Merge remote-tracking branch 'origin/development' into development 6 years ago
Mohammad ALjammal 5294948a58 fix issues 6 years ago
ibrahim albitar e0c65222d2 enhancment insurance approvals 6 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
6 years ago
Elham Rababah 3d8f8680b3 DA-115:add Authentication Type to verfiy account screen 6 years ago
Amjad Amireh e0b841a4c1 change font size 6 years ago
Amjad Amireh 3eeac2734b Modify Patiant screen List style 6 years ago
Elham b34aec65b8 Merge branch 'elham' into 'development'
Elham

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

See merge request Cloud_Solution/doctor_app_flutter!105
6 years ago
Elham Rababah 395a7947c3 improve auth app 6 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
6 years ago
Mohammad ALjammal 513fcd24b1 Merge remote-tracking branch 'origin/development' into development
# Conflicts:
#	lib/config/config.dart
6 years ago
Mohammad ALjammal 9b065036ae fix issues in get patients service 6 years ago
ibrahim albitar 4638ba56a2 jira fixes 6 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
6 years ago
Amjad Amireh f3c20d9866 Modify Patiant screen List style 6 years ago
ibrahim albitar 937f8ecd6a fix 6 years ago