Haroon6138
/
diplomatic-quarter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity
2,097 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 'e4c8575a7f'
${ noResults }
Commit Graph

619 Commits (e4c8575a7ffe16170e686d6364dbb37092cd7ad6)

Author SHA1 Message Date
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
Mohammad Aljammal cacb6722b9 Merge branch 'pharmacy-bugs' into 'development' 
daynimic listing

See merge request Cloud_Solution/diplomatic-quarter!279
 4 years ago
hussam al-habibeh b39e88d9c8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs 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
hussam al-habibeh 2723422bbf daynimic listing 4 years ago
Mohammad Aljammal 50a45528d1 Merge branch 'pharmacy-bug-fixes' into 'development' 
bug-fixes

See merge request Cloud_Solution/diplomatic-quarter!276
 4 years ago
Fatimah Alshammari 8624d695dc fixed order details 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
mosazaid 44287db553 bug-fixes 4 years ago
Fatimah Alshammari a46dddea9a Merge branch 'development' into pharmacy-Fatima 
# Conflicts:
#	lib/core/model/pharmacies/order_model.dart
#	lib/pages/pharmacies/product-brands.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacy/order/Order.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
#	lib/pages/pharmacy/profile/profile.dart
 4 years ago
Sultan Khan 1a35fe37b6 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Fatimah Alshammari c629fcb85c fixed recommended products new design 4 years ago
haroon amjad da3ad90ddd added app-wide route transition animation 4 years ago
mosazaid c64769e422 Merge branch 'development' into pharmacy-payment-feature 4 years ago
mosazaid f3cdd08857 adding fharmacy payment feature 4 years ago
enadhilal 0cb493d56c Merge branch 'development' into enad_pharmacy2 
# Conflicts:
#	lib/pages/pharmacies/product_detail.dart
 4 years ago
enadhilal 0c6fb67718 fixed issues 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
Fatimah Alshammari ac32ba998c fixed order isuee 4 years ago
Zohaib Iqbal Kambrani 516df96e21 no message 4 years ago
hussam al-habibeh e050f87a64 pharmacy bugs 4 years ago
hussam al-habibeh 8c58dced7d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs 
 Conflicts:
	lib/core/service/pharmacy_categorise_service.dart
	lib/pages/final_products_page.dart
 4 years ago
hussam al-habibeh 1b76d9c192 pharmacy bugs fixed 4 years ago
mosazaid 125dd27a00 Merge branch 'development' into fix-pharmacy 4 years ago
mosazaid 5d0a122689 fix bugs 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 d02b74142a Merge branch 'development' into fix-pharmacy 
# Conflicts:
#	lib/core/service/client/base_app_client.dart
 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
enadhilal 60648d368f Merge branch 'development' into enad_pharmacy2 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
Mohammad Aljammal 0632af3fb5 Fix the Authentication Pharmacy 4 years ago
Mohammad Aljammal 0098345d05 add Prescription Delivery Address Page amd fix the Authentication Pharmacy 4 years ago
mosazaid b70c7d7d05 fix pharmacy auth 4 years ago
enadhilal 292e983614 fixing issues 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
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
mosazaid 822defbd04 working on bmi calculator design and functionality 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
Mohammad Aljammal 484cca086e fix my my Trackers 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
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
Mohammad Aljammal b63025a9b3 return CMC HHC 4 years ago
Mohammad Aljammal 30ddea6419 hot fixing 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 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
Mohammad Aljammal 4263672f00 fim last vital sign data 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 754e60eb72 fix send email lab result 4 years ago
Sultan Khan 18f492e52f Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan d53031b0e6 blood type update for family files 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 09a85d9127 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes 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
Sultan Khan 6b1e7587a8 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan a0baaac314 bug fixes 4 years ago
Mohammad Aljammal 9c18c69d90 hot fixes 4 years ago
Sultan Khan 040c8f38ab hot fixes 4 years ago
Mohammad Aljammal 3c2af11084 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master 
 Conflicts:
	lib/pages/landing/landing_page.dart
 4 years ago
Zohaib Kambrani d8996cf879 Geofence Android Finished 4 years ago
Mohammad Aljammal 6d7cb1b970 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master 
 Conflicts:
	ios/Runner.xcodeproj/project.pbxproj
	lib/core/service/AuthenticatedUserObject.dart
	lib/pages/landing/landing_page.dart
	lib/pages/login/login.dart
	lib/widgets/drawer/app_drawer_widget.dart
 4 years ago
Mohammad Aljammal 4e2979cd64 fix merge issues 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
Zohaib Kambrani 1dc9400ffc Geofencing work in progress on android 4 years ago
Mohammad Aljammal b29fdbb7d0 fix home issues 4 years ago
Mohammad Aljammal 02d72fa27c fix issues 4 years ago
Fatimah Alshammari 4a84483698 fixed order details 4 years ago
Mohammad Aljammal f38f53587b fix issues 4 years ago
Zohaib Kambrani 78928335ef Geofences Login check (unregister/register geozones on logout/logout) 4 years ago
Zohaib Kambrani 6f6ab8d987 no message 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 5606c88715 hot fixes 4 years ago
Haroon Amjad 81b51bef51 Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon 4 years ago
Mohammad Aljammal 4e823c2be4 fix chart and duplicated data in Patient Lab Result 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
Zohaib Kambrani 67f4b4e167 iOS Geofence in progress 4 years ago
Zohaib Kambrani 8457972fda no message 4 years ago
Sultan Khan 2c50402aa8 language issue fixed 4 years ago
Mohammad Aljammal b25bdbb6fa fix LiveChatPage Service LabOrderResult MedicineSearch issues 4 years ago
Zohaib Kambrani 92ba977fca no message 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
Mohammad Aljammal 62b923b25e fix send rad report email 4 years ago
Mohammad Aljammal 9cec304712 Merge branch 'sultan' into 'diplomatic-quarter-live' 
bug fixes

