Commit Graph

3092 Commits (656d8dd6b4e78a280e02c347bf3377e48eff23cf)

Author SHA1 Message Date
haroon amjad c58e180c91 Updates 2 years ago
haroon amjad 965df33253 Appointment actions fixes 2 years ago
haroon amjad 7c68779324 Nphies integration 2 years ago
haroon amjad 3e63d80655 Ancillary order updates 2 years ago
haroon amjad ae0fca865d InPatient Advance payment API implemented 2 years ago
haroon amjad a9ae44ca89 Implemented checks for InPatient CR 2 years ago
haroon amjad 2455f48fe1 View medical report done 2 years ago
haroon amjad dd79b1dfca InPatient pending advance payment done 2 years ago
haroon amjad 4afdf5545e Translations added 2 years ago
haroon amjad d251ca0e1c Inpatient medical instructions implemented 2 years ago
haroon amjad 786dd76f57 updates 2 years ago
haroon amjad e4e3377c5c update 2 years ago
haroon amjad 3353c93de9 fixes 3 years ago
haroon amjad 44d8f0efe2 InPatient medical report contd. 3 years ago
haroon amjad da0a164b0e updates 3 years ago
haroon amjad a17b941c63 InPatient Medical Report continued 3 years ago
haroon amjad 9b3c07d3b1 Added AED in advance payment 3 years ago
haroon amjad 657248803f Ask doc disabled for LiveCare appointments 3 years ago
haroon amjad d261557cd7 Admitted patient API changed 3 years ago
haroon amjad ff23f3a8cb fixes 3 years ago
haroon amjad b2ec6c76bf ancillary fix 3 years ago
haroon amjad f624c70cee Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad b92e45aa93 Updates & fixes 3 years ago
haroon amjad a60f66a069 Updates 3 years ago
haroon amjad 3fb8876c31 Manual Insurance Card Update 3 years ago
haroon amjad fe606b7823 InPatient Advance Payment 3 years ago
haroon amjad 1eccaf0aac Regex added to allow characters only. 3 years ago
haroon amjad 1a45dd57e9 LiveCare Fix 3 years ago
haroon amjad 047877fb08 Add Doctor response rate comments validation 3 years ago
haroon amjad 20572f463a meal plan dev completed 3 years ago
Sultan khan 5d6b50a1da Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3 3 years ago
Sultan khan 83859e05f1 family file approve reject button refresh 3 years ago
haroon amjad 0e054429ef Meal Plan implementation completed 3 years ago
haroon amjad d9404d3abe Medical Report changes 3 years ago
haroon amjad bc27121c4e meal plan updates 3 years ago
haroon amjad 96f948a8c8 updates 3 years ago
haroon amjad 4b0a41d7d8 updates 3 years ago
haroon amjad 94296cec0d meal plan continued 3 years ago
haroon amjad 38648df897 Meal Plan development continued 3 years ago
haroon amjad d073eb9d5f MealPlan implementation continued 3 years ago
haroon amjad 77ab9373f8 Meal Plan APIs implementation continued 3 years ago
haroon amjad b337343df3 Project ID fix in ancillary orders 3 years ago
Sultan khan 27373b6972 doctor header. 3 years ago
Sultan khan 5e4ca336c2 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3 3 years ago
Sultan khan 68f39d965c Merge branch 'sultan_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
# Conflicts:
#	lib/widgets/new_design/doctor_header.dart
#	pubspec.yaml
3 years ago
haroon amjad 710e6274db mealplan updates 3 years ago
Sultan khan 0306c777ed rating bug fixed 3 years ago
haroon amjad 31d8443f87 insert call info updates 3 years ago
haroon amjad f2ab76eb24 updates 3 years ago
haroon amjad 9f44b25353 Meal Plan API integration in progress 3 years ago
haroon amjad 7bc105c6c7 updates 3 years ago
haroon amjad 12af8bb8a9 updates 3 years ago
haroon amjad 6877244d0e CR# 5805 Ask Doc Improvements dev completed. 3 years ago
haroon amjad 792b3ea249 no message 3 years ago
Sultan khan f29d33d7e7 Changes for voice command search 3 years ago
haroon amjad e4fe4baa27 nearest appo crash fixed 3 years ago
haroon amjad 3fda1da16a updates 3 years ago
haroon amjad 83ca5e8e4c ask doctor date param added 3 years ago
haroon amjad 58e598843b sickleave 3 years ago
haroon amjad 2d93b9753d Ask doctor improvements 3 years ago
haroon amjad f28fcbd006 AdvanceNumber_VP added 3 years ago
haroon amjad 17acae0a95 updates 3 years ago
haroon amjad 101f2dcab8 updates 3 years ago
haroon amjad 60d5ba4a9e Birth Notification implemented 3 years ago
haroon amjad 078482c21d updates 3 years ago
haroon amjad cf30762eec updates 3 years ago
haroon amjad 420aef3195 Updates 3 years ago
haroon amjad 2437d2da9c Updates 3 years ago
haroon amjad 01ee9a2710 Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad 77f3d0a238 radiology API fixes 3 years ago
haroon amjad e098705374 localized strings 3 years ago
haroon amjad 7280e2a1d7 Birth Notification UI Implemented 3 years ago
haroon amjad 17e7886907 VidaPlus Project changes 3 years ago
haroon amjad a7a06f4083 Home page change 3 years ago
haroon amjad b64ba9211e Inpatient services in dev 3 years ago
haroon amjad 906fd5fd6a Inpatient services in dev 3 years ago
haroon amjad 2fea4b2b07 Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/fragments/home_page_fragment2.dart
#	lib/pages/landing/widgets/services_view.dart
3 years ago
haroon amjad 15c4f016df update to stores for version 10.5 3 years ago
haroon amjad 3675d05911 config changes 3 years ago
Sultan khan 0514fecae2 lab report email change 3 years ago
haroon amjad badc13d41a sickleave CR Enabled 3 years ago
Sultan khan 83c15196c8 VIDA PLUS CHANGE 3 years ago
Sultan khan ddcd0bb73c Merge branch 'development_v3.3' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into PatientApp_VIDA_Plus_3.3
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
#	lib/pages/ErService/rapid-response-team/rrt-pickup-address-page.dart
#	lib/pages/feedback/send_feedback_page.dart
#	lib/uitl/LocalNotification.dart
#	lib/uitl/push-notification-handler.dart
#	lib/widgets/others/bottom_bar.dart
#	lib/widgets/others/floating_button_search.dart
#	pubspec.yaml
3 years ago
haroon amjad fcf0c589a0 Updates & fixes 3 years ago
haroon amjad b304332526 Patient app release to stores 10.4 3 years ago
haroon amjad 872095c51f Merge branch 'development_v3.3' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v3.3 3 years ago
haroon amjad 5a741bf270 Sickleave changes 3 years ago
Sultan khan ad068d4f09 Merge branch 'development_v3.3' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v3.3 3 years ago
Sultan khan d59e436a97 dubai arabic change 3 years ago
haroon amjad 907d05c3d0 register 3 years ago
haroon amjad 9d2df00d87 Get General instructions implemented 3 years ago
Sultan khan baec968ae0 Merge branch 'development_v3.3' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v3.3
# Conflicts:
#	lib/pages/login/register-info.dart
3 years ago
Sultan khan c48f393f95 Dubai registration fixed 3 years ago
haroon amjad 0e4e285954 InPatient CR dev 3 years ago
haroon amjad 701eedf147 updates 3 years ago
haroon amjad 670991eca4 Lab result fix 3 years ago
haroon amjad e79454973c InPatient API 3 years ago
haroon amjad 9a7d0af6ea InPatient API implemented 3 years ago
haroon amjad af90ab3aa3 Sickleave & chart changes 3 years ago
haroon amjad 128bd2ec54 Inpatient services implementation 3 years ago
haroon amjad dc859b01f7 updates & fixes 3 years ago
haroon amjad dfc2889df7 dental reschedule fix 3 years ago
haroon amjad f45c5de526 Merge branch 'sultan_v3.3' into development_v3.3 3 years ago
Sultan khan 47702b5c01 Merge branch 'development_v3.3' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_v3.3
# Conflicts:
#	lib/config/config.dart
3 years ago
Sultan khan ea82219e9e Appointment logs 3 years ago
haroon amjad 6e9cc39269 Dental fixes 3 years ago
haroon amjad 1eed379889 Lab result flowchart fix 3 years ago
haroon amjad 62b9b3e35c calendar permission handled in iOS 3 years ago
haroon amjad e81a1b8bcc iOS Firebase fix 3 years ago
haroon amjad 63426a691d Ancillary orders family members issue resolved 3 years ago
haroon amjad 5045cc6faa Pharma LiveCare "IsPharmacy" Param added, Added Google API Availability check for Huawei devices 3 years ago
haroon amjad 3bc09f792a Pharma LiveCare fixes 3 years ago
haroon amjad bc8a979438 Upload to stores 3 years ago
haroon amjad a20d6c7c28 Livecare updates 3 years ago
haroon amjad 4ecab57173 Pharma LiveCare updates 3 years ago
haroon amjad da423fe12a Pharma LiveCare updates 3 years ago
haroon amjad f686013692 Pharma LiveCare updates 3 years ago
haroon amjad 4f50c3ff8e Pharmacy LiveCare revamped 3 years ago
haroon amjad 74b0acefd3 Updates & fixes 3 years ago
haroon amjad 8e14084467 updates 3 years ago
haroon amjad 98abc5a069 updates 3 years ago
Sultan khan 9683b3f42f Dubai Reminder fixed. 3 years ago
haroon amjad 6bdb7a3305 Updates & fixes 3 years ago
haroon amjad 0e01835327 Target SDK & Compile SDK bumped to 33 3 years ago
haroon amjad e50a67ea12 Vida Plus changes 3 years ago
haroon amjad 2e72d6a550 LiveCare contact added 3 years ago
haroon amjad aafdf3760d added sick leave status text & color 3 years ago
haroon amjad c8ec536267 Sickleave CR done 3 years ago
haroon amjad e5e5bb5352 Dental book appointment changes 3 years ago
haroon amjad 25af2c23ef Sick leave CR, LiveCare support call, Appo calendar changes 3 years ago
haroon amjad c289afb186 Opentok fixes 3 years ago
haroon amjad 22274ebbb0 updates & fixes 3 years ago
Zohaib Iqbal Kambrani 35b129fb68 migrated project to latest flutter sdk 3 years ago
haroon amjad 22a0e456bc Manual Insurance Updates, Service ID fixes, Tamara Fixes 3 years ago
haroon amjad 52070c8f94 Updates & fixes 3 years ago
haroon amjad e80ac2481a Ancillary order & manual insurance update 3 years ago
haroon amjad 442a94ac08 Updates & fixes 3 years ago
haroon amjad 3709ebcb32 Updates 3 years ago
haroon amjad f6191d9bf7 updates & fixes 3 years ago
haroon amjad 7ae4e7d616 updates & fixes 3 years ago
haroon amjad d75615a2eb Updates & fixes 3 years ago
haroon amjad e03412214e Ambulance request fixes 3 years ago
haroon amjad 106334c9cf updates & fixes 3 years ago
haroon amjad dfa88b7de7 Updates, fixes & release VersionID 9.1 3 years ago
haroon amjad 21cf9da900 HMS Core & LiveCare Schedule fixes 3 years ago
haroon amjad 58a6dc6a6f Tamara & Apple Pay Fixes + Other Updates 3 years ago
haroon amjad 8be9d3ae6e Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5 4 years ago
haroon amjad 833818e6e3 Rad & Lab email issues fixes 4 years ago
Zohaib Iqbal Kambrani 8c29b5f8e6 WebRTC or Opentok 4 years ago
Zohaib Iqbal Kambrani 8bd5a71318 Merge branch 'development_v2.5' into zik_webrtc_dev_v2.5
* development_v2.5:
  Timezone fixes & Activate/Deactivate file changes
  Updates
  Timezone Updates
  CMC Updates
  updates
  Updates
  Laser Male back image added
  Updates & fixes
  E-Cens sign off
  Analtyics at registration and liveacare payment fail
  analytics events update
  Analytics
  no message
  Updates & fixes
  ED Online Check-In
  Calendar fixes
  updates & fixes
  Analytics statements align to bottom of block
  Analytics for login registration
  updates

