Commit Graph

60 Commits (83bc2cddceeabcdfd98d4ad08d22fff28c5efaa6)

Author SHA1 Message Date
Sultan Khan 8f18d1025a voice search 5 years ago
Sultan Khan 227731f8f8 Merge 5 years ago
Sultan Khan ea86e88e2e Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 5c859034d6 voice search 5 years ago
Elham Rababah bf6a8cecc6 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/landing/landing_page.dart
	pubspec.yaml
5 years ago
Elham Rababah b853bede68 first step from h2o 5 years ago
Mohammad Aljammal 82c2577d36 Done ask doctor service 5 years ago
Sultan Khan 591e9e9a4c updated 5 years ago
Sultan Khan 0a2cb22042 design issues fixed 5 years ago
Sultan Khan 5e252d21d2 voice search added more medical option 5 years ago
Sultan Khan f5d6864291 voice search coc 5 years ago
Sultan Khan 5d34398998 insurance updated 5 years ago
Sultan Khan a535543863 more pages added on the voice search 5 years ago
Sultan Khan a98bc226e6 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 0f63b922d1 speech to text 5 years ago
Mohammad Aljammal 68466c8d03 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/models/Appointments/DoctorListResponse.dart
	lib/pages/BookAppointment/widgets/DoctorView.dart
	lib/pages/MyAppointments/MyAppointments.dart
	lib/uitl/translations_delegate_base.dart
	pubspec.yaml
5 years ago
Mohammad Aljammal fe66ee5993 fix lab result issues 5 years ago
Sultan Khan f6a3f0e615 family file 5 years ago
haroon amjad ce9903fd13 nearest appointment flow implemented 5 years ago
Sultan Khan 20a17c0070 clinic search 5 years ago
Sultan Khan 4a75215a19 search 5 years ago
Sultan Khan 3a4c016f4e search 5 years ago
Sultan Khan badb4e52df Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Mohammad Aljammal 54b766de81 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/config/shared_pref_kay.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
5 years ago
Sultan Khan e7a3d1a4ab speech search 5 years ago
Sultan Khan f1e0bcf86e speech to tex 5 years ago
Sultan Khan 3247378c02 search 5 years ago
Mohammad Aljammal 895c09efa4 parking service 5 years ago
Sultan Khan 5d112b5464 merge 5 years ago
Sultan Khan 9b55309d53 text to speech 5 years ago
Sultan Khan 8887ba85fe family file 5 years ago
Sultan Khan 327c4585a6 family file change 5 years ago
Sultan Khan 913729fc58 speech search 6 years ago
Sultan Khan 03b34115c4 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 6 years ago
Sultan Khan 3b2f9251dc search 6 years ago
Sultan Khan 4c1a8dc38f new changes 6 years ago
Mohammad Aljammal d093ecd5e6 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
 Conflicts:
	ios/Podfile
	ios/Runner.xcodeproj/project.pbxproj
	lib/config/config.dart
	lib/uitl/translations_delegate_base.dart
6 years ago
Mohammad Aljammal a1fa2c0727 done vital sign 6 years ago
haroon amjad 7d0efda1c4 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/medical/medical_profile_page.dart
#	lib/services/authentication/auth_provider.dart
#	lib/uitl/translations_delegate_base.dart
#	pubspec.yaml
6 years ago
haroon amjad 28fde5c500 My Appointments implemented, Appointment Details functionality updated, Logged In User details added in APIs & other updates 6 years ago
Mohammad Aljammal 05222207da Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
 Conflicts:
	lib/config/config.dart
	lib/core/service/client/base_app_client.dart
6 years ago
Mohammad Aljammal a12197fe70 labs result done add some file to git ignore for ios 6 years ago
Sultan Khan 9d0a2e1e43 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 6 years ago
Sultan Khan 8d0834ff3e login inprogress 6 years ago
haroon amjad 0171664779 Master Merged in to local 6 years ago
Mohammad Aljammal 8de50bfe74 medical - my doctor and prescription services and pages 6 years ago
haroon amjad 7f4fbadfab Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/landing_page.dart
6 years ago
haroon amjad d8fe501341 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/pages/BookAppointment/BookingOptions.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/others/app_scaffold_widget.dart
6 years ago
Mohammad Aljammal 93bfcbc20f Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
 Conflicts:
	lib/pages/landing/landing_page.dart
	pubspec.yaml
6 years ago
Mohammad Aljammal 01b230accf Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into SearchMedicineAndReturnMedicineList
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/main.dart
	lib/pages/landing/landing_page.dart
	lib/uitl/translations_delegate_base.dart
	pubspec.yaml
6 years ago