Commit Graph

488 Commits (efced34ffa002d398eae4c08185eb2bc6e829e44)

Author SHA1 Message Date
Mirza.Shafique 2a4e0a604a Medical Perscription 1.1 4 years ago
Mohammad Aljammal db128e5091 Merge branch 'blood_pressure' into 'development'
fix prescription add reminder

See merge request Cloud_Solution/diplomatic-quarter!363
4 years ago
Elham Rababh 13737548bb Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages 4 years ago
Sikander Saleem 458dc2474b Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sikander Saleem 047941fffc Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Elham Rababh ab2fc6aa2c fix issues related to footer 4 years ago
hussam al-habibeh 428b45528b fix prescription add reminder 4 years ago
Mirza.Shafique 8c8a9c7ce2 Medical Perscription 1.0 4 years ago
Sikander Saleem 350ff20a1a my doctor screen. 4 years ago
Mirza.Shafique 24b7a8a4c4 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Sikander Saleem 6c8f1c6185 merge improvement. 4 years ago
Mirza.Shafique cbadcd5feb Vital Sings Detail Page 1.0 4 years ago
Sikander Saleem 197e7d5742 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/medical/patient_sick_leave_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
4 years ago
Elham Rababh f85c359cf4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
 Conflicts:
	lib/pages/landing/landing_page.dart
4 years ago
Elham Rababh 69df61afb1 remove footer from pharmacy pages 4 years ago
Mirza.Shafique e91cf4762a Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 4 years ago
Mirza.Shafique d865e97ce1 Vital Sings Home Page 4 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
4 years ago
Mohammad Aljammal d9fabbab17 Fix feedback 4 years ago
Fatimah Alshammari 74d0826342 fixed issues 4 years ago
hussam al-habibeh b9d4195e20 Blood pressure translation issue 4 years ago
Sultan khan 3c2a89cd8e Merge branch 'Aug_fixes' into 'development'
fix issues related to wight and  sugar blood

See merge request Cloud_Solution/diplomatic-quarter!354
4 years ago
Elham Rababh 8629b62fcb fix issue 4 years ago
Elham Rababh 1568698b98 fix issues related to wight and sugar blood 4 years ago
Sikander Saleem 6ee56cba0d Merge branch 'login_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/widgets/data_display/medical/doctor_card.dart
#	lib/widgets/new_design/doctor_header.dart
4 years ago
Sikander Saleem bb20d65b40 lab result detail screen. 4 years ago
Mirza.Shafique 66efbc1bac Radiology Implementation 4 years ago
Mirza.Shafique 26c30038c9 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 4 years ago
Mirza.Shafique 29fd552874 Weight, height and blood pressure on Home Page 4 years ago
Sikander Saleem 3a1af590ff lab result detail screen (cont.) 4 years ago
hussam al-habibeh 0a3c44b5e8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medication_availability
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
Elham Rababh 8626b4f269 first step from add footer for all pages 4 years ago
haroon amjad e28fdaade1 Dental Invoices implementation completed 4 years ago
Sikander Saleem 5b778f0493 appointment ui (cont.) & improvement. 4 years ago
haroon amjad a32501f3dc My invoices implementation continued 4 years ago
Sikander Saleem 56c0adaada Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
Sikander Saleem 4db432b351 lab results working(cont.) & improvements 4 years ago
hussam al-habibeh d3868844de Medication availability 4 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
4 years ago
haroon amjad 90db04cee1 Jira Fixes 4 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
4 years ago
Mirza.Shafique 32e867421f Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/uitl/date_uitl.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
hussam al-habibeh 02df6f4d85 PAP-664 4 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
4 years ago
Mirza.Shafique bbaeec5b85 Medical Profile Complete 4 years ago
Sikander Saleem f6ae7ed770 merge changes-4 4 years ago
Sikander Saleem 889ae24f07 merge changes-3 4 years ago
Sikander Saleem c07a8f54c7 merge changes-2 4 years ago
Sikander Saleem 14561d0ac6 merge changes-1 4 years ago
Sultan Khan c9fe036b99 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sikander Saleem a5d40f090a improvements-test 4 years ago
hussam al-habibeh 146fc5d2b2 PAP-777 4 years ago
Mirza.Shafique a20185b2b9 Home page 1.4 (Homepage changes) 4 years ago
hussam al-habibeh 6ea06ce442 PAP-729 4 years ago
Mirza.Shafique 49bfa2e9a7 Home page 1.3 4 years ago
Elham Rababh 8b8e239d3f fix button 4 years ago
Elham Rababh b01961e45f fix translate issues 4 years ago
Sultan Khan d88e3faa6b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan khan 772dcba287 Merge branch 'Aug_fixes' into 'development'
PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.

