Haroon6138
/
diplomatic-quarter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity
1,853 Commits
54 Branches
0 Tags
169 MiB
dev_v3.13.6
dev_3.24.3
clinicbyhospital
dev_v_3.13.6_CR_6804
dev_v3.13.6_PenguinIn
dev_3.13.6_CR6750
Dev_3.3_InPatient_CR
dev_3.3_ER_Online_CheckIn
dev_3.13.6_CR5047_LiveCare_Enhancements
dev_3.13.6_Development
dev_v3.13.6_BLE_Faiz
development_v3.3
dev_3.3_BLE
dev_3.3_Floward
dev_v3.13.6_voipcall
dev_3.3_CCHI
dev_3.3_Queueing
development_v3.3_voipcall
dev_3.3_AmbulanceRequestCR
dev_3.3_faiz_payfort
dev_3.3_LabReportEnhancementCR
dev_3.3_blood_donation_CR
dev_3.3_merge_vida_plus
PatientApp_VIDA_Plus_3.3
Dev_3.3_MedicalReportCR
sultan_v3.3
faiz_development
development_huawei_v2.5
development_v2.5
development_amir
webrtc_with_signalr
sikander_family_profile_switch
sikander_video_call_improvements
development_CS_v2.5
fatima_v2
development_new_design_2.0
Fatima-New-Design
development
diplomatic-quarter-live
fatima-new
diplomatic-quarter-haroon
master
fix_bugs_Mar
ed_online
enad_pharmacy2
fix_er
dq_and_master
geofencing_wifi
fix_insurance_update
fix_issues
fix_authentication
fix_login
er_location
find_us
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '9d67704c67'
${ noResults }
Commit Graph

708 Commits (9d67704c67c94ddcbe7e7cee8cd27f4c3ed2b78a)

Author SHA1 Message Date
Sultan Khan 0445011e53 bug fixes 4 years ago
Mohammad Aljammal ad88f6de04 fix theme issues 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 616212828d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 66acce3b40 ancillary order pages added 4 years ago
haroon amjad e0ebb922ed pharmacy fixes 4 years ago
Zohaib Iqbal Kambrani f410ce20ca Packages and Offers in Progress 4 years ago
haroon amjad ed3dba3eb3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
 4 years ago
haroon amjad b9a12341d5 updates & fixes 4 years ago
Mohammad Aljammal 4dcb70d7eb Merge branch 'pharmacy-bugs' into 'development' 
Pharmacy bugs

See merge request Cloud_Solution/diplomatic-quarter!282
 4 years ago
hussam al-habibeh a534b1415e products filtering fix 4 years ago
Mohammad Aljammal 861dba9a94 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ed_online 
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
 4 years ago
Mohammad Aljammal ec401d4848 Done Ed online 4 years ago
Sultan Khan a6196d3c30 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan b891c1bd80 theme issue 4 years ago
Fatimah Alshammari 747763c4be Merge branch 'development' into pharmacy-Fatima 
# Conflicts:
#	lib/config/localized_values.dart
#	lib/locator.dart
#	lib/uitl/translations_delegate_base.dart
#	pubspec.yaml
 4 years ago
Sultan Khan 1a35fe37b6 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan e61c26b853 Auto SMS, Themes, Voice Command 4 years ago
Fatimah Alshammari c629fcb85c fixed recommended products new design 4 years ago
enadhilal 0cb493d56c Merge branch 'development' into enad_pharmacy2 
# Conflicts:
#	lib/pages/pharmacies/product_detail.dart
 4 years ago
Fatimah Alshammari 42bf76f712 Merge branch 'development' into pharmacy-Fatima 
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/parmacyModule/parmacy_module_service.dart
#	lib/pages/pharmacies/product_detail.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
 4 years ago
Zohaib Iqbal Kambrani 15ec3ec9b9 Translation Track Driver, enhancement, initial camera 4 years ago
Zohaib Iqbal Kambrani 63663f1b24 Track Delivery Driver Completed 4 years ago
Fatimah Alshammari ac32ba998c fixed order isuee 4 years ago
Zohaib Iqbal Kambrani 516df96e21 no message 4 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
 4 years ago
