Commit Graph

580 Commits (cc26053bc186c8ff0b3ba463df875331f0cc9878)

Author SHA1 Message Date
hussam al-habibeh 8f04edb450 Merge branch 'hussam' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/landing_page.dart
6 years ago
Mohammad ALjammal aff8f87a2f fix merge issues 6 years ago
hussam al-habibeh c486d7f357 translation stage three 6 years ago
Mohammad ALjammal 63dd8262da Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/screens/dashboard_screen.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
6 years ago
Sultan Khan 79c2de3f96 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
#	fonts/DoctorApp.ttf
#	lib/presentation/doctor_app_icons.dart
6 years ago
hussam alhababieh a02fe9c83d translation stage two 6 years ago
hussam alhababieh b0005e72f9 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam 6 years ago
hussam alhababieh b4570d7bd1 translation for pages stage one 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
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 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 692674fac0 merge ibrahim 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
Elham Rababah 3e05a58dd7 delete app client 6 years ago
Mohammad ALjammal eb09cda2a1 fix issues in patients provider 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
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
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
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
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
Amjad Amireh 49f8da4a05 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Amjad_search 6 years ago
Mohammad ALjammal 8157e1bc31 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Amjad_search 6 years ago
Elham Rababah 40eb7f8064 improve vital sgin and return the correct color to login header 6 years ago
Amjad Amireh 0ed3481b42 Localization comment 6 years ago
Salman Afzal 50e9dc0980 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
#	pubspec.yaml
6 years ago
Amjad Amireh 1935b781d6 Localization comment 6 years ago
Amjad Amireh c792aa1fc7 Change design patiant profile 6 years ago
unknown 40a0c1281a Merge branches 'develop' and 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 6 years ago
unknown 61674bec47 new pages 6 years ago
Amjad Amireh 69a618018d MyPrefered Patiant 6 years ago
unknown 0c112ebca5 finished new screens 6 years ago
unknown 8c46c93e86 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 6 years ago
unknown 9f4802c225 progress note 6 years ago
Mohammad ALjammal 9572e16627 done My Referral Patient and create Base App Client 6 years ago
ibrahim albitar 7f5831335b Merge branch 'develop' into 'master'
Develop

See merge request Cloud_Solution/doctor_app_flutter!70
6 years ago
unknown 1ee2655e63 add new screens 6 years ago
Mohammad ALjammal 1f33e1a901 Add fix data for request in config file 6 years ago
unknown 3653c90665 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 6 years ago
unknown b94011af47 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 6 years ago
her_username 111d90d56f Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	lib/models/patient/patiant_info_model.dart
	pubspec.lock
6 years ago
unknown 0c44c57c2f Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 6 years ago
unknown 35205b7024 patient medical info 6 years ago
Elham Rababah de6f814f56 change client to AppClient 6 years ago
Amjad Amireh ce1a502d32 Doctor id dynamic 6 years ago
Elham Rababah 8ee8ba4581 small fix 6 years ago
Elham Rababah bc395c3fcc add doctor profile to shaerd pref 6 years ago
her_username b07ff8154c update local for doctor replay , my schedule and message screen 6 years ago
her_username f098520a80 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 6 years ago
her_username 3fbc2dabef remove i18n package, change the location localized values,
change provider name and create new provider
6 years ago
her_username cc929ba4a5 update Localizations 6 years ago
unknown 80b6716091 call phramicies 6 years ago
Elham Rababah 49f9841079 add patient route 6 years ago
unknown ae524100f7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 6 years ago
Amjad Amireh 3e25f2c0f4 Patiant search dropdown design 6 years ago
Elham a7807a7e6d Revert "Merge branch 'Amjad_search' into 'master'"
This reverts merge request !39
6 years ago
Amjad Amireh 3f821e0c05 update pataintDesign 6 years ago
Elham Rababah 5a49f83e36 fix login issue by making project id dynamic 6 years ago
unknown c30fcbc2b5 pharmacies list 6 years ago
unknown a59a2d5ad3 pharmacy web services 6 years ago
Amjad Amireh d7b7cc998e Patiant search 6 years ago
unknown a5c62323b0 date picker issue 6 years ago
Elham Rababah c38af9da48 add base url and change the mobile number to mine 6 years ago
Elham Rababah cbd9314691 token Id finally in works 6 years ago
Elham Rababah 4195afc7be Finish verification methods page 6 years ago
Elham Rababah f75c6376b5 add size config in order to help dev build responsive desing 6 years ago
Elham Rababah 47a897a2c9 first step form size config 6 years ago
Elham Rababah cfa0162109 implement basic verifecation type 6 years ago
Elham Rababah ed14157e76 first step from user login 6 years ago