# Conflicts: Fixed
#	lib/analytics/flows/appointments.dart
4 years ago
Zohaib Iqbal Kambrani 1aabf08417 no message 4 years ago
haroon amjad 2ba744c3a6 Timezone fixes & Activate/Deactivate file changes 4 years ago
haroon amjad b756bf8caf Updates 4 years ago
haroon amjad 3896f02d13 Timezone Updates 4 years ago
haroon amjad ca43849d9d CMC Updates 4 years ago
haroon amjad 11529c65c5 updates 4 years ago
haroon amjad 4ba229c436 Updates 4 years ago
haroon amjad eb3f5b5cb5 Updates & fixes 4 years ago
Zohaib Iqbal Kambrani e615ca1a16 no message 4 years ago
haroon amjad 72654757c4 Merge branch 'development_v2.5' into 'zik_development_v2.5'
# Conflicts:
#   lib/pages/login/confirm-login.dart
4 years ago
haroon amjad 7018696328 E-Cens sign off 4 years ago
Zohaib Iqbal Kambrani a69e0da77d Merge branch 'development_v2.5' into zik_development_v2.5
* development_v2.5:
  analytics events update
4 years ago
Zohaib Iqbal Kambrani 7051b3ed63 Analtyics at registration and liveacare payment fail 4 years ago
haroon amjad 4cbccd8efb analytics events update 4 years ago
Zohaib Iqbal Kambrani 29c6841888 Analytics 4 years ago
Zohaib Iqbal Kambrani a01b8b82da no message 4 years ago
Zohaib Iqbal Kambrani 86363a15d6 Merge branch 'development_v2.5' into zik_development_v2.5
* development_v2.5:
  Updates & fixes
  ED Online Check-In
  Calendar fixes
  updates & fixes