See merge request Cloud_Solution/diplomatic-quarter!338
4 years ago
Sultan Khan ed20ba65b3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Elham Rababh 7ad4e03c1a PAP-715 : Y –axis and X –axis values should be display in the yearly graph details. 4 years ago
Haroon Amjad 47e521fe1d Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/pages/feedback/send_feedback_page.dart
#	lib/pages/landing/home_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
4 years ago
Sultan Khan 8766a69928 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
hussam al-habibeh d5c76b5400 jira bugs 4 years ago
hussam al-habibeh 6dc0d89f61 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
 Conflicts:
	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
	lib/uitl/utils.dart
4 years ago
hussam al-habibeh 981e78936e jira bugs 4 years ago
Sultan Khan 446f86dbcf Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Elham Rababh 5d05b09345 PAP-712 : fixes on Blood sugar 4 years ago
Sultan Khan c88bea4461 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 9acb5b087d bug fixes 4 years ago
Elham Rababh 52816a9cfe PAP-723 : system should display the empty graph in the blood pressure screen. 4 years ago
Elham Rababh f824063e82 PAP-726 : fix show Arabic values for the select Arm 4 years ago
Elham Rababh f92567f877 PAP-718 : fix show data after save 4 years ago
Sultan khan 9196367da4 Merge branch 'bug_fix_mirza' into 'development'
Medical Profile Buttons Lock

See merge request Cloud_Solution/diplomatic-quarter!329
4 years ago
Mirza.Shafique 2fda47baf6 Medical Profile Buttons Lock 4 years ago
Sultan Khan 3c2539d5b9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 14ef096c32 changes and fixes 4 years ago
Haroon Amjad fde658fd5d Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
4 years ago
Mirza.Shafique e934e7cd2c Merge Fix 4 years ago
haroon amjad 0d2a91c124 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 4 years ago
hussam al-habibeh 8d8fbc3edc jira bugs 4 years ago
Sultan khan 15f620d720 Merge branch 'Jul_fixes' into 'development'
Jul fixes

See merge request Cloud_Solution/diplomatic-quarter!322
4 years ago
hussam al-habibeh fefde8f575 jira bugs 4 years ago
haroon amjad 7b6270c67f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 4 years ago
Sultan khan 924f9bedc0 Merge branch 'bug_fixing' into 'development'
Bug fixing

See merge request Cloud_Solution/diplomatic-quarter!319
4 years ago
Mirza.Shafique 58d5734f1a Bug Fix: 873, 878 to 881 4 years ago
Sikander Saleem 38f134b6ff Bug PAP-884 fixed, email was not updating. 4 years ago
hussam al-habibeh 446021eb90 adding doctor list to health calculator 4 years ago
hussam al-habibeh 854352d9ce jira bugs 4 years ago
Sikander Saleem b2e9060c3f Bug PAP-877 fixed, blood tracker exception. 4 years ago
Elham Rababh 4217fc0826 PAP-685: fix issue 4 years ago
Fatimah Alshammari b98d8b3a46 fixed prescription issue 5 years ago
haroon amjad 6b675acc94 Merge branch 'development' into Haroon
# Conflicts:
#	lib/pages/feedback/send_feedback_page.dart
5 years ago
Mohammad Aljammal 9a850d0ca3 fix advance payment 5 years ago
haroon amjad f754e48034 Merge branch 'development' into Haroon
# Conflicts:
#	lib/widgets/in_app_browser/InAppBrowser.dart
5 years ago
mosazaid b623bd0dce Merge branch 'development' into fix_bugs 5 years ago
mosazaid e5474b3062 fix perscription pages bugs 5 years ago
Mohammad Aljammal 7c1fd8043b fix chart and eye and balance 5 years ago
haroon amjad 9c1fdf96f4 Merge branch 'development' into Haroon 5 years ago
haroon amjad accc39d972 jira bug fixes 5 years ago
Mohammad Aljammal b36e00d2a5 fix the line chart issues 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 e6da54c201 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
 Conflicts:
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 8899bdf460 Done Prescription Delivery Address 5 years ago
haroon amjad 5e8e3806d6 Covid Drive-Thru implemented 5 years ago
Sultan Khan 144ef52c70 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan b3e6c4efda voice command changes 5 years ago
haroon amjad ba10014b46 Merge branch 'development' into Haroon 5 years ago
Mohammad Aljammal 0098345d05 add Prescription Delivery Address Page amd fix the Authentication Pharmacy 5 years ago
haroon amjad 83cca264f1 Merge branch 'LamaHerbish' into Haroon 5 years ago
HMG\Lama.Herbish 031be1ac56 fixes 5 years ago
haroon amjad b6c617888b Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/localized_values.dart
5 years ago
Sultan Khan 3ac69692be Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Mohammad Aljammal 3e441c55b2 fix bottom nav bar 5 years ago
Mohammad Aljammal 9d8c1ddf63 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
 Conflicts:
	lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 484cca086e fix my my Trackers 5 years ago