Mohammad Aljammal 20ad10b9dc Merge branches 'development' and 'fix-pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix-pharmacy 
 Conflicts:
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/uitl/translations_delegate_base.dart
 4 years ago
Mohammad Aljammal 8899bdf460 Done Prescription Delivery Address 4 years ago
mosazaid 1a45f99606 some fixes on pharmacy 4 years ago
haroon amjad 5e8e3806d6 Covid Drive-Thru implemented 4 years ago
Sultan Khan 144ef52c70 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan b3e6c4efda voice command changes 4 years ago
enadhilal 830e871e2c Merge branch 'development' into enad_pharmacy2 
# Conflicts:
#	lib/config/config.dart
#	lib/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart
 4 years ago
mosazaid b70c7d7d05 fix pharmacy auth 4 years ago
enadhilal 292e983614 fixing issues 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
Mohammad Aljammal 29f4e6acb6 Merge branch 'hmg-services-fixing' into 'development' 
Hmg services fixing

See merge request Cloud_Solution/diplomatic-quarter!262
 4 years ago
haroon amjad b6c617888b Merge branch 'development' into Haroon 
# Conflicts:
#	lib/config/localized_values.dart
 4 years ago
Fatimah Alshammari ef8312f2b8 Merge branch 'development' into pharmacy-Fatima 
# Conflicts:
#	lib/core/service/parmacyModule/parmacy_module_service.dart
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/pages/pharmacies/product_detail.dart
 4 years ago
Fatimah Alshammari ce64da11e4 homepage and product details design 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
Sultan Khan d33918c932 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Mohammad Aljammal e964afd4f2 Merge branch 'fix_security_issue' into 'development' 
fix security issues in pharmacy

See merge request Cloud_Solution/diplomatic-quarter!261
 4 years ago
Mohammad Aljammal d477481856 fix security issues in pharmacy 4 years ago
Sikander Saleem aef4c7bfac H2O feature improvement 4 years ago
haroon amjad 0b83089b86 Merge branch 'development' into Haroon 4 years ago
haroon amjad 3832cee1ad Translation fixes 4 years ago
Sikander Saleem 3b4e791017 H2O feature improvement 4 years ago
mosazaid 822defbd04 working on bmi calculator design and functionality 4 years ago
haroon amjad 3bad0a3804 Merge branch 'development' into Haroon 4 years ago
haroon amjad 146019432a LiveCare schedule implemented 4 years ago
Sikander Saleem 8f37fbf260 Qr icon added, notify me api added & improvements 4 years ago
Sultan Khan 3ac69692be Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 0213264b7f bug fixes 4 years ago
Mohammad Aljammal 3e441c55b2 fix bottom nav bar 4 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
 4 years ago
Mohammad Aljammal 484cca086e fix my my Trackers 4 years ago
haroon amjad ab158e14e9 Merge branch 'development' into Haroon 
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
 4 years ago
haroon amjad 7c538b350f LiveCare Scheduling finalized, Appointments in ToDo list categorized 4 years ago
hussam al-habibeh b767748315 health-converter fix 4 years ago
hussam al-habibeh 97919c217f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into health-converter 
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
 4 years ago
hussam al-habibeh 1ce0ef7b6c health-converter fix 4 years ago
Mohammad Aljammal db2376f50c fix blood and weight on my trackers 4 years ago
Sultan Khan ccd2fc5068 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 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
 4 years ago
mosazaid 38d52b52c8 Merge branch 'development' into fix_design 
# Conflicts:
#	lib/config/localized_values.dart
#	lib/locator.dart
 4 years ago
mosazaid 174534d8a5 fix Blood donation functionality and design 4 years ago
Mohammad Aljammal 405f67be1e Merge branch 'pharmacy-Fatima' into 'development' 
Pharmacy fatima

See merge request Cloud_Solution/diplomatic-quarter!249
 4 years ago
Fatimah Alshammari 7a516cae51 Merge branch 'development' into pharmacy-Fatima 
# Conflicts:
#	lib/pages/pharmacy/order/Order.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
 4 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
 4 years ago