4 years ago
Zohaib Iqbal Kambrani 5c32e488d0 no message 4 years ago
haroon amjad 3396b4253b Updates & fixes 4 years ago
Zohaib Iqbal Kambrani 6cd660184a no message 4 years ago
haroon amjad 8b7a6e7689 ED Online Check-In 4 years ago
Zohaib Iqbal Kambrani f42e2fb652 Revert "no message"
This reverts commit da7884ff61.
4 years ago
haroon amjad bbb99667f8 Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5 4 years ago
haroon amjad f9a733884d Calendar fixes 4 years ago
haroon amjad 27c6837f25 updates & fixes 4 years ago
Zohaib Iqbal Kambrani 1c6a62776c Analytics statements align to bottom of block 4 years ago
Zohaib Iqbal Kambrani 1523fd5ade Analytics for login registration 4 years ago
Zohaib Iqbal Kambrani da7884ff61 no message 4 years ago
haroon amjad f50bfda330 updates 4 years ago
Zohaib Iqbal Kambrani a0e619eec6 fixes 4 years ago
Zohaib Iqbal Kambrani 88b904a4b8 analytics changes 4 years ago
Zohaib Iqbal Kambrani fb4fb8d29e Merge branch 'development_v2.5' into zik_webrtc_dev_v2.5
* development_v2.5:
  Google analytics events update
  Updates
  Updates & fixes
  DateTime Fixes
  HHC Fixes
  updates & fixes
  Updates & fixes

# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/fragments/home_page_fragment2.dart
4 years ago
Zohaib Iqbal Kambrani 8a95daff7c Google analytics events update 4 years ago
Zohaib Iqbal Kambrani e107d8a1a4 no message 4 years ago
haroon amjad 1faf27959a Updates 4 years ago
haroon amjad 9057a96d7f Updates & fixes 4 years ago
haroon amjad 842e099953 DateTime Fixes 4 years ago
haroon amjad a9e48e487f HHC Fixes 4 years ago
haroon amjad f1129cc14c updates & fixes 4 years ago
Zohaib Iqbal Kambrani 612d9eb019 Project Filter Applied on Packages & Offers 4 years ago
haroon amjad fd96869d89 Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5
# Conflicts:
#	lib/pages/landing/fragments/home_page_fragment2.dart
4 years ago
haroon amjad c3538ebdb6 Updates & fixes 4 years ago
Zohaib Iqbal Kambrani 94a99a911e Offer And Packages (View Only) 4 years ago
haroon amjad 8d988ba994 updates & fixes 4 years ago
haroon amjad 4ba37d342c RRT Updates 4 years ago
haroon amjad 72e5d0a2be Pharma LiveCare 4 years ago
haroon amjad 33329f5c8a base app client update 4 years ago
haroon amjad aae48f2555 Android permission dialog updates 4 years ago
haroon amjad 887303fcde updates 4 years ago
haroon amjad 643763764d family files fixes 4 years ago
haroon amjad be2a9380df Analytics change 4 years ago
haroon amjad 9464d543fc updates 4 years ago
haroon amjad bc97cfa95b Update Insurance changes 4 years ago
haroon amjad 6ba695f2c9 Merge branch 'zik_new_design_flutter_v2.5' into 'development_v2.5'
Zik new design flutter v2.5

See merge request Cloud_Solution/diplomatic-quarter!596
4 years ago
Sikander Saleem 27d0d80017 Merge branch 'development_v2.5' into sikander_family_profile_switch
# Conflicts:
#	lib/pages/DrawerPages/family/my-family.dart
#	lib/widgets/drawer/app_drawer_widget.dart
4 years ago
Sikander Saleem bcf746aa0b Merge remote-tracking branch 'origin/development_v2.5' into development_v2.5 4 years ago
haroon amjad 72e2707d4b updates 4 years ago
Sikander Saleem 1b82146303 my family switch profile on dashboard. 4 years ago
Sikander Saleem 230444803d Merge remote-tracking branch 'origin/development_v2.5' into development_v2.5 4 years ago
Sikander Saleem fd73c248e2 my family switch profile improvement. 4 years ago
Zohaib Iqbal Kambrani d7931ac7da Analytics: update set user 4 years ago
haroon amjad d344169399 Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5
# Conflicts:
#	lib/pages/BookAppointment/BookSuccess.dart
4 years ago
haroon amjad a918d409fb updates & fixes 4 years ago
Zohaib Iqbal Kambrani 99bdd25bd3 added more analytics logs 4 years ago
haroon amjad 60a44f9a42 OpenTok fixes 4 years ago
Zohaib Iqbal Kambrani 9890d2caec Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
  mobile number updates
  video call setup with flutter 2.8, firebase modifications
4 years ago
Zohaib Iqbal Kambrani 687bc543ab OpenTok Video Call 4 years ago
haroon amjad ce8a7c07de Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5 4 years ago
haroon amjad ff72b4b31e mobile number updates 4 years ago
Sikander Saleem 7490d238e4 Merge remote-tracking branch 'origin/development_v2.5' into development_v2.5
# Conflicts:
#	lib/uitl/push-notification-handler.dart
4 years ago
Sikander Saleem 67b87449a9 video call setup with flutter 2.8, firebase modifications 4 years ago
Zohaib Iqbal Kambrani bf7c1d1610 Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
  updates
  livecare changes
  updates
4 years ago
Zohaib Iqbal Kambrani aac15c5a4a partial analytics fixes and updates 4 years ago
haroon amjad 8c96de866b updates 4 years ago
haroon amjad 7d7864a1eb livecare changes 4 years ago
haroon amjad 0ea2550246 Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5 4 years ago
haroon amjad 32edb2e71e updates 4 years ago
Zohaib Iqbal Kambrani c61de7cfdc no message 4 years ago
Zohaib Iqbal Kambrani 23404b4495 Video call at InAppWebView 4 years ago
Zohaib Iqbal Kambrani 936b7c28f9 Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
  Covid updates & other fixes