haroon amjad 7c538b350f LiveCare Scheduling finalized, Appointments in ToDo list categorized 5 years ago
Mohammad Aljammal db2376f50c fix blood and weight on my trackers 5 years ago
Sultan Khan ccd2fc5068 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
haroon amjad 6945230965 Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/pages/Covid-DriveThru/covid-drivethru-location.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/medical/smart_watch_health_data/health_data_list.dart
#	lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart
#	lib/uitl/translations_delegate_base.dart
#	pubspec.yaml
5 years ago
mosazaid 38d52b52c8 Merge branch 'development' into fix_design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/locator.dart
5 years ago
mosazaid 174534d8a5 fix Blood donation functionality and design 5 years ago
Mohammad Aljammal f883e1bd78 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
 Conflicts:
	lib/config/localized_values.dart
5 years ago
Mohammad Aljammal 0b1014a91c fix blood sugar service on my tracker 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
Mohammad Aljammal 200334d8f8 Fix ER service 5 years ago
Mohammad Aljammal b63025a9b3 return CMC HHC 5 years ago
Mohammad Aljammal 30ddea6419 hot fixing 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 f77d2b497e fix issues 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 6bda03e935 hot fixing 5 years ago
Mohammad Aljammal 519a474d41 fix live care label and vital sign data 5 years ago
Mohammad Aljammal 5e3f6363cf fix issues 5 years ago
Mohammad Aljammal 591d56e624 change the info images and change the out patient color 5 years ago
Mohammad Aljammal 5e29dff448 fix issues insurance and medical profile order 5 years ago
Mohammad Aljammal b9958acd53 fix issues 5 years ago
Mohammad Aljammal 2059b76fc1 fix Medical profile 5 years ago
Mohammad Aljammal 4d8f42b517 fix issues vital sign issue 5 years ago
Mohammad Aljammal f6983c138a fix issues 5 years ago
Mohammad Aljammal 9c12e949e8 hot fixes 5 years ago
Mohammad Aljammal 9c18c69d90 hot fixes 5 years ago
Mohammad Aljammal 7167d58ce2 fix merge issues 5 years ago
Mohammad Aljammal aa89a05f1d Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
 Conflicts:
	ios/Flutter/.last_build_id
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/config/shared_pref_kay.dart
	lib/core/service/client/base_app_client.dart
	lib/core/service/medical/prescriptions_service.dart
	lib/core/viewModels/project_view_model.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/BookAppointment/BookConfirm.dart
	lib/pages/BookAppointment/DoctorProfile.dart
	lib/pages/DrawerPages/family/my-family.dart
	lib/pages/MyAppointments/MyAppointments.dart
	lib/pages/MyAppointments/models/ArrivedButtons.dart
	lib/pages/MyAppointments/widgets/AppointmentActions.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/ToDoList/ToDo.dart
	lib/pages/feedback/send_feedback_page.dart
	lib/pages/insurance/insurance_approval_screen.dart
	lib/pages/insurance/insurance_card_screen.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/login/confirm-login.dart
	lib/pages/login/login.dart
	lib/pages/medical/balance/my_balance_page.dart
	lib/pages/medical/labs/laboratory_result_page.dart
	lib/pages/medical/labs/labs_home_page.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/patient_sick_leave_page.dart
	lib/pages/medical/prescriptions/prescription_details_page.dart
	lib/pages/medical/prescriptions/prescription_items_page.dart
	lib/pages/medical/radiology/radiology_details_page.dart
	lib/pages/medical/radiology/radiology_home_page.dart
	lib/pages/medical/reports/report_home_page.dart
	lib/pages/medical/reports/reports_page.dart
	lib/pages/pharmacies/pharmacies_list_screen.dart
	lib/pages/settings/profile_setting.dart
	lib/services/authentication/auth_provider.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/buttons/floatingActionButton.dart
	lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
	lib/widgets/data_display/medical/doctor_card.dart
	lib/widgets/drawer/app_drawer_widget.dart
	lib/widgets/others/app_scaffold_widget.dart