Mohammad Aljammal 0b1014a91c fix blood sugar service on my tracker 4 years ago
Fatimah Alshammari 0f22a50a5d Merge branch 'development' into pharmacy-Fatima 
# Conflicts:
#	lib/pages/pharmacy/profile/profile.dart
 4 years ago
Zohaib Iqbal Kambrani 9a5daed5c3 Merge branch 'development' into ZohaibIqbalKambrani 
* development:
  re-design child vaccine and fix some funcrionalities
  Fix ER service
  first step from fix CMC
  fix issue on cmc
  return CMC HHC
  Nearest Er fix design
  solving NearestEr design problem
  simple fix
  hot fixing
  fix design issues

# Conflicts:
#	lib/config/localized_values.dart
 4 years ago
Sultan Khan c65983bfdb code merged 4 years ago
Zohaib Iqbal Kambrani bbd953ae43 Order Delivery Driver tracking [inprogress] 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
Mohammad Aljammal 4457b5f109 add translation to ER service 4 years ago
Mohammad Aljammal 200334d8f8 Fix ER service 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
mosazaid 5bcc67b77d Nearest Er fix design 4 years ago
Zohaib Iqbal Kambrani e2bce87e34 resolve merge conflicts. 4 years ago
Zohaib Iqbal Kambrani dc83b476d6 Merge branch 'development' into ZohaibIqbalKambrani 
# Conflicts:
#	android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt
#	ios/Flutter/.last_build_id
#	lib/pages/landing/landing_page.dart
#	lib/pages/medical/medical_profile_page.dart
#	lib/widgets/drawer/app_drawer_widget.dart
 4 years ago
Mohammad Aljammal 634c874eee fix design issues 4 years ago
Fatimah Alshammari ba4003cb56 Merge branch 'pharmacy' into pharmacy-Fatima 
# Conflicts:
#	lib/locator.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacy/profile/profile.dart
 4 years ago
Fatimah Alshammari 52fa0f6f89 fixed orders 4 years ago
Mohammad Aljammal de1b7cc1d0 fix merge issues 4 years ago
Mohammad Aljammal 3fb522e15f Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge 
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/config/shared_pref_kay.dart
	lib/core/model/pharmacies/LakumInquiryInformationObjVersion.dart
	lib/core/model/pharmacies/order_model.dart
	lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
	lib/core/viewModels/pharmacyModule/order_model_view_model.dart
	lib/locator.dart
	lib/main.dart
	lib/pages/landing/landing_page_pharmcy.dart
	lib/pages/parent_categorise_page.dart
	lib/pages/pharmacies/screens/cart-order-page.dart
	lib/pages/pharmacies/screens/cart-order-preview.dart
	lib/pages/pharmacies/screens/pharmacy_module_page.dart
	lib/pages/pharmacies/wishlist.dart
	lib/pages/pharmacy/order/Order.dart
	lib/pages/pharmacy/order/OrderDetails.dart
	lib/pages/pharmacy/order/ProductReview.dart
	lib/pages/pharmacy/pharmacyAddresses/AddAddress.dart
	lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
	lib/pages/pharmacy/profile/profile.dart
	lib/services/pharmacy_services/orderDetails_service.dart
	lib/services/pharmacy_services/order_service.dart
	lib/services/pharmacy_services/pharmacyAddress_service.dart
	lib/services/pharmacy_services/wishList_service.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/buttons/borderedButton.dart
	lib/widgets/others/app_scaffold_widget.dart
	lib/widgets/pharmacy/product_tile.dart
 4 years ago
Mohammad Aljammal c82f01cd1a fix merge issues 4 years ago
Mohammad Aljammal 16d1f667d4 Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_merge 
 Conflicts:
	android/app/build.gradle
	lib/config/config.dart
	lib/pages/pharmacy/profile/profile.dart
	lib/widgets/pharmacy/product_tile.dart
 4 years ago
mosazaid 38d58ebaaf Merge branch 'pharmacy' into pharmacy_mosa_branch 
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
#	lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
#	lib/services/pharmacy_services/pharmacyAddress_service.dart
#	lib/uitl/translations_delegate_base.dart
 4 years ago