# Conflicts: Resolved
#	lib/config/config.dart
#	lib/pages/webRTC/signaling.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
4 years ago
haroon amjad 927db41068 Covid updates & other fixes 4 years ago
Zohaib Iqbal Kambrani a398220033 no message 4 years ago
Zohaib Iqbal Kambrani a26b17f52d Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
  Translation fixes
  OBGyne updates
  updates
  OB Gyne appo updates
  no message
  updates & fixes
  no message
  no message
  Ancillary Orders completed
  updates & fixes

# Conflicts: Resolved
#	lib/pages/BookAppointment/widgets/DentalComplaintCard.dart
#	lib/widgets/drawer/app_drawer_widget.dart
4 years ago
Zohaib Iqbal Kambrani a8e1ba6b86 no message 4 years ago
haroon amjad ac5077e9e7 Translation fixes 4 years ago
haroon amjad f879991b50 OBGyne updates 4 years ago
haroon amjad cbf49e31a1 Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5 4 years ago
haroon amjad 2a343db335 updates 4 years ago
haroon amjad 736edad018 OB Gyne appo updates 4 years ago
haroon amjad 907181a56c Merge branch 'development_v2.5' into haroon_development_2.5
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 4b4ac4819f no message 4 years ago
haroon amjad 3eb7a4325b updates & fixes 4 years ago
Zohaib Iqbal Kambrani ff508de9f7 Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
  Updates & fixes

# Conflicts: resolved
#	lib/pages/medical/balance/confirm_payment_page.dart
4 years ago
haroon amjad aa36154764 Updates & fixes 4 years ago
Zohaib Iqbal 364ff3344a Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5'
# Conflicts:
#   lib/pages/BookAppointment/QRCode.dart
#   lib/pages/login/register-info.dart
#   lib/pages/medical/balance/confirm_payment_page.dart
4 years ago
Zohaib Iqbal Kambrani a2efbf6494 no message 4 years ago
Zohaib Iqbal Kambrani 81a3d1ce87 no message 4 years ago
Zohaib Iqbal Kambrani 940a19d4d7 Merge branch 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into zik_new_design_flutter_v2.5
* 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter:
  ancillary orders update
  Updates & fixes
  fix category issue
  fixes & updates
  lakum fix
  Updates & fixes
  fix translation issue
  Compare duplication fixed
  Updates & fixes
  Updates & fixes
  fix compare issue
  pharmacy fixes
  fix categories & cantact design
  pharmacy fixes
  Updates & fixes
  fix conflict
  Updates & fixes
  Updates & fixes
  Login fixes

# Conflicts: Resolved
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/BookAppointment/SearchResults.dart
4 years ago
Zohaib Iqbal Kambrani d974a7430c Google Analytics as per e-Cense document 4 years ago
haroon amjad 4bc67b37e0 no message 4 years ago
Haroon Amjad 1cb7eb2afb CS branch changes 4 years ago
haroon amjad f8b3847d0a Ancillary Orders completed 4 years ago
haroon amjad ea8d700d22 updates & fixes 4 years ago
haroon amjad efced34ffa Updates 4 years ago
haroon amjad 19dadd2b35 Merge branch 'development_v2.5' into haroon_development_2.5 4 years ago
haroon amjad a6c6651363 Updates & fixes 4 years ago
Zohaib Iqbal 259e27d4a7 Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5'
# Conflicts:
#   lib/pages/landing/fragments/home_page_fragment2.dart
#   lib/uitl/app_shared_preferences.dart
#   lib/widgets/in_app_browser/InAppBrowser.dart
4 years ago
Zohaib Iqbal Kambrani ab8b62bc3a Packages and offers fixes, HMG Internet work in progress, 4 years ago
haroon amjad 7f5f3ababe Registration fix 4 years ago
haroon amjad 0acc134e6e Updates & fixes 4 years ago
haroon amjad e45c2c5652 covid & pharmacy updates 4 years ago
haroon amjad eb6b0aefc0 Merge branch 'fatima_v2' into 'development_v2.5'
Fatima v2

See merge request Cloud_Solution/diplomatic-quarter!580
4 years ago
haroon amjad 7dbc00a864 ancillary orders update 4 years ago
haroon amjad 693f8cb090 Updates & fixes 4 years ago
Fatimah Alshammari f83adbc6ff Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2 4 years ago
Fatimah Alshammari 0b21252ae7 fix category issue 4 years ago
haroon amjad 4acdad0e99 fixes & updates 4 years ago
haroon amjad 8f91d0a0dc lakum fix 4 years ago
haroon amjad 40d649dfa4 Updates & fixes 4 years ago
haroon amjad e53ba65ddd Merge branch 'development_v2.5' into haroon_development_2.5 4 years ago
Fatimah Alshammari 0985436a10 fix translation issue 4 years ago
haroon amjad 28107f9a48 Compare duplication fixed 4 years ago
haroon amjad 8c3b443f79 Merge branch 'development_v2.5' into haroon_development_2.5 4 years ago
haroon amjad 4e3d99b007 Updates & fixes 4 years ago
Fatimah Alshammari e5f0f5777b Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2
# Conflicts:
#	lib/services/pharmacy_services/product_detail_service.dart
4 years ago
haroon amjad 6d88607631 Updates & fixes 4 years ago
Fatimah Alshammari 57d10d9e1f fix compare issue 4 years ago
haroon amjad 1f19af01c4 Merge branch 'development_v2.5' into haroon_development_2.5 4 years ago
haroon amjad c175139a29 pharmacy fixes 4 years ago
Fatimah Alshammari 71a28e2ed6 Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2 4 years ago
Fatimah Alshammari cc783045bb fix categories & cantact design 4 years ago
haroon amjad c05772c63a pharmacy fixes 4 years ago
haroon amjad b15bd2362b Updates & fixes 4 years ago
Fatimah Alshammari 7634c35e3d Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2
# Conflicts:
#	lib/widgets/input/text_field.dart
4 years ago
Fatimah Alshammari d7c3cb3dbc fix conflict 4 years ago
haroon amjad c2b0326676 Updates & fixes 4 years ago
haroon amjad 3107d1e86d Updates & fixes 4 years ago
haroon amjad eea701907d Login fixes 4 years ago
haroon amjad 0ae4a13c02 Merge branch 'zik_new_design_flutter_v2.5' into 'development_v2.5'
Zik new design flutter v2.5

See merge request Cloud_Solution/diplomatic-quarter!570
4 years ago
Zohaib Iqbal Kambrani 1a6a26be75 Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5: (36 commits)
  merge improvements
  Health plugin updated
  fix search issue
  JIRA bug fixes
  updates & fixes
  Fixes & updates
  six issues
  nfc plugin improvement.
  disable lakum on check out page
  fix issue
  fix lakum issues
  Smartwatch fixes
  screen plugin improvement.
  Updates & fixes
  video call camera view issue fix, barcode plugin change, smart watches improvements.
  add quantity filed fixed
  pharmacy uo fix
  Fixes
  fix issue
  Speech to text fix in iOS
  ...

