Commit Graph

267 Commits (8da67db69fa85a29c10eb11c80c19ed0c268a77b)

Author SHA1 Message Date
ibrahim albitar 6fd43a281d fixing 6 years ago
Mohammad ALjammal b758ae8196 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 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 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 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 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
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
ibrahim albitar 480c64d25a complete refer patient 6 years ago
Elham Rababah d4ba01de5b Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 6 years ago
Elham Rababah a42f06c9ff modify hospital provider to make it call app base 6 years ago
Mohammad ALjammal 4a8b97b189 Merge branch 'mohammad' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/providers/patients_provider.dart
	lib/routes.dart
6 years ago
Mohammad ALjammal 0c94188405 Done Prescription Details Screen 6 years ago
Mohammad ALjammal c1b21dc1c3 Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 6 years ago
ibrahim albitar 14527e19b1 fix issues 6 years ago
unknown ce5ee4a21e Merge branch 'develop' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/providers/patients_provider.dart
	lib/routes.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
6 years ago
Mohammad ALjammal 76f8eba86e create Prescription In and Out Patient 6 years ago
Salman Afzal a48ad33f36 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Salman Afzal a914ff9367 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
#	lib/config/config.dart
#	lib/presentation/doctor_app_icons.dart
6 years ago
unknown 39cc4fa4bf refere to doctor 6 years ago
Elham Rababah 610ae3c1fb add in patient prescription details screen 6 years ago
Amjad Amireh d136537b44 Modify Patiant screen List style 6 years ago
Mohammad ALjammal 2ad96dad88 create Prescription In and Out Patient 6 years ago
Mohammad ALjammal 33b59514a0 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 6 years ago
Mohammad ALjammal c16c8897be Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	lib/screens/dashboard_screen.dart
6 years ago
Elham Rababah 6e5c2aca4d Merge branch 'mohammad' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 6 years ago
Elham Rababah 1e507cca3e finish resend code 6 years ago
Mohammad ALjammal 6d8289a0d4 change bottom bar navigation 6 years ago
Amjad Amireh cc2c0f9a1e Modify Patiant screen List style 6 years ago
Amjad Amireh 49f8da4a05 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Amjad_search 6 years ago