Mohammad Aljammal f77d2b497e fix issues 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
enadhilal 10734d5994 connecting pages. 
trnaslate.
calling API.
review page.
product details page.
Wishlist page.
Brands page.
 4 years ago
Sultan Khan c01246acf0 hot fix 4 years ago
Sultan Khan 2b48578e07 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 016dffcb87 change 4 years ago
Mohammad Aljammal 519a474d41 fix live care label and vital sign data 4 years ago
Fatimah Alshammari c0920e7099 Merge branch 'pharmacy' into pharmacy-Fatima 
# Conflicts:
#	lib/widgets/pharmacy/product_tile.dart
 4 years ago
Mohammad Aljammal 5e3f6363cf fix issues 4 years ago
Mohammad Aljammal 754e60eb72 fix send email lab result 4 years ago
Zohaib Kambrani 57925e3b02 Geofence fixes by JobScheduler 4 years ago
Mohammad Aljammal 2059b76fc1 fix Medical profile 4 years ago
Mohammad Aljammal 4d8f42b517 fix issues vital sign issue 4 years ago
Mohammad Aljammal 4f015a1cda Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes 4 years ago
Mohammad Aljammal f6983c138a fix issues 4 years ago
Sultan Khan 37ab778fd0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan b505ed1be7 blood type added 4 years ago
Mohammad Aljammal 9c12e949e8 hot fixes 4 years ago
Fatimah Alshammari e5bf7acc52 Merge branch 'pharmacy-Fatima' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-Fatima 
# Conflicts:
#	lib/core/viewModels/pharmacyModule/order_model_view_model.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
#	lib/widgets/pharmacy/product_tile.dart
 4 years ago
Fatimah Alshammari fda101840a fixed order isuues 4 years ago
Mohammad Aljammal 9c18c69d90 hot fixes 4 years ago
Mohammad Aljammal 7167d58ce2 fix merge issues 4 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
 4 years ago
mosazaid 359eba2da0 make some updates in firebase version and update gradle, finish review order 4 years ago
Mohammad Aljammal b29fdbb7d0 fix home issues 4 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
 4 years ago
Mohammad Aljammal 02d72fa27c fix issues 4 years ago
Fatimah Alshammari 4a84483698 fixed order details 4 years ago
Sultan Khan 0f594059b5 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
haroon amjad a7dc2fdfd1 Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon 4 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
 4 years ago
Sultan Khan 3aa592e2b0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan b759758a68 bug fixes 4 years ago
Mohammad Aljammal f38f53587b fix issues 4 years ago
Haroon Amjad 3308aa47e1 fixes 4 years ago
Mohammad Aljammal 19f12116c4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix 4 years ago
Mohammad Aljammal de1e352e98 fix charts and vital sign 4 years ago
Zohaib Kambrani b7088f70cd Merge master in to my branch with Geofence iOS 4 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
 4 years ago
Haroon Amjad 5606c88715 hot fixes 4 years ago
Mohammad Aljammal 92e6275162 Add Confirm send email dialog 4 years ago
haroon amjad 051bd1e23f Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
haroon amjad 951d9b553f fixes & updates 4 years ago
Mohammad Aljammal 97776ce99b Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix 4 years ago
Mohammad Aljammal b25bdbb6fa fix LiveChatPage Service LabOrderResult MedicineSearch issues 4 years ago
Sultan Khan 557b8e814f voice command 4 years ago
haroon amjad 75de755ccd 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/paymentService/payment_service.dart
#	lib/uitl/translations_delegate_base.dart
 4 years ago
mosazaid 6ac8d67b83 finish address add/edit/delete/select 4 years ago
Zohaib Kambrani 8d5d55a150 Geofencing in progress 4 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
 4 years ago
Mohammad Aljammal 2f77592bac fix Prescriptions Service and design issues 4 years ago
haroon amjad 740a294867 Translation & bug fixes 4 years ago
Sultan Khan c813deea29 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 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
 4 years ago
Sultan Khan e28209d4e8 bug fixes 4 years ago
Haroon Amjad 9d3c64200e fixes 4 years ago
Mohammad Aljammal eca2266f7b hot fixing 4 years ago
Sultan Khan ce7a64e86e Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
haroon amjad 33956db22a Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 
# Conflicts:
#	lib/config/config.dart
 4 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
 4 years ago