# Conflicts: Resolved
#	android/app/build.gradle
#	android/app/src/main/AndroidManifest.xml
#	android/build.gradle
#	android/gradle/wrapper/gradle-wrapper.properties
#	lib/pages/conference/web_rtc/widgets/cam_view_widget.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/livecare/incoming_call.dart
4 years ago
Sikander Saleem c8b5602d8e flutter 2.8 improvements. 4 years ago
Sikander Saleem 3ad90f1a01 Merge branch 'development_new_design_2.0' into development_v2.5 4 years ago
haroon amjad 7733c74f00 Updates & fixes 4 years ago
Zohaib Iqbal Kambrani 63ffabcc86 no message 4 years ago
Sikander Saleem 684add0090 merge improvements 4 years ago
Sikander Saleem 9ba7b3b44b Merge branch 'development_new_design_2.0' into development_v2.5
# Conflicts:
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/medical/smart_watch_health_data/syncHealthData.dart
#	lib/pages/vaccine/my_vaccines_screen.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	pubspec.yaml
4 years ago
haroon amjad c379c6a37b Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 4c2410cfd5 Health plugin updated 4 years ago
Fatimah Alshammari 216cc4a7e3 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
Fatimah Alshammari d767febcd0 fix search issue 4 years ago
haroon amjad 7bc8f69dfb JIRA bug fixes 4 years ago
haroon amjad 2670d0be57 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 9c0337aa01 updates & fixes 4 years ago
haroon amjad 330f2d6c86 Fixes & updates 4 years ago
Fatimah Alshammari b09b1e4732 six issues 4 years ago
Sikander Saleem 2a92478d01 nfc plugin improvement. 4 years ago
Fatimah Alshammari f9d1bbe2ee disable lakum on check out page 4 years ago
Fatimah Alshammari cf7dd13a83 fix issue 4 years ago
Fatimah Alshammari ff7146e259 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart
#	lib/pages/pharmacy/pharmacyContacts.dart
4 years ago
Fatimah Alshammari de86cffb8c fix lakum issues 4 years ago
haroon amjad d5b58c07ca Smartwatch fixes 4 years ago
Sikander Saleem 2fd0fd3f85 screen plugin improvement. 4 years ago
haroon amjad a60e878fef Updates & fixes 4 years ago
Sikander Saleem 628439ddf8 video call camera view issue fix, barcode plugin change, smart watches improvements. 4 years ago
haroon amjad 0b4e674097 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 03e554b1af Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!562
4 years ago
hussam al-habibeh cf556c66b0 add quantity filed fixed 4 years ago
haroon amjad bb9aaf9945 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacies/screens/product-details/availability_info.dart
4 years ago
hussam al-habibeh 516fddf962 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
hussam al-habibeh e291d46af7 pharmacy uo fix 4 years ago
haroon amjad 207525e31a Fixes 4 years ago
Fatimah Alshammari 749b89b67d fix issue 4 years ago
haroon amjad 94aab4a737 Speech to text fix in iOS 4 years ago
Fatimah Alshammari a1b4e1c8a3 Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
Fatimah Alshammari 7ffb431454 added map luncher 4 years ago
haroon amjad 3b9c1eb9ed Appointment booking fix 4 years ago
Sikander Saleem caec2c4ca4 video call improvements. 4 years ago
haroon amjad 302e9dbadd Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 76984a4ef6 Fixes 4 years ago
Fatimah Alshammari 1b9e3b75bd fix issue of navigation 4 years ago
Sikander Saleem e3bf988df5 map picker, firebase improvement and changes for v2.5 4 years ago
Fatimah Alshammari c84d1cadad fix address issue 4 years ago
Fatimah Alshammari a55ca33c1b Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/search_products_page.dart
#	lib/widgets/pharmacy/product_tile.dart
4 years ago
Fatimah Alshammari bc9fc5a878 fix issue 4 years ago
Fatimah Alshammari 9d9377d59f fix issues 4 years ago
haroon amjad eb64962d7c Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad b0ae08d6a5 updates & fixes 4 years ago
haroon amjad d7de2d6802 Merge branch 'products_tails' into 'development_new_design_2.0'
Products tails

See merge request Cloud_Solution/diplomatic-quarter!557
4 years ago
haroon amjad 18c5b53b30 Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
pharmacy design home page

See merge request Cloud_Solution/diplomatic-quarter!556
4 years ago
Elham Rababh b2814d0183 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into products_tails 4 years ago
hussam al-habibeh 9c8bd64142 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
hussam al-habibeh 6b1c0e04d0 pharmacy design home page 4 years ago
Elham Rababh 16c1064a45 PMAU-19 4 years ago
haroon amjad c1b194d15d Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
pharmacy home design

See merge request Cloud_Solution/diplomatic-quarter!555
4 years ago
Elham Rababh 3e667d6b87 fix arabic language 4 years ago
Elham Rababh f623828d78 fix arabic language 4 years ago
hussam al-habibeh 01433963bd pharmacy home design 4 years ago
Elham Rababh 8f044a635a fix footer design 4 years ago
haroon amjad 1a90698a99 Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
fix ontap on prodcut card

See merge request Cloud_Solution/diplomatic-quarter!554
4 years ago
hussam al-habibeh 1984400239 fix ontap on prodcut card 4 years ago
haroon amjad 6c20bf50b5 Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!553
4 years ago
hussam al-habibeh 3c97122308 pharmacy home dsign 4 years ago
haroon amjad 14b0c4c125 Merge branch 'products_tails' into 'development_new_design_2.0'
fix on design

See merge request Cloud_Solution/diplomatic-quarter!550
4 years ago
haroon amjad f06122d084 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!551
4 years ago
haroon amjad 75423e5501 Updates 4 years ago
Fatimah Alshammari 4d8271c45d fix product details issue 4 years ago
Fatimah Alshammari 169ebac076 Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/screens/product-details/product-name-and-price.dart
4 years ago
Elham Rababh d6eeb02c91 fix on design 4 years ago
Fatimah Alshammari fb974af726 fix issues 4 years ago
haroon amjad d1fcdcc898 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
hussam al-habibeh 01a56da151 merge conflict resolved 4 years ago
hussam al-habibeh 141e650276 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
 Conflicts:
	lib/pages/pharmacies/screens/product-details/product-name-and-price.dart
