Commit Graph

658 Commits (89729e45379be995cecd024160239ed7548a5335)
 

Author SHA1 Message Date
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 446e09a1fc Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/doctor_app_flutter!113
4 years ago
Mohammad ALjammal b758ae8196 fix issues 4 years ago
Mohammad Aljammal dc81540b7a Merge branch 'ibrahim-merge' into 'master'
Ibrahim merge

See merge request Cloud_Solution/doctor_app_flutter!112
4 years ago
Mohammad ALjammal fa9e1a344a 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 2877aa171e Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge
 Conflicts:
	lib/widgets/auth/verfiy_account.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 3eac5ff2c5 Merge branch 'mohammad' into 'master'
Mohammad

See merge request Cloud_Solution/doctor_app_flutter!110
4 years ago
Mohammad ALjammal 2b1391a6bb Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 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 e545d4992c fix issues in dev 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 8e75d176e6 Merge branch 'dev-elham' into 'development'
Dev elham

See merge request Cloud_Solution/doctor_app_flutter!109
4 years ago
Mohammad ALjammal c8a3beb530 fix issues in dev 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
Elham Rababah 3d8f8680b3 DA-115:add Authentication Type to verfiy account screen 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 fe798233b3 Merge branch 'revert-73fd8932' into 'master'
Revert "Merge branch 'elham' into 'master'"

See merge request Cloud_Solution/doctor_app_flutter!106
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 nabil amireh e68eca359d Merge branch 'Amjad_search' into 'development'
Modify Patiant screen List style

See merge request Cloud_Solution/doctor_app_flutter!104
4 years ago
Amjad Amireh f3c20d9866 Modify Patiant screen List style 4 years ago
ibrahim albitar 937f8ecd6a fix 4 years ago
Elham Rababah a37a5ccd86 DA-114:Reduce the font size for the project list 4 years ago
Elham Rababah be6c77f81b AD-113: Remove Remember Me 4 years ago
Elham Rababah 3e05a58dd7 delete app client 4 years ago
Elham Rababah d44dabd485 Merge branch 'base_app_client_one' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into base_app_client 4 years ago
Elham Rababah e6b99adc80 change calling serivce to base app client 4 years ago
Mohammad ALjammal eb09cda2a1 fix issues in patients provider 4 years ago
ibrahim albitar 480c64d25a complete refer patient 4 years ago
Mohammad ALjammal 334150894a Change http call to BaseAppClient 4 years ago