Mohammad Aljammal 4d203c8a5b fix LabResult 4 years ago
Mohammad Aljammal 554ed1b50a fix insurance update 4 years ago
haroon amjad e495d3e5ad Health Data integration implementing 4 years ago
Sultan Khan 542335364e Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan c050c3f189 voice command updated 4 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
 4 years ago
mosazaid 378562b781 adding some changes in order pages like translate texts 4 years ago
enadhilal 9c55571072 Merge branch 'pharmacy' into enad_pharmacy2 4 years ago
enadhilal c22ca4e29e Merge branch 'pharmacy' into enad_pharmacy2 
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/locator.dart
#	lib/pages/base/base_view.dart
#	lib/pages/landing/home_page.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/pharmacy/product_tile.dart
 4 years ago
enadhilal 888a74fb9b add these pages 
​Product Tile Component
Product Detail Page
​Wishlist Page
​Reviews Page
Brands Page + Search
 4 years ago
Mohammad Aljammal 2e2a29145c fix merge issues 4 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
 4 years ago
haroon amjad 59aba6608d Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 4 years ago
Fatimah Alshammari 706980248a Merge branch 'pharmacy' into pharmacy-Fatima 
# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/home_page.dart
 4 years ago
Mohammad Aljammal 77dcb918c3 Revert "Merge branch 'pharmacy-hussam' into 'master'" 
This reverts merge request !149
 4 years ago
Fatimah Alshammari 9b8103bfd6 fixe order and order details 4 years ago
Sultan Khan af1c59394c Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 496163a61a voice command updated 4 years ago
Mohammad Aljammal 47e4b99f11 fix issues 4 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
 4 years ago
Mohammad Aljammal 4e2c955b09 add missing translation 4 years ago
haroon amjad dfa1952f4d Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app 4 years ago
hussam al-habibeh 5dc3c53550 mousa and hussam branch 4 years ago
hussam al-habibeh a1906a4072 Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam 
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/locator.dart
	lib/pages/landing/home_page.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
	pubspec.yaml
 4 years ago
hussam al-habibeh 800565407d 12/6 4 years ago
haroon amjad 257dc3d76d Merge branch 'pharmacy_module_feature_home_page' into 'pharmacy' 
create terms-condition in pharmacy order page

See merge request Cloud_Solution/diplomatic-quarter!154
 4 years ago
mosazaid 7ee7ef58c4 working on dynamic title on pharmacy 4 years ago
umasoodch b5413d1749 Merge branch 'master' into pharmacy 
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
 4 years ago
hussam al-habibeh 8b8207cb0d search 4 years ago
Sultan Khan f5b7d35f23 bug fixes 4 years ago
Sultan Khan 8c5746f7b1 bug fixes 4 years ago
Sultan Khan 8d7cc20b70 localized value updated 4 years ago
Sultan Khan 321d31b3bd voice search page updated 4 years ago
hussam al-habibeh 64cbae3602 Search 4 years ago
Sultan Khan 81c8239412 bug fixes 4 years ago
Mohammad Aljammal 1c23e28081 fix merge issues 4 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
 4 years ago
Mohammad Aljammal 269f682bd5 Added info images description 4 years ago
mosazaid 35d0d3e441 finsi lakum points task 4 years ago
haroon amjad f1a8e09a59 Added info images description 4 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
 4 years ago
haroon amjad 7edb0c8009 Doctor rating dialog revamped 4 years ago
Mohammad Aljammal 3daef6e53f add images info 4 years ago
Mohammad Aljammal dc898a799d Add Privileges 4 years ago
Sultan Khan 3ab513d9d0 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 98f84c2161 voice search in progress 4 years ago
Elham Rababah 713e44cf8b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc 
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
 4 years ago
Elham Rababah ea195ea9bf Finish translate CMC HHC 4 years ago
haroon amjad ff0d66ccdb Covid test translations 4 years ago
haroon amjad 65fbd7af8e referral finalised 4 years ago
Zohaib Kambrani 1155466d19 Packages and Offer Slider at home 4 years ago
mosazaid 98f660e29b Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page 
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/locator.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
 4 years ago