4 years ago
hussam al-habibeh 8c4af92832 pharmacy new design home 4 years ago
hussam al-habibeh a5e7541394 new design pharmacy home 4 years ago
haroon amjad cf27c3e796 Incoming call & LiveCare pending UI revamped 4 years ago
hussam al-habibeh af0316367d Merge branch 'products_tails' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
Elham Rababh c5be1472e7 first step from product details 4 years ago
Fatimah Alshammari dbe74b3eb4 fix desing 4 years ago
Fatimah Alshammari bc49d0d7c0 Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
Fatimah Alshammari db3ea448f6 fix design 4 years ago
Elham Rababh c6be53d800 first step from product details 4 years ago
Elham Rababh a71e7e4075 first step from product details 4 years ago
haroon amjad fe7baeab3c LiveCare permissions 4 years ago
haroon amjad 39190681c6 Updates 4 years ago
haroon amjad e3b7069aa2 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/parent_categorise_page.dart
#	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
#	lib/pages/webRTC/call_page.dart
#	lib/pages/webRTC/signaling.dart
4 years ago
haroon amjad 2274c6affe Merge branch 'zik_new_design_2.0' into 'development_new_design_2.0'
Zik new design 2.0

See merge request Cloud_Solution/diplomatic-quarter!531
4 years ago
haroon amjad 8b1733e917 no message 4 years ago
haroon amjad 003375b12f Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!543
4 years ago
haroon amjad 68b443905e Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!544
4 years ago
Elham Rababh 34596163d1 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 4 years ago
Sikander Saleem 4518a26ff1 video call improvement. 4 years ago
Fatimah Alshammari 127096ec04 fixed wishlist design 4 years ago
Fatimah Alshammari 21c315c1a3 fix wishlist issue 4 years ago
hussam al-habibeh e6fd5293ca fix filited produvts API 4 years ago
Fatimah Alshammari 7bbabd798a fix issue 4 years ago
Fatimah Alshammari e640f41c35 Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
#	lib/pages/pharmacies/widgets/ProductOrderItem.dart
4 years ago
Fatimah Alshammari 12b20831df fix app bar 4 years ago
Elham Rababh 12e47aba82 fix as first step 4 years ago
haroon amjad 816dfe4a12 Pharmacy fixes 4 years ago
haroon amjad 2c198ed224 no message 4 years ago
haroon amjad a88889ec1d Merge branch 'nov_fixes' into 'development_new_design_2.0'
small fix in order details

See merge request Cloud_Solution/diplomatic-quarter!540
4 years ago
Elham Rababh 6439fe264a small fix in order details 4 years ago
haroon amjad 17d569216d Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!539
4 years ago
Fatimah Alshammari 2992ca4f70 fix translation 4 years ago
Fatimah Alshammari bd93395d0f fix order details issue 4 years ago
Fatimah Alshammari c60cf72640 fix lakum design 4 years ago
Fatimah Alshammari 5ae7471d3e fix issue 4 years ago
Fatimah Alshammari 7b44f3487f fix lakum design 4 years ago
Fatimah Alshammari e9a86b4e1c fix lakum 4 years ago
Fatimah Alshammari d25f888c3e Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/screens/lakum-main-page.dart
4 years ago
Fatimah Alshammari a858d8764a fixed issues 4 years ago
devmirza121 f9e98c5fa4 Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
devmirza121 7d2a6c794b Clinic Search Dialog 4 years ago
haroon amjad 4b446bb6d0 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad b2bb201a34 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
haroon amjad 333b41632c fixes 4 years ago
Sikander Saleem 53e0165286 improvements. 4 years ago
Sikander Saleem 407fb81038 Merge branch 'development_new_design_2.0' into new_design_sikander 4 years ago
Sikander Saleem 7df0fc59df laser images change & offer and packages 4 years ago
haroon amjad 5bb20ea9a2 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 5f0985adaa Updates 4 years ago
Fatimah Alshammari ffc2f2b4bb fix issues 4 years ago
Fatimah Alshammari 1539945a29 Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
Fatimah Alshammari c87a391a23 fixed wishlist issue 4 years ago
haroon amjad e67e17c2ba Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 7d29ee4468 cart order page fixes 4 years ago
haroon amjad 6d970800f9 Book Appo fix 4 years ago
Fatimah Alshammari a2a6da1527 Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
Fatimah Alshammari 5dc1561992 fixed notify issue 4 years ago
haroon amjad d0c96d245b Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad a646677fae Pharmacy & smart watch data fixes 4 years ago
Zohaib Iqbal Kambrani 3bd94ee05e Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0:
  fix issues
  Base app client updates
  prescription reminders added
  Medical Reminder 1.0
  lakum fixes
  Medical Reminder
4 years ago
Zohaib Iqbal Kambrani b596b1b61d WebRTC and Packages Offer | Merge 4 years ago
Fatimah Alshammari 468d64a1e0 fix design issue 4 years ago
haroon amjad 7c6fa89d63 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 7ffc467552 Lakum fixes 4 years ago
Fatimah Alshammari 998c1af0f7 Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
Fatimah Alshammari ae3bb1bb2d fix issues 4 years ago
haroon amjad ab7162f164 Base app client updates 4 years ago
haroon amjad 68294690a1 prescription reminders added 4 years ago
haroon amjad ff0e878bf2 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
devmirza121 7f8a0320a7 Medical Reminder 1.0 4 years ago
haroon amjad 61a406085b lakum fixes 4 years ago
devmirza121 f3b7a5c318 Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
devmirza121 69b1dd6533 Medical Reminder 4 years ago
haroon amjad 47b7b0db58 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacy/order/Order.dart
4 years ago
Sikander Saleem 044c442ce0 Merge branch 'development_new_design_2.0' into new_design_sikander
# Conflicts:
#	lib/pages/parent_categorise_page.dart
4 years ago
Sikander Saleem 5a8c887117 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 4 years ago
Fatimah Alshammari bdf3429502 Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacy/order/Order.dart
4 years ago
haroon amjad 8c9ff27515 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 777d88be30 updates 4 years ago
haroon amjad 87a997d156 Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!521
4 years ago
Fatimah Alshammari 54ff9931cb fixed arrow issue order page 4 years ago
Sikander Saleem 084c82d7a8 improvements 4 years ago
Sikander Saleem 00f63cd288 Merge branch 'development_new_design_2.0' into new_design_sikander
# Conflicts:
#	lib/pages/DrawerPages/notifications/notification_details_page.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sikander Saleem 014074c414 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/pages/Blood/blood_donation.dart
#	lib/pages/BookAppointment/components/SearchByClinic.dart
4 years ago
hussam al-habibeh 7607631052 sub categories pagnation 4 years ago
hussam al-habibeh c0e86721f6 Merge branch 'nov_fixes' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
 Conflicts:
	lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
	lib/pages/pharmacies/widgets/ProductOrderItem.dart