See merge request Cloud_Solution/diplomatic-quarter!168
 4 years ago
Sultan Khan 21ccf1ef86 bug fixes 4 years ago
Sultan Khan ce7a64e86e Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 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
Sultan Khan 542335364e Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 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 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
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
haroon amjad dfa1952f4d Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app 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
mosazaid 4c9a1862d2 make pharmacy home page load data even without login, and some mini changes 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
umasoodch b5413d1749 Merge branch 'master' into pharmacy 
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
 4 years ago
mosazaid 709ba2ce97 create terms-condition in pharmacy order page 4 years ago
Sultan Khan f5b7d35f23 bug fixes 4 years ago
Sultan Khan e3e868e47c flutter tts updated 4 years ago
Sultan Khan 8c5746f7b1 bug fixes 4 years ago
hussam al-habibeh 64cbae3602 Search 4 years ago
Sultan Khan 81c8239412 bug fixes 4 years ago
mosazaid 35d0d3e441 finsi lakum points task 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
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
haroon amjad 82e23efd32 working on ereferral 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
Elham Rababah 68e4b92717 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
Sultan Khan 648d9d245d health weather indicator 4 years ago
Zohaib Kambrani 27182ee8db no message 4 years ago
Elham Rababah ed56476d81 second step from location fixes 4 years ago
Mohammad Aljammal 54d8965773 done child Vaccination 4 years ago
haroon amjad 97b8aeeff5 Version Control finished 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
Sultan Khan a9cb645833 health weather indicator 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
Sultan Khan 340b9770c8 login 4 years ago
Sultan Khan 799fca346b health weather indicator 4 years ago
Sultan Khan 8612ae91c4 sultan 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
Fatimah Alshammari d328c74fc4 fix order and orderdetails 4 years ago
Mohammad Aljammal 0ac599ea1c fix vital Sign 4 years ago
haroon amjad d284ceac04 advance payment & payment flow issues fixed 4 years ago
Sultan Khan 391e178484 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 8d499704dc family file changes 4 years ago
Mohammad Aljammal 91cada6901 fix Advance Payment 4 years ago
Mohammad Aljammal dcbc0de69f fix prescription 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
Sultan Khan 30a8e24521 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Mohammad Aljammal b785f87dac fix App drawer after logout 4 years ago
Mohammad Aljammal ddc7eca605 fix Insurance Cards 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 a9b11a6b03 fix lab result 4 years ago
Zohaib Kambrani 69d1e4bb0b no message 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
Mohammad Aljmma ed7b9d609f fix lab result 4 years ago
haroon amjad b81af62551 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
 4 years ago
haroon amjad b89c1f03b3 language translation fixes 4 years ago
Sultan Khan 1f4f81b454 insurance card details 4 years ago
Sultan Khan bedafa24cd insurance details 4 years ago
Mohammad Aljmma 8f38dc6077 fix issue #24 4 years ago
Sultan Khan 1eb6516ea6 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 3fef1b9d52 theme and login issues fixed 4 years ago
Mohammad Aljmma a1684bdd9e fix issue #17 & 18 4 years ago
Mohammad Aljmma e1f6ef5e5b fix Prescriptions history 4 years ago
hussam al-habibeh 69ea8b7bd7 daynmic products listing 4 years ago
Sultan Khan d1336eec8b login type 4 years ago
Sultan Khan f05b235cd0 login issue 4 years ago
haroon amjad 506e32e8c8 Payment issues resolved 4 years ago
haroon amjad 05ad8f8db5 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
Mohammad Aljmma a077d87dd8 fix user authentication data 4 years ago
haroon amjad ffbc7c4af4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 
# Conflicts:
#	lib/pages/landing/home_page.dart
 4 years ago
Mohammad Aljmma 7d2f1cf318 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_authentication 4 years ago
Mohammad Aljmma 570aa514cd fix user authentication data 4 years ago
haroon amjad b7b7ead3ba Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
haroon amjad f0897881d1 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
Elham Rababah 124d388ee1 Merge branches 'diplomatic-quarter-live' and 'notifications_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into notifications_page 
 Conflicts:
	lib/pages/BookAppointment/components/DocAvailableAppointments.dart
	lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
 4 years ago
Mohammad Aljmma 4a4d5248a2 fix status issue 4 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
 4 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
 4 years ago
haroon amjad 15a8e64e7c updates & fixes 4 years ago
Elham Rababah 41b919183f Fix bug on read notifications_page.dart 4 years ago
hussam al-habibeh 7815005e21 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam 
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/landing/home_page.dart
	lib/widgets/others/app_scaffold_widget.dart
 4 years ago
hussam al-habibeh 69a6bc2812 offers page 4 years ago
Elham Rababah 5bd3c7d9ce finish step from notifications_page and create notification_details_page 4 years ago
Mohammad Aljmma 747cffacfc fix lab result 4 years ago
mosazaid 2095f2c62a fix merge issue 4 years ago