Commit Graph

160 Commits (1f01f40ad81caa0fcbbbdb9d6e0364a6bbf9fc1e)

Author SHA1 Message Date
Sikander Saleem 1f01f40ad8 PAP-681 fixed, H2O Unit changing & reflection. 3 years ago
Mohammad Aljammal 234e69c02d Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs

See merge request Cloud_Solution/diplomatic-quarter!315
4 years ago
hussam al-habibeh bb6e7e931b pharmacy-bugs 4 years ago
Elham Rababah 2a47564c37 PAP-607: fix issue 4 years ago
hussam al-habibeh 14939d3513 jira bugs (Health Calculator) 4 years ago
Elham Rababah aab33b3e03 PAP-609: fix text align 4 years ago
Mohammad Aljammal e04421079e Merge branch 'fix_bugs_Mar' into 'development'
Fix bugs mar

See merge request Cloud_Solution/diplomatic-quarter!301
4 years ago
Elham Rababah 6e7f62ca21 PAP-612: show ok and cancel options 4 years ago
Sultan Khan d4c3b03a5f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 1b770420be bug fixes 4 years ago
Mohammad Aljammal 7c1fd8043b fix chart and eye and balance 4 years ago
Sultan Khan 0445011e53 bug fixes 4 years ago
haroon amjad 454957ebba Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
4 years ago
Sultan Khan 66acce3b40 ancillary order pages added 4 years ago
haroon amjad e0ebb922ed pharmacy fixes 4 years ago
Sultan Khan b891c1bd80 theme issue 4 years ago
Sultan Khan 1a35fe37b6 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
haroon amjad da3ad90ddd added app-wide route transition animation 4 years ago
Mohammad Aljammal 8899bdf460 Done Prescription Delivery Address 4 years ago
Sultan Khan 144ef52c70 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Mohammad Aljammal 87ad027d33 Merge branch 'improve_hhc' into 'development'
Improve hhc

See merge request Cloud_Solution/diplomatic-quarter!264
4 years ago
mosazaid cbe422cbc6 Merge branch 'hmg-services-fixing' into development
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
mosazaid 0444b21101 Merge branch 'development' into hmg-services-fixing
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Elham Rababah 94ee969406 hhc msg translation 4 years ago
Elham Rababah 8a1924cca2 fix images in hhc 4 years ago
Sultan Khan d33918c932 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sikander Saleem e40ad85d61 H2O feature, setting page added 4 years ago
Sikander Saleem bd062150c1 H2O feature improvement 4 years ago
Sikander Saleem aef4c7bfac H2O feature improvement 4 years ago
Sikander Saleem 3b4e791017 H2O feature improvement 4 years ago
mosazaid 822defbd04 working on bmi calculator design and functionality 4 years ago
Sultan Khan 3ac69692be Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
hussam al-habibeh 1ce0ef7b6c health-converter fix 4 years ago
Sultan Khan ccd2fc5068 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan c65983bfdb code merged 4 years ago
mosazaid 3a45239059 Merge branch 'development' into fix_design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
mosazaid f5d478fd27 re-design child vaccine and fix some funcrionalities 4 years ago
Elham Rababah 4ecce79258 first step from fix CMC 4 years ago
Elham Rababah c9edb37a3c Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_hhc_cmc
 Conflicts:
	lib/config/localized_values.dart
	lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
Elham Rababah d7a046f9ca fix issue on cmc 4 years ago
Mohammad Aljammal b63025a9b3 return CMC HHC 4 years ago
Mohammad Aljammal 634c874eee fix design issues 4 years ago
Mohammad Aljammal 298b4d6525 change color 4 years ago
Mohammad Aljammal 952e106531 return privilege 4 years ago
Mohammad Aljammal 18dad434a0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_master
 Conflicts:
	lib/config/config.dart
	lib/core/service/client/base_app_client.dart
	lib/core/service/weather_service.dart
	lib/core/viewModels/dashboard_view_model.dart
	lib/main.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/AlHabibMedicalService/health-weather/health-weather-indicator.dart
	lib/pages/BookAppointment/Search.dart
	lib/pages/ErService/AmbulanceReq.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/ToDoList/ToDo.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/login/login.dart
	lib/pages/login/register.dart
	lib/pages/medical/allergies_page.dart
	lib/pages/medical/balance/advance_payment_page.dart
	lib/pages/medical/doctor/doctor_home_page.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/prescriptions/prescriptions_home_page.dart
	lib/pages/medical/vital_sign/vital_sign_details_screen.dart
	lib/uitl/location_util.dart
	lib/widgets/drawer/app_drawer_widget.dart
	pubspec.yaml
4 years ago
Mohammad Aljammal 591d56e624 change the info images and change the out patient color 4 years ago
Mohammad Aljammal 9c12e949e8 hot fixes 4 years ago
Sultan Khan 040c8f38ab hot fixes 4 years ago
Mohammad Aljammal a57d5eb69f hot fixes 4 years ago
haroon amjad 951d9b553f fixes & updates 4 years ago