4 years ago
hussam al-habibeh db1820fda4 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
Sikander Saleem 9a82b9c369 laser clinic added. 4 years ago
haroon amjad 79d99dd48a Pharmacy security updates applied 4 years ago
Fatimah Alshammari 3bfca80ab9 fixed issue 4 years ago
Elham Rababh 258e107e1b fix cart order page 4 years ago
hussam al-habibeh ff86dcbdc0 sub categories pagnation 4 years ago
Elham Rababh 7b6622ee4c fix cart order page 4 years ago
haroon amjad 4823919fcb Pharmacy fixes 4 years ago
haroon amjad f4ccecc1af Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
fix issue

See merge request Cloud_Solution/diplomatic-quarter!516
4 years ago
Fatimah Alshammari adfa707eda fix issue 4 years ago
haroon amjad f533dd5356 Merge branch 'nov_fixes' into 'development_new_design_2.0'
fix cart order page

See merge request Cloud_Solution/diplomatic-quarter!515
4 years ago
Elham Rababh 6ff829ab91 fix cart order page 4 years ago
haroon amjad d78d1f1068 Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
sub categorise fix

See merge request Cloud_Solution/diplomatic-quarter!511
4 years ago
haroon amjad 6db5577a12 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
fixed issues

See merge request Cloud_Solution/diplomatic-quarter!513
4 years ago
haroon amjad d4e71fd8ec Merge branch 'nov_fixes' into 'development_new_design_2.0'
fix cart back button

See merge request Cloud_Solution/diplomatic-quarter!514
4 years ago
Elham Rababh 275871bc39 fix addcustomeraddress 4 years ago
hussam al-habibeh e917da9183 sub Categorise fixed 4 years ago
hussam al-habibeh 80c6be239e Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
 Conflicts:
	lib/pages/sub_categorise_page.dart
4 years ago
hussam al-habibeh 300668cc81 sub Categorise fixed 4 years ago
Fatimah Alshammari 333247faa2 fixed issues 4 years ago
Elham Rababh fb1d07fcba fix cart back button 4 years ago
haroon amjad d630c6c45f Pharmacy fixes 4 years ago
hussam al-habibeh d7b32df024 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
hussam al-habibeh 9ccb155761 sub categorise fix 4 years ago
Haroon Amjad 464ad9a3cb Shopping cart fix 4 years ago
haroon amjad 67b6fd4ab6 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Elham Ali f0bb496df5 Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!506
4 years ago
haroon amjad 7a8ed5b014 Total amount calculation fixes 4 years ago
hussam al-habibeh b09bc3bef9 merge dev to hussam pharmacy fix 4 years ago
haroon amjad c29aee46dd Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
4 years ago
haroon amjad a3fdb35c30 fixes 4 years ago
Elham Rababh f88864efd4 fix calling missing APi 4 years ago
hussam al-habibeh 1a382bfc80 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
 Conflicts:
	lib/config/config.dart
	lib/pages/parent_categorise_page.dart
	lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
	lib/pages/pharmacies/screens/product-details/product-detail.dart
	lib/pages/sub_categorise_page.dart
4 years ago
hussam al-habibeh 307e488a0e pharmacy product pagination 4 years ago
hussam al-habibeh a35e149088 product pagination 4 years ago
Elham Ali a9bd9f1fdf Merge branch 'nov_fixes' into 'development_new_design_2.0'
fix bottom bar  in cart page

See merge request Cloud_Solution/diplomatic-quarter!504
4 years ago
haroon amjad 289e74fd0a fixes 4 years ago
Elham Rababh 05e4e7be45 fix bottom bar in cart page 4 years ago
haroon amjad 08f0f7b660 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
fix issue

See merge request Cloud_Solution/diplomatic-quarter!501
4 years ago
Elham Ali 47c2c80b36 Merge branch 'nov_fixes' into 'development_new_design_2.0'
Nov fixes

See merge request Cloud_Solution/diplomatic-quarter!502
4 years ago
Elham Rababh 65aac99806 fix Availabilty part 4 years ago
Fatimah Alshammari d1e0b6ccd9 fix issue 4 years ago
haroon amjad a74a6d5bc8 Merge branch 'mirza_home_page' into 'development_new_design_2.0'
Mirza home page

See merge request Cloud_Solution/diplomatic-quarter!499
4 years ago
devmirza121 6575456d3b Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
4 years ago
devmirza121 dc3d3bc772 Health Calculator 5.0 4 years ago
Elham Rababh 8a168386da fix black screen which is appear in cart page 4 years ago
Fatimah Alshammari f5de786745 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
Fatimah Alshammari 96ec3f2926 fix issues 4 years ago
Elham Rababh dc7a5d3dca Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 4 years ago
haroon amjad 3ec2f990b1 product detail page updates 4 years ago
Fatimah Alshammari c4e185ea60 fixed issues 4 years ago
Elham Rababh 2c3c270c43 finish steps inside payment 4 years ago
Elham Rababh b7dc6ee4b1 change model 4 years ago
Fatimah Alshammari 444bc7383d Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
Fatimah Alshammari 62d904aa68 fixed issues 4 years ago
Elham Rababh 41097f119c Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 4 years ago
haroon amjad 70304427f9 Doc specialty fix 4 years ago
haroon amjad 11d37d26e5 Product Detail page fix 4 years ago
Elham Rababh 45d167fc5e Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 4 years ago
haroon amjad 338c646a43 updates 4 years ago
haroon amjad 534b82461a Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 14b85cc407 Family files API changes 4 years ago
devmirza121 590b795356 Health Calculator 4.0 marge 4 years ago
devmirza121 a131f24952 Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart
#	lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_result_page.dart
#	lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart
#	lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart
#	lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_result_page.dart
#	lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
devmirza121 1d1708bdcc Health Calculator 4.0 4 years ago
Elham Rababh 4e54349e3b Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 4 years ago
Elham Rababh df9e58402d first step from update design 4 years ago
hussam al-habibeh b2b786d157 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
haroon amjad 6ffa07392c Product detail page updates 4 years ago
Elham Rababh f8883f5439 first step from fixing check out process 4 years ago
hussam al-habibeh 5927f3e35f pharmacy home page update 4 years ago
haroon amjad 75989bdc01 Health Calculators translations 4 years ago
haroon amjad 90b821a37d Offers & packages UI completed 4 years ago
haroon amjad d2834bb3dd Health calculator fixes 4 years ago
haroon amjad ea745f1b9f Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad efe8dea9a9 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!489
4 years ago
haroon amjad 502c7fd3de Offers & discounts UI updating 4 years ago
devmirza121 566de7936a Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
devmirza121 6225f2468d Health Calculator 3.0 4 years ago
Fatimah Alshammari ce0dff11b2 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
Fatimah Alshammari eb4801c7ee fixed rating issues 4 years ago
Haroon Amjad d5c68c5032 Packages & offers design 4 years ago
haroon amjad b752b42a34 Updates & fixes 4 years ago
devmirza121 d4eab13982 Health Calculator 2.0 4 years ago
devmirza121 e13d64dbf7 Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
devmirza121 0b8600605b Health Calculator 1.0 4 years ago
Fatimah Alshammari 77c8c85e88 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
haroon amjad 9ce77b56b9 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Fatimah Alshammari ca11fe3134 fix issues 4 years ago
haroon amjad 30e67bbe3e updates 4 years ago
haroon amjad c253ec3110 LiveCare UI revamped 4 years ago
haroon amjad f995a9fa8e Ambulance request UI revamped 4 years ago
Fatimah Alshammari 239d2c1036 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
Fatimah Alshammari 23acdfd494 fix loader issue and design 4 years ago
haroon amjad 894cc0e336 Updates & fixes 4 years ago
Fatimah Alshammari 6f63250252 fix issues 4 years ago
haroon amjad e1e31de818 Lakum fixes 4 years ago
haroon amjad 72784f68b9 Fixes & updates 4 years ago
haroon amjad be771917f0 pharmacy fixes 4 years ago
haroon amjad bebcd85557 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 5943522163 UI fixes 4 years ago
Fatimah Alshammari 28678633e7 Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/product-brands.dart
#	lib/pages/pharmacies/screens/lakum-main-page.dart
4 years ago
Fatimah Alshammari 78fc77159c fix lakum issues 4 years ago
haroon amjad 8d6278a59b Pharmacy fixes 4 years ago
haroon amjad 925e3cb686 Merge branch 'development' into haroon-new-design
# Conflicts:
#	lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
#	lib/main.dart
#	lib/pages/final_products_page.dart
#	lib/pages/landing/landing_page_pharmcy.dart
#	lib/pages/login/login.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/screens/product-details/product-detail.dart
#	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
#	lib/pages/pharmacy/profile/profile.dart
#	lib/services/pharmacy_services/product_detail_service.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
4 years ago
haroon amjad 585e26b091 Registration fix 4 years ago
Mohammad Aljammal fd46259701 Merge branch 'bottom_nav_pharmacy' into 'development'
show bottom nav in pharmacy all pages