5 years ago
Mohammad Aljammal d9759560c3 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
 Conflicts:
	lib/config/localized_values.dart
	lib/pages/login/login.dart
5 years ago
Mohammad Aljammal 02d72fa27c fix issues 5 years ago
haroon amjad a7dc2fdfd1 Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon 5 years ago
haroon amjad 781fd1c287 Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal f38f53587b fix issues 5 years ago
Mohammad Aljammal 3122f2438b fix import dialog 5 years ago
Mohammad Aljammal 19f12116c4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix 5 years ago
Mohammad Aljammal de1e352e98 fix charts and vital sign 5 years ago
Haroon Amjad b9269f525a hot fixes 5 years ago
Haroon Amjad c67d41701d Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Haroon Amjad 5606c88715 hot fixes 5 years ago
Mohammad Aljammal 92e6275162 Add Confirm send email dialog 5 years ago
haroon amjad 051bd1e23f Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
Mohammad Aljammal b25bdbb6fa fix LiveChatPage Service LabOrderResult MedicineSearch issues 5 years ago
Sultan Khan 557b8e814f voice command 5 years ago
Mohammad Aljammal a2ec01be5d Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
 Conflicts:
	lib/config/localized_values.dart
	lib/pages/landing/home_page.dart
	lib/pages/medical/radiology/radiology_details_page.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 2f77592bac fix Prescriptions Service and design issues 5 years ago
Mohammad Aljammal 62b923b25e fix send rad report email 5 years ago
Mohammad Aljammal 5083080ba3 fix vital sign details 5 years ago
Sultan Khan 188b72bb90 voice command 5 years ago
haroon amjad d14e7e5223 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal eca2266f7b hot fixing 5 years ago
haroon amjad 8d20762050 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
haroon amjad 33956db22a Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/config/config.dart
5 years ago
haroon amjad b55681a056 Working on steps tracking 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
Mohammad Aljammal 4d203c8a5b fix LabResult 5 years ago
haroon amjad 468bb0356c updates & fixes 5 years ago
Mohammad Aljammal 935e72975c add new privilege 5 years ago
haroon amjad e495d3e5ad Health Data integration implementing 5 years ago
haroon amjad cf6686e413 Merge branch 'master' into Haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/Covid-DriveThru/covid-drivethru-location.dart
#	lib/uitl/translations_delegate_base.dart
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
Mohammad Aljammal 9e8def6584 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
5 years ago
Mohammad Aljammal 4e2c955b09 add missing translation 5 years ago
haroon amjad dfa1952f4d Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app 5 years ago
Mohammad Aljammal ced86de9fe Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into images_info
 Conflicts:
	lib/config/localized_values.dart
	lib/pages/medical/balance/advance_payment_page.dart
	lib/pages/medical/balance/my_balance_page.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 269f682bd5 Added info images description 5 years ago
haroon amjad f1a8e09a59 Added info images description 5 years ago
haroon amjad 47b030eb82 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	ios/Flutter/.last_build_id
#	lib/config/config.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad 7edb0c8009 Doctor rating dialog revamped 5 years ago
Mohammad Aljammal 3daef6e53f add images info 5 years ago
Mohammad Aljammal dc898a799d Add Privileges 5 years ago
haroon amjad 0181043da8 Ereferral fixes, smartwatch health data integration 5 years ago
Zohaib Kambrani 27182ee8db no message 5 years ago
haroon amjad 97b8aeeff5 Version Control finished 5 years ago
haroon amjad e5feef8a9d Updates & UI Fixes 5 years ago
Mohammad Aljammal a556e8c1f8 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
 Conflicts:
	lib/config/config.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