mosazaid 4e5d6a9a00 finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished 4 years ago
Elham Rababah 5bf63174c9 First step from translations 4 years ago
umasoodch 0431eb1ac8 Merge branch 'master' into pharmacy 
# Conflicts:
#	lib/config/config.dart
#	lib/locator.dart
#	lib/pages/base/base_view.dart
#	lib/pages/landing/home_page.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	pubspec.yaml
 4 years ago
Sultan Khan 8de838a6dc Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 2fb0ccfdbd Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
haroon amjad 6846a8501a Merge branch 'master' 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
 4 years ago
haroon amjad 0181043da8 Ereferral fixes, smartwatch health data integration 4 years ago
Mohammad Aljammal 2185f5ce11 Merge branch 'hhc_cmc' into 'master' 
Hhc cmc

See merge request Cloud_Solution/diplomatic-quarter!138
 4 years ago
Elham Rababah 05deaa6322 Address Added Successfully 4 years ago
Sultan Khan de2a5e55eb Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 7d3c1ac852 weather indicator updated 4 years ago
Zohaib Kambrani 27182ee8db no message 4 years ago
Mohammad Aljammal 54d8965773 done child Vaccination 4 years ago
haroon amjad 97b8aeeff5 Version Control finished 4 years ago
haroon amjad a03d5c6d57 App initial release to stores 4 years ago
Sultan Khan 909401cc7e Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Elham Rababah 7aa7af6de7 finish CMC module 4 years ago
haroon amjad 92db2b2be9 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
Elham Rababah 3ef22be7da Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc 
 Conflicts:
	lib/config/config.dart
 4 years ago
Elham Rababah a87855f445 Fix issues on hhc module 4 years ago
Mohammad Aljammal 49974f81db add translations to child Vaccination 4 years ago
haroon amjad e5feef8a9d Updates & UI Fixes 4 years ago
Sultan Khan 0f80224016 Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
 4 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
 4 years ago
Mohammad Aljammal 482ec536de Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixing 
 Conflicts:
	lib/config/config.dart
 4 years ago
Mohammad Aljammal b6d2878cf1 add Radiology translations and colors 4 years ago
Fatimah Alshammari d328c74fc4 fix order and orderdetails 4 years ago
Mohammad Aljammal d0891ba16b Merge branch 'hot_fixing' into 'diplomatic-quarter-live' 
fix lab result translations and colors

See merge request Cloud_Solution/diplomatic-quarter!128
 4 years ago
Mohammad Aljammal b504f379de fix lab result translations and colors 4 years ago
Sultan Khan 1b678e0aca fingerprint 4 years ago
Sultan Khan 24b7bca471 no message 4 years ago
Sultan Khan 8429f83d7c registration done 4 years ago
Mohammad Aljammal f70ca95a38 fix merge issues 4 years ago
Mohammad Aljammal 0d098def04 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_master 
 Conflicts:
	assets/app_icons/config.json
	assets/app_icons/fonts/DQIcons.ttf
	lib/config/config.dart
	lib/config/shared_pref_kay.dart
	lib/d_q_icons_icons.dart
	lib/locator.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/rateAppointment/rate_appointment_doctor.dart
	lib/uitl/utils.dart
	lib/widgets/others/app_scaffold_widget.dart
 4 years ago
Mohammad Aljammal 67cc5e2033 fix Prescriptions 4 years ago
Mohammad Aljammal 0966269537 Merge branch 'sultan' into 'diplomatic-quarter-live' 
Sultan

See merge request Cloud_Solution/diplomatic-quarter!116
 4 years ago
Mohammad Aljammal 3c1257b379 fix Medicine Search 4 years ago
Sultan Khan 30a8e24521 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 91be66ecdd family file changes 4 years ago
Mohammad Aljmma 6523a1dea9 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into arabic_issues 
 Conflicts:
	lib/config/localized_values.dart
 4 years ago
Mohammad Aljmma 501692587f change the base Url 4 years ago
Mohammad Aljmma a9b11a6b03 fix lab result 4 years ago
Sultan Khan 3589b21590 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Mohammad Aljmma 770d28033d fix issues#26 & 27 & 28 4 years ago