Commit Graph

249 Commits (e48d4e5eb258ea1fba7b0aab74d66d15e836dfd0)

Author SHA1 Message Date
hussam al-habibeh fe83b91602 body fat texfield fix 5 years ago
hussam al-habibeh 864f849425 Baby age in ovulation period 5 years ago
Fatimah Alshammari 787b55a803 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Fatimah Alshammari 34ccb132dc fixed issues 5 years ago
Fatimah Alshammari 74d0826342 fixed issues 5 years ago
Sultan khan 6a0acd8afb Merge branch 'fix-bugs' into 'development'
Fix bugs

See merge request Cloud_Solution/diplomatic-quarter!355
5 years ago
mosazaid 3077624c58 fix bugs 5 years ago
Sikander Saleem 56c0adaada Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
5 years ago
hussam al-habibeh 4b90f16ab9 baby age in ovulation period 5 years ago
haroon amjad 709877b5f1 Merge branch 'development' into Haroon
# Conflicts:
#	lib/pages/login/forgot-password.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
5 years ago
haroon amjad 90db04cee1 Jira Fixes 5 years ago
Sikander Saleem 083d696c62 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/login.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
hussam al-habibeh 60aaf2a31a Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
 Conflicts:
	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
5 years ago
hussam al-habibeh 352fd912de PAP-664 5 years ago
hussam al-habibeh 29249dc9a9 PAP-664 5 years ago
Sikander Saleem f6ae7ed770 merge changes-4 5 years ago
Sikander Saleem 889ae24f07 merge changes-3 5 years ago
Sikander Saleem c07a8f54c7 merge changes-2 5 years ago
Sikander Saleem 14561d0ac6 merge changes-1 5 years ago
Sikander Saleem a5d40f090a improvements-test 5 years ago
Mirza.Shafique 49bfa2e9a7 Home page 1.3 5 years ago
Sultan Khan ed20ba65b3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 23ca95b9b6 bug fixes 5 years ago
Mohammad Aljammal 9b3a679948 Merge branch 'fix-bugs' into 'development'
fix bugs

See merge request Cloud_Solution/diplomatic-quarter!336
5 years ago
mosazaid e9dbc4be7a fix bugs 5 years ago
Zohaib Iqbal Kambrani 08e0ce52c8 Merge branch 'development' into ZohaibIqbalKambrani
* development:
  fix bugs
5 years ago
Zohaib Iqbal Kambrani 4abdd9bde7 no message 5 years ago
mosazaid 2e33c2b240 fix bugs 5 years ago
Sultan khan 487d63ec7f Merge branch 'bug_fix_mirza' into 'development'
Check-In NFC

See merge request Cloud_Solution/diplomatic-quarter!326
5 years ago
Sikander Saleem eb9005510d bug fixes and insurance approvals improvements. 5 years ago
Mirza.Shafique fb0a67e5bd PAP 828 and 792 issue fix 5 years ago
Sultan khan 15f620d720 Merge branch 'Jul_fixes' into 'development'
Jul fixes

See merge request Cloud_Solution/diplomatic-quarter!322
5 years ago
hussam al-habibeh fefde8f575 jira bugs 5 years ago
hussam al-habibeh 446021eb90 adding doctor list to health calculator 5 years ago
hussam al-habibeh 854352d9ce jira bugs 5 years ago
Sikander Saleem d0c8c4f017 Bug PAP-671, PAP-672 fixed, bottom nav added on H2O screen. 5 years ago
Elham Rababh dd1dff01d6 PAP-790: fix Alignment of mobile number 5 years ago
Sikander Saleem b7fbee3252 improvements 5 years ago
Sikander Saleem d6566d4abf PAP-678 fixed, month & days in axis are aligned now. 5 years ago
Sikander Saleem 1f01f40ad8 PAP-681 fixed, H2O Unit changing & reflection. 5 years ago
Mohammad Aljammal 234e69c02d Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs

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

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

See merge request Cloud_Solution/diplomatic-quarter!264
5 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
5 years ago
mosazaid 0444b21101 Merge branch 'development' into hmg-services-fixing
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Elham Rababah 94ee969406 hhc msg translation 5 years ago
Elham Rababah 8a1924cca2 fix images in hhc 5 years ago
Sultan Khan d33918c932 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sikander Saleem e40ad85d61 H2O feature, setting page added 5 years ago
Sikander Saleem bd062150c1 H2O feature improvement 5 years ago
Sikander Saleem aef4c7bfac H2O feature improvement 5 years ago
Sikander Saleem 3b4e791017 H2O feature improvement 5 years ago
mosazaid 822defbd04 working on bmi calculator design and functionality 5 years ago
Sultan Khan 3ac69692be Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
hussam al-habibeh 1ce0ef7b6c health-converter fix 5 years ago
Sultan Khan ccd2fc5068 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan c65983bfdb code merged 5 years ago
mosazaid 3a45239059 Merge branch 'development' into fix_design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
mosazaid f5d478fd27 re-design child vaccine and fix some funcrionalities 5 years ago
Elham Rababah 4ecce79258 first step from fix CMC 5 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
5 years ago
Elham Rababah d7a046f9ca fix issue on cmc 5 years ago
Mohammad Aljammal b63025a9b3 return CMC HHC 5 years ago
Mohammad Aljammal 634c874eee fix design issues 5 years ago
Mohammad Aljammal 298b4d6525 change color 5 years ago
Mohammad Aljammal 952e106531 return privilege 5 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
5 years ago
Mohammad Aljammal 591d56e624 change the info images and change the out patient color 5 years ago
Mohammad Aljammal 9c12e949e8 hot fixes 5 years ago
Sultan Khan 040c8f38ab hot fixes 5 years ago
Mohammad Aljammal a57d5eb69f hot fixes 5 years ago
haroon amjad 951d9b553f fixes & updates 5 years ago
haroon amjad 9d046fd971 updates & fixes 5 years ago
Sultan Khan ce7a64e86e Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Mohammad Aljammal 9dfd8a71dc Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into privileges
 Conflicts:
	lib/locator.dart
	lib/pages/DrawerPages/family/my-family.dart
	lib/pages/login/confirm-login.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/reports/report_home_page.dart
	lib/widgets/bottom_navigation/bottom_nav_bar.dart
	lib/widgets/drawer/app_drawer_widget.dart
5 years ago
Sultan Khan 542335364e Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Mohammad Aljammal 459ba828d9 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
 Conflicts:
	lib/config/shared_pref_kay.dart
	lib/core/service/client/base_app_client.dart
	lib/locator.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/landing/home_page.dart
	lib/pages/medical/vital_sign/vital_sign_item.dart
	lib/routes.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
	pubspec.yaml
5 years ago
Sultan Khan 496163a61a voice command updated 5 years ago
Mohammad Aljammal 4e2c955b09 add missing translation 5 years ago
Sultan Khan f5b7d35f23 bug fixes 5 years ago
Sultan Khan 8c5746f7b1 bug fixes 5 years ago
Sultan Khan 321d31b3bd voice search page updated 5 years ago
Sultan Khan d69b3676a4 weather indicator in progress 5 years ago