Commit Graph

109 Commits (dcb93bf5cc58071887b871670cded223780bfc64)

Author SHA1 Message Date
Elham Rababah 0a60b27ab4 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
 Conflicts:
	lib/locator.dart
4 years ago
Mohammad Aljammal ac871bb416 Merge branch 'Blood_Donation' into 'master'
Blood donation

See merge request Cloud_Solution/diplomatic-quarter!58
4 years ago
Elham Rababah dd76ae05a7 fix H2O page issue 4 years ago
Amjad amireh 675d544514 Blood Denote 4 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
4 years ago
Mohammad Aljammal 3946f0355c Merge branches 'master' and 'my_trackers' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
 Conflicts:
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/locator.dart
	lib/pages/landing/landing_page.dart
4 years ago
Mohammad Aljammal d6a27a8e28 change medical profile icons 4 years ago
Elham Rababah 91a8b94382 Merge branch 'E_referral' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/landing/landing_page.dart
4 years ago
Elham Rababah b853bede68 first step from h2o 4 years ago
Mohammad Aljammal 82c2577d36 Done ask doctor service 4 years ago
Elham Rababah 1e3ff89dbd finish new e-referral except calling the service 4 years ago
hussam al-habibeh 3c5adc0a1d HMG Service layout 4 years ago
Mohammad Aljammal 9f06ce7d1d done EyeMeasurements service 4 years ago
Mohammad Aljammal c01e6095f2 done my trackers 4 years ago
Elham Rababah f1f3b6bd56 first step from e-referral 4 years ago
Mohammad Aljammal a0300738e8 done My balance 4 years ago
Mohammad Aljammal 11f9daa3ff add PatientSickLeave 4 years ago
Mohammad Aljammal 153335538a done monthly reports 4 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
4 years ago
Mohammad Aljammal fe66ee5993 fix lab result issues 4 years ago
haroon amjad ce9903fd13 nearest appointment flow implemented 4 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
4 years ago
Mohammad Aljammal 01a011a03d done dashboard page 4 years ago
Sultan Khan 3247378c02 search 4 years ago
Mohammad Aljammal 895c09efa4 parking service 4 years ago
Sultan Khan 5d112b5464 merge 4 years ago
Sultan Khan 8516f7de1b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 9b55309d53 text to speech 4 years ago
Mohammad Aljammal 30c0963063 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/localized_values.dart
	lib/locator.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 8989fbc9b7 done design dashboard 4 years ago
Sultan Khan 2f9885ecf8 family file changes 4 years ago
Sultan Khan 8887ba85fe family file 4 years ago
haroon amjad 732ab90b2f Book Appointment check login 4 years ago
Sultan Khan cb99b2a7a7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 327c4585a6 family file change 4 years ago
Mohammad Aljammal 9cf5c80aae add time line and appointment rate 4 years ago
Mohammad Aljammal f5b16734c6 add time line 4 years ago
Mohammad Aljammal 8495260c5a fix issues in feedback 4 years ago
Sultan Khan 47c42808fd Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 913729fc58 speech search 4 years ago
Mohammad Aljammal 2b0e35a907 fix issues in base app client 4 years ago
haroon amjad 73cf37a3a5 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/core/service/client/base_app_client.dart
4 years ago
haroon amjad b9d913e6a5 Merge fixes & updates 4 years ago
Sultan Khan 03b34115c4 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 3b2f9251dc search 4 years ago
Sultan Khan 4c1a8dc38f new changes 4 years ago
haroon amjad fde47a5c2c Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	lib/core/service/client/base_app_client.dart
4 years ago
haroon amjad 750746aabe updates & fixes 4 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
4 years ago
Mohammad Aljammal b4b33be3e9 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
 Conflicts:
	lib/core/service/client/base_app_client.dart
4 years ago