See merge request Cloud_Solution/diplomatic-quarter!479
4 years ago
hussam al-habibeh cb85085969 show bottom nav in pharmacy all pages 4 years ago
Sikander Saleem d6a5f68312 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/Blood/blood_donation.dart
#	lib/pages/BookAppointment/components/SearchByClinic.dart
4 years ago
Mohammad Aljammal c0cf2f71a2 Merge branch 'bottom_nav_pharmacy' into 'development'
Bottom nav pharmacy

See merge request Cloud_Solution/diplomatic-quarter!478
4 years ago
hussam al-habibeh 46d7e7ee14 show bottom nav in pharmacy all pages 4 years ago
Sikander Saleem cd81f05a8d laser clinic design (cont.) 4 years ago
haroon amjad f15090c634 Merge branch 'development_new_design_2.0' into 'sultan_new_design'
# Conflicts:
#   lib/pages/login/register.dart
4 years ago
haroon amjad 8c99bba17b Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad e7f5fc8434 Blood donation fixes 4 years ago
Sultan Khan 64e62235c4 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan a471824507 register issues 4 years ago
Mirza.Shafique fa986476ee feedback status bar 4 years ago
haroon amjad e82b8d4439 Lakum & other fixes 4 years ago
haroon amjad f029aaa1c6 Fixes & code optimizations 4 years ago
Mohammad Aljammal f9e33e7212 Merge branch 'zik_new_design_2.0' into 'development_new_design_2.0'
Zik new design 2.0

See merge request Cloud_Solution/diplomatic-quarter!467
4 years ago
Mohammad Aljammal 60d2496f0a Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!472
4 years ago
Mohammad Aljammal f424315a19 last commit 😄 4 years ago
Mohammad Aljammal d4283c0116 fix merge issue 4 years ago
Mohammad Aljammal 4cb63e353b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
 Conflicts:
	lib/pages/pharmacies/screens/product-details/product-detail.dart
4 years ago
Fatimah Alshammari 9cececf3f1 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
Fatimah Alshammari 044f74865e fixed issues 4 years ago
haroon amjad 5692bc66a9 Removing anatomy pub from project 4 years ago
Elham Rababh d486b76116 fix merge issue 4 years ago
hussam al-habibeh bc91b9ad88 bottom nav pharmacy 4 years ago
haroon amjad 668d725b25 Laser booking 4 years ago
Elham Rababh c97c39ea11 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Oct_fixes
 Conflicts:
	lib/config/config.dart
	lib/pages/pharmacies/screens/cart-page/select_payment_option_widget.dart
4 years ago
haroon amjad fa5fd8e323 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 0853ecdc27 Body added 4 years ago
mosazaid 4939fe63d1 pharmacy cart fixe counter 4 years ago
haroon amjad 0c2e3f772b Merge branch 'mirza_home_page' into 'development_new_design_2.0'
Mirza home page

See merge request Cloud_Solution/diplomatic-quarter!468
4 years ago
Mirza.Shafique f547dc105c Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
Mirza.Shafique 69db41364f icon fixs 4 years ago
Fatimah Alshammari 42e74759e4 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
# Conflicts:
#	lib/pages/search_products_page.dart
4 years ago
haroon amjad 62974b7b72 Updates & fixes 4 years ago
Fatimah Alshammari e6378b7ada fix issues 4 years ago
Elham Rababh 616748dc6f fix proceed button 4 years ago
Zohaib Iqbal Kambrani 94a5cac27d Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0:
  LiveCare Schedule fixes
  improvements.
  live care design 3.0
  dialog ui changes in wallet & improvements.
  LiveCare Schedule API fix
  live care design 2.0
  Health converters UI done
  Health Calculators APIs updated
  Translation updates
  SessionID update
  live care design 1.0
  Updates & fixes
  blood sugar dialog improvement.

# Conflicts: Rseloved
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Zohaib Iqbal Kambrani 9d71793e88 no message 4 years ago
haroon amjad 57ea450662 LiveCare Schedule fixes 4 years ago
Sikander Saleem 455f65a5e5 Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem d2223da3c2 improvements. 4 years ago
Mirza.Shafique f56ae8ff5b Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
Mirza.Shafique 6af1747f12 live care design 3.0 4 years ago
Sikander Saleem 8c27773f7f Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem 40c63ae53b dialog ui changes in wallet & improvements. 4 years ago
haroon amjad 853ca033d2 LiveCare Schedule API fix 4 years ago