5 years ago
Mohammad Aljammal b6d2878cf1 add Radiology translations and colors 5 years ago
Mohammad Aljammal b504f379de fix lab result translations and colors 5 years ago
haroon amjad d284ceac04 advance payment & payment flow issues fixed 5 years ago
Mohammad Aljammal 91cada6901 fix Advance Payment 5 years ago
Mohammad Aljammal dcbc0de69f fix prescription 5 years ago
Mohammad Aljammal f70ca95a38 fix merge issues 5 years ago
Mohammad Aljammal 67cc5e2033 fix Prescriptions 5 years ago
Zohaib Kambrani 8fcf1b6708 Swipe the Native loading « arguments 5 years ago
Mohammad Aljammal ddc7eca605 fix Insurance Cards 5 years ago
Zohaib Kambrani 69d1e4bb0b no message 5 years ago
Mohammad Aljmma 770d28033d fix issues#26 & 27 & 28 5 years ago
Mohammad Aljmma 8f38dc6077 fix issue #24 5 years ago
Mohammad Aljmma fdeac4823e fix issue #10 5 years ago
Mohammad Aljmma e1f6ef5e5b fix Prescriptions history 5 years ago
haroon amjad 506e32e8c8 Payment issues resolved 5 years ago
haroon amjad 05ad8f8db5 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
Mohammad Aljmma 6a83538544 add info for Medical 5 years ago
Mohammad Aljmma a077d87dd8 fix user authentication data 5 years ago
haroon amjad b7b7ead3ba Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
haroon amjad 5020c24e8b Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/confirm-login.dart
#	lib/services/authentication/auth_provider.dart
5 years ago
Elham Rababah 5ed4d76a54 Merge branches 'diplomatic-quarter-live' and 'notifications_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into notifications_page
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad 15a8e64e7c updates & fixes 5 years ago
Mohammad Aljmma 747cffacfc fix lab result 5 years ago
Elham Rababah 9f2beceb22 First step from notifications_page 5 years ago
Mohammad Aljmma e42f953bd1 fix prescription report issues 5 years ago
haroon amjad dbb53e7821 fixed forgot password issue, Implemented new loader in login flow 5 years ago
haroon amjad aeab57beab Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	lib/main.dart
#	lib/pages/landing/home_page.dart
5 years ago
haroon amjad f5a2870fac Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
Implemented Badge count on ToDo list & my appointments
5 years ago
Mohammad Aljmma e10a0a4d54 add splash page fix language issues 5 years ago
haroon amjad 6fd7a3fa3d updates 5 years ago
Mohammad Aljmma 89cfcd3cad fix design issues 5 years ago
Mohammad Aljmma 874de15040 change the home page design 5 years ago
haroon amjad dfa7e0e02f updates & fixes 5 years ago
haroon amjad 0b6cd845f1 implementing Smart Watch Integration 5 years ago
haroon amjad 68b0e3857a updates 5 years ago
Mohammad Aljammal 29f0402cbd Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
 Conflicts:
	lib/config/config.dart
	lib/config/shared_pref_kay.dart
	lib/core/service/client/base_app_client.dart
	lib/pages/AlHabibMedicalService/​ health_calculators.dart
	lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/login/confirm-login.dart
	lib/pages/login/login.dart
	lib/services/appointment_services/GetDoctorsList.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/drawer/app_drawer_widget.dart
	lib/widgets/others/app_scaffold_widget.dart
5 years ago
Mohammad Aljammal d3d0fa00e7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
 Conflicts:
	lib/pages/landing/home_page.dart
5 years ago
Mohammad Aljammal 53bbafdc2b fix Authenticated User Object 5 years ago
Sultan Khan 3ad928902b voice command 5 years ago
Mohammad Aljammal 06416b4934 add Not authenticated Page 5 years ago
Sultan Khan da317431ba Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Amjad amireh 4009aed000 child Vaccines 5 years ago
Sultan Khan 227731f8f8 Merge 5 years ago
Mohammad Aljammal ac871bb416 Merge branch 'Blood_Donation' into 'master'
Blood donation

See merge request Cloud_Solution/diplomatic-quarter!58
5 years ago
Amjad amireh 5e50c0dc32 Blood Denote 5 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
5 years ago
Mohammad Aljammal d6a27a8e28 change medical profile icons 5 years ago
Mohammad Aljammal 3ffff9686d Done allergies service 5 years ago
Mohammad Aljammal 82c2577d36 Done ask doctor service 5 years ago
Mohammad Aljammal 2952fd56ab Done Active Medications Service 5 years ago
hussam al-habibeh 3c5adc0a1d HMG Service layout 5 years ago
Mohammad Aljammal 9f06ce7d1d done EyeMeasurements service 5 years ago
Mohammad Aljammal c01e6095f2 done my trackers 5 years ago