Commit Graph

2634 Commits (7fc47ebf341f6aaa6b8f61ba8c676799e09fa7d6)

Author SHA1 Message Date
Fatimah Alshammari 0f22a50a5d Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/pages/pharmacy/profile/profile.dart
5 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
5 years ago
Sultan Khan c65983bfdb code merged 5 years ago
Sultan Khan 86cf9300e1 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
* 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter: (136 commits)
  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
  some design enhancments
  fix design
  fix android
  fix merge issues
  fix merge issues
  commit
  fix merge issues
  change color
  return privilege
  return privilege
  fix issues
  ...
5 years ago
Zohaib Iqbal Kambrani bbd953ae43 Order Delivery Driver tracking [inprogress] 5 years ago
mosazaid 3a45239059 Merge branch 'development' into fix_design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
mosazaid f5d478fd27 re-design child vaccine and fix some funcrionalities 5 years ago
Mohammad Aljammal 4457b5f109 add translation to ER service 5 years ago
Mohammad Aljammal 200334d8f8 Fix ER service 5 years ago
Elham Rababah 4ecce79258 first step from fix CMC 5 years ago
Elham Rababah c9edb37a3c Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_hhc_cmc
 Conflicts:
	lib/config/localized_values.dart
	lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
Elham Rababah d7a046f9ca fix issue on cmc 5 years ago
Mohammad Aljammal 1cb5e250ed Merge branch 'fix_design' into 'development'
Fix design

See merge request Cloud_Solution/diplomatic-quarter!241
5 years ago
Mohammad Aljammal b63025a9b3 return CMC HHC 5 years ago
mosazaid 5bcc67b77d Nearest Er fix design 5 years ago
mosazaid 01bfe84644 solving NearestEr design problem 5 years ago
mosazaid e71a56ed51 Merge branch 'development' into fix_design 5 years ago
mosazaid d2e1a323ce simple fix 5 years ago
Zohaib Iqbal Kambrani e2bce87e34 resolve merge conflicts. 5 years ago
Mohammad Aljammal 30ddea6419 hot fixing 5 years ago
Zohaib Iqbal Kambrani dc83b476d6 Merge branch 'development' into ZohaibIqbalKambrani
# Conflicts:
#	android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt
#	ios/Flutter/.last_build_id
#	lib/pages/landing/landing_page.dart
#	lib/pages/medical/medical_profile_page.dart
#	lib/widgets/drawer/app_drawer_widget.dart
5 years ago
Mohammad Aljammal ed729689a9 Merge branch 'design_issues' into 'development'
fix design issues

See merge request Cloud_Solution/diplomatic-quarter!237
5 years ago
Mohammad Aljammal 634c874eee fix design issues 5 years ago
Fatimah Alshammari a1b2709ac8 fixed orders 5 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
5 years ago
Fatimah Alshammari 52fa0f6f89 fixed orders 5 years ago
mosazaid 2843b1393e some design enhancments 5 years ago
Mohammad Aljammal 72290f041f fix design 5 years ago
Mohammad Aljammal de1b7cc1d0 fix merge issues 5 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
5 years ago
Mohammad Aljammal c82f01cd1a fix merge issues 5 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
5 years ago
mosazaid d77a607b78 commit 5 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
5 years ago
Mohammad Aljammal 6827efc1b6 Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into enad_pharmacy_merge 5 years ago
Mohammad Aljammal d7fe93b3f3 Merge branch 'pharmacy-hussam' into 'pharmacy'
parent_categorise_page update

See merge request Cloud_Solution/diplomatic-quarter!226
5 years ago
Mohammad Aljammal 298b4d6525 change color 5 years ago
Mohammad Aljammal 1968eb4682 return privilege 5 years ago
Mohammad Aljammal 952e106531 return privilege 5 years ago
Mohammad Aljammal f77d2b497e fix issues 5 years ago
Mohammad Aljammal 18dad434a0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_master
 Conflicts:
	lib/config/config.dart
	lib/core/service/client/base_app_client.dart
	lib/core/service/weather_service.dart
	lib/core/viewModels/dashboard_view_model.dart
	lib/main.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/AlHabibMedicalService/health-weather/health-weather-indicator.dart
	lib/pages/BookAppointment/Search.dart
	lib/pages/ErService/AmbulanceReq.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/ToDoList/ToDo.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/login/login.dart
	lib/pages/login/register.dart
	lib/pages/medical/allergies_page.dart
	lib/pages/medical/balance/advance_payment_page.dart
	lib/pages/medical/doctor/doctor_home_page.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/prescriptions/prescriptions_home_page.dart
	lib/pages/medical/vital_sign/vital_sign_details_screen.dart
	lib/uitl/location_util.dart
	lib/widgets/drawer/app_drawer_widget.dart
	pubspec.yaml
5 years ago
enadhilal 10734d5994 connecting pages.
trnaslate.
calling API.
review page.
product details page.
Wishlist page.
Brands page.
5 years ago
Mohammad Aljammal 6bda03e935 hot fixing 5 years ago
Sultan Khan e6a94f8014 login design 5 years ago
Sultan Khan b992978af4 login 5 years ago
Sultan Khan 764e706000 dashboard issue fixed 5 years ago
Sultan Khan c01246acf0 hot fix 5 years ago
Sultan Khan 2b48578e07 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 016dffcb87 change 5 years ago
Mohammad Aljammal 4263672f00 fim last vital sign data 5 years ago
Mohammad Aljammal 80da19555c Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
Hot fixes

See merge request Cloud_Solution/diplomatic-quarter!218
5 years ago
Mohammad Aljammal 519a474d41 fix live care label and vital sign data 5 years ago
Fatimah Alshammari c0920e7099 Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
#	lib/widgets/pharmacy/product_tile.dart
5 years ago
Fatimah Alshammari 5fa5e9b7c8 fixed orders and profile 5 years ago
Mohammad Aljammal 5e3f6363cf fix issues 5 years ago
Mohammad Aljammal 754e60eb72 fix send email lab result 5 years ago
Sultan Khan 6b4bae7370 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 827768e96d language change 5 years ago
Mohammad Aljammal 591d56e624 change the info images and change the out patient color 5 years ago
Mohammad Aljammal 5c8e43c163 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes 5 years ago
Sultan Khan 8becd4f920 login issue fixed 5 years ago
Sultan Khan 3edae19ad6 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan c9538c6a84 family files 5 years ago
Zohaib Kambrani 57925e3b02 Geofence fixes by JobScheduler 5 years ago
Mohammad Aljammal 33c61afd2a add powered by 5 years ago
Mohammad Aljammal 5e29dff448 fix issues insurance and medical profile order 5 years ago
Sultan Khan 355286768a Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 73c8e00852 bug fixes 5 years ago
Haroon Amjad b0ea1fc262 updates & fixes 5 years ago
Sultan Khan 18f492e52f Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan d53031b0e6 blood type update for family files 5 years ago
Mohammad Aljammal b9958acd53 fix issues 5 years ago
Mohammad Aljammal 2059b76fc1 fix Medical profile 5 years ago
Mohammad Aljammal 4d8f42b517 fix issues vital sign issue 5 years ago
Mohammad Aljammal 4f015a1cda Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes 5 years ago
Mohammad Aljammal f6983c138a fix issues 5 years ago
Sultan Khan 37ab778fd0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan b505ed1be7 blood type added 5 years ago
Zohaib Kambrani a11d93332d Wifi check network available - android
tweaking at geofence code
5 years ago
Mohammad Aljammal 09a85d9127 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes 5 years ago
Mohammad Aljammal 9c12e949e8 hot fixes 5 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
5 years ago
Fatimah Alshammari fda101840a fixed order isuues 5 years ago
Zohaib Kambrani 508bc191be geofencing login check fix 5 years ago
Sultan Khan 6b1e7587a8 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan a0baaac314 bug fixes 5 years ago
Zohaib Kambrani d8bd7d145d no message 5 years ago
Mohammad Aljammal a8b0af9ee1 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes 5 years ago
Mohammad Aljammal 9c18c69d90 hot fixes 5 years ago
haroon amjad 53282e3ae6 ToDo back issue fixed 5 years ago
haroon amjad ac3bebd59e Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon 5 years ago
haroon amjad 8c9762c24f Fixes 5 years ago
Sultan Khan 073e79c325 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 040c8f38ab hot fixes 5 years ago
Mohammad Aljammal 7bc8fdb819 fix merge issues 5 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
5 years ago
Zohaib Kambrani d8996cf879 Geofence Android Finished 5 years ago
Mohammad Aljammal d28870a629 fix merge issues 5 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
5 years ago
Mohammad Aljammal a57d5eb69f hot fixes 5 years ago
Mohammad Aljammal d9a70e7f75 Merge branch 'hot_fix' into 'diplomatic-quarter-live'
hot fixes

See merge request Cloud_Solution/diplomatic-quarter!199
5 years ago
Mohammad Aljammal 8329c534a3 hot fixes 5 years ago
Mohammad Aljammal 4e2979cd64 fix merge issues 5 years ago
Mohammad Aljammal 7167d58ce2 fix merge issues 5 years ago
Mohammad Aljammal aa89a05f1d Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
 Conflicts:
	ios/Flutter/.last_build_id
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/config/shared_pref_kay.dart
	lib/core/service/client/base_app_client.dart
	lib/core/service/medical/prescriptions_service.dart
	lib/core/viewModels/project_view_model.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/BookAppointment/BookConfirm.dart
	lib/pages/BookAppointment/DoctorProfile.dart
	lib/pages/DrawerPages/family/my-family.dart
	lib/pages/MyAppointments/MyAppointments.dart
	lib/pages/MyAppointments/models/ArrivedButtons.dart
	lib/pages/MyAppointments/widgets/AppointmentActions.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/ToDoList/ToDo.dart
	lib/pages/feedback/send_feedback_page.dart
	lib/pages/insurance/insurance_approval_screen.dart
	lib/pages/insurance/insurance_card_screen.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/login/confirm-login.dart
	lib/pages/login/login.dart
	lib/pages/medical/balance/my_balance_page.dart
	lib/pages/medical/labs/laboratory_result_page.dart
	lib/pages/medical/labs/labs_home_page.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/patient_sick_leave_page.dart
	lib/pages/medical/prescriptions/prescription_details_page.dart
	lib/pages/medical/prescriptions/prescription_items_page.dart
	lib/pages/medical/radiology/radiology_details_page.dart
	lib/pages/medical/radiology/radiology_home_page.dart
	lib/pages/medical/reports/report_home_page.dart
	lib/pages/medical/reports/reports_page.dart
	lib/pages/pharmacies/pharmacies_list_screen.dart
	lib/pages/settings/profile_setting.dart
	lib/services/authentication/auth_provider.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/buttons/floatingActionButton.dart
	lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
	lib/widgets/data_display/medical/doctor_card.dart
	lib/widgets/drawer/app_drawer_widget.dart
	lib/widgets/others/app_scaffold_widget.dart
5 years ago
mosazaid 359eba2da0 make some updates in firebase version and update gradle, finish review order 5 years ago
Zohaib Kambrani 1dc9400ffc Geofencing work in progress on android 5 years ago
Sultan Khan e312671e24 hot fixes 5 years ago
Sultan Khan cf642da661 landing page 5 years ago
Sultan Khan eec67ac930 big fixes 5 years ago
Sultan Khan 99ee5b4545 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Mohammad Aljammal b29fdbb7d0 fix home issues 5 years ago
Sultan Khan 8a554aa2f8 auth services fixed 5 years ago
Mohammad Aljammal d9759560c3 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
 Conflicts:
	lib/config/localized_values.dart
	lib/pages/login/login.dart
5 years ago
Mohammad Aljammal 02d72fa27c fix issues 5 years ago
Fatimah Alshammari 4a84483698 fixed order details 5 years ago
Sultan Khan 0f594059b5 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
haroon amjad a7dc2fdfd1 Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon 5 years ago
haroon amjad 781fd1c287 Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Sultan Khan 3aa592e2b0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 9a578cafc2 bug fixes 5 years ago
Sultan Khan b759758a68 bug fixes 5 years ago
Mohammad Aljammal 3860a08b53 Merge branch 'hot_fix' into 'diplomatic-quarter-live'
fix issues

See merge request Cloud_Solution/diplomatic-quarter!188
5 years ago
Mohammad Aljammal f38f53587b fix issues 5 years ago
Haroon Amjad 3308aa47e1 fixes 5 years ago
Sultan Khan 9e3db622fa login loader issue fixed 5 years ago
Zohaib Kambrani 78928335ef Geofences Login check (unregister/register geozones on logout/logout) 5 years ago
Zohaib Kambrani 6f6ab8d987 no message 5 years ago
Mohammad Aljammal 3122f2438b fix import dialog 5 years ago
Mohammad Aljammal 19f12116c4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix 5 years ago
Mohammad Aljammal de1e352e98 fix charts and vital sign 5 years ago
Zohaib Kambrani 53775d113d commented code offers and packages 5 years ago
Zohaib Kambrani 9947b30d3f fix merge conflict 5 years ago
Zohaib Kambrani 9ea779e48a no message 5 years ago
Zohaib Kambrani b7088f70cd Merge master in to my branch with Geofence iOS 5 years ago
haroon amjad 965c97d262 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
haroon amjad bf999e611b my appointment fix 5 years ago
Sultan Khan d779c6dd0a Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan a2e385f282 family file drawer 5 years ago
Haroon Amjad b9269f525a hot fixes 5 years ago
Haroon Amjad c67d41701d Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Haroon Amjad 5606c88715 hot fixes 5 years ago
Mohammad Aljammal 92e6275162 Add Confirm send email dialog 5 years ago
Haroon Amjad 81b51bef51 Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon 5 years ago
Mohammad Aljammal 4e823c2be4 fix chart and duplicated data in Patient Lab Result 5 years ago
haroon amjad 051bd1e23f Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
Zohaib Kambrani 67f4b4e167 iOS Geofence in progress 5 years ago
Mohammad Aljammal 4a43bcefe1 Merge branch 'hot_fix' into 'diplomatic-quarter-live'
remove ErOptions

See merge request Cloud_Solution/diplomatic-quarter!179
5 years ago
Mohammad Aljammal a6d3fce6fc remove ErOptions 5 years ago
Zohaib Kambrani 8457972fda no message 5 years ago
haroon amjad b13a56ffbd Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
haroon amjad 951d9b553f fixes & updates 5 years ago
Sultan Khan 71592adf32 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 1f0d01b6cc language issue fixed 5 years ago
Sultan Khan 2c50402aa8 language issue fixed 5 years ago
haroon amjad f394433b6e Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
haroon amjad 9d046fd971 updates & fixes 5 years ago
Mohammad Aljammal 97776ce99b Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix 5 years ago
Mohammad Aljammal b25bdbb6fa fix LiveChatPage Service LabOrderResult MedicineSearch issues 5 years ago
Zohaib Kambrani 92ba977fca no message 5 years ago
mosazaid c058cf0e93 finish address add/edit/delete/select 5 years ago
Sultan Khan 557b8e814f voice command 5 years ago
haroon amjad 75de755ccd Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/paymentService/payment_service.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
mosazaid 6ac8d67b83 finish address add/edit/delete/select 5 years ago
Zohaib Kambrani c10d024700 no message 5 years ago
Mohammad Aljammal 08aa2de69b fix Prescriptions Service and design issues 5 years ago
Zohaib Kambrani 8d5d55a150 Geofencing in progress 5 years ago
Mohammad Aljammal a2ec01be5d Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
 Conflicts:
	lib/config/localized_values.dart
	lib/pages/landing/home_page.dart
	lib/pages/medical/radiology/radiology_details_page.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 2f77592bac fix Prescriptions Service and design issues 5 years ago
haroon amjad 740a294867 Translation & bug fixes 5 years ago
Mohammad Aljammal 62b923b25e fix send rad report email 5 years ago
Mohammad Aljammal 5083080ba3 fix vital sign details 5 years ago
haroon amjad 1db5b15dcd Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon 5 years ago
haroon amjad 9ecaaa1b12 radiology fix in appointment details 5 years ago
Sultan Khan 9d9d77ee3a bug fixes 5 years ago
Sultan Khan c813deea29 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 188b72bb90 voice command 5 years ago
haroon amjad d14e7e5223 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Sultan Khan e28209d4e8 bug fixes 5 years ago
Haroon Amjad 9d3c64200e fixes 5 years ago
Mohammad Aljammal 9cec304712 Merge branch 'sultan' into 'diplomatic-quarter-live'
bug fixes

See merge request Cloud_Solution/diplomatic-quarter!168
5 years ago
Mohammad Aljammal eca2266f7b hot fixing 5 years ago
Sultan Khan 21ccf1ef86 bug fixes 5 years ago
Sultan Khan 7742313923 voice command 5 years ago
Sultan Khan ce7a64e86e Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
hussam al-habibeh e85b21c08f parent_categorise_page update 5 years ago
haroon amjad c4bb75eab4 Doctor rating fixed 5 years ago
haroon amjad 8d20762050 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
haroon amjad 33956db22a Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/config/config.dart
5 years ago
haroon amjad b55681a056 Working on steps tracking 5 years ago
Mohammad Aljammal a1e92e1fdd fix merge issue 5 years ago
Mohammad Aljammal 9dfd8a71dc Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into privileges
 Conflicts:
	lib/locator.dart
	lib/pages/DrawerPages/family/my-family.dart
	lib/pages/login/confirm-login.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/reports/report_home_page.dart
	lib/widgets/bottom_navigation/bottom_nav_bar.dart
	lib/widgets/drawer/app_drawer_widget.dart
5 years ago
Mohammad Aljammal 9b8599a2cf remove load user from SplashScreen 5 years ago
Mohammad Aljammal 4d203c8a5b fix LabResult 5 years ago
haroon amjad 8cd3ae915b Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
haroon amjad 468bb0356c updates & fixes 5 years ago
Mohammad Aljammal 14f92f6c58 remove updated button 5 years ago
Mohammad Aljammal 554ed1b50a fix insurance update 5 years ago
Sultan Khan 7f44677242 voice command priv 5 years ago
Mohammad Aljammal 9fecf8e89f fix insurance update 5 years ago
Mohammad Aljammal 935e72975c add new privilege 5 years ago
haroon amjad e495d3e5ad Health Data integration implementing 5 years ago
Sultan Khan a004610ac3 voice command updatd 5 years ago
Sultan Khan 542335364e Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan c050c3f189 voice command updated 5 years ago
Sultan Khan f083912d43 voice command updated 5 years ago
enadhilal 727940c5c6 fixed merging issues 5 years ago
haroon amjad cf6686e413 Merge branch 'master' into Haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/Covid-DriveThru/covid-drivethru-location.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
mosazaid 378562b781 adding some changes in order pages like translate texts 5 years ago
enadhilal 9c55571072 Merge branch 'pharmacy' into enad_pharmacy2 5 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
5 years ago
enadhilal 888a74fb9b add these pages
​Product Tile Component
Product Detail Page
​Wishlist Page
​Reviews Page
Brands Page + Search
5 years ago
Fatimah Alshammari ed68eed9df added links for profile 5 years ago
Mohammad Aljammal 2e2a29145c fix merge issues 5 years ago
Mohammad Aljammal 459ba828d9 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
 Conflicts:
	lib/config/shared_pref_kay.dart
	lib/core/service/client/base_app_client.dart
	lib/locator.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/landing/home_page.dart
	lib/pages/medical/vital_sign/vital_sign_item.dart
	lib/routes.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
	pubspec.yaml
5 years ago
haroon amjad 59aba6608d Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
haroon amjad a1f91d99b3 added countdown timer in my appointments 5 years ago
Fatimah Alshammari 706980248a Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/home_page.dart
5 years ago
Mohammad Aljammal 77dcb918c3 Revert "Merge branch 'pharmacy-hussam' into 'master'"
This reverts merge request !149
5 years ago
Fatimah Alshammari 9b8103bfd6 fixe order and order details 5 years ago
Sultan Khan af1c59394c Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 496163a61a voice command updated 5 years ago
Mohammad Aljammal 47e4b99f11 fix issues 5 years ago
Mohammad Aljammal 9e8def6584 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
5 years ago
Mohammad Aljammal 7f23f356f1 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!151
5 years ago
Mohammad Aljammal 4e2c955b09 add missing translation 5 years ago
haroon amjad dfa1952f4d Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app 5 years ago
hussam al-habibeh 5dc3c53550 mousa and hussam branch 5 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
5 years ago
hussam al-habibeh 800565407d 12/6 5 years ago
mosazaid 4c9a1862d2 make pharmacy home page load data even without login, and some mini changes 5 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
5 years ago
mosazaid 7ee7ef58c4 working on dynamic title on pharmacy 5 years ago
umasoodch b5413d1749 Merge branch 'master' into pharmacy
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
mosazaid 709ba2ce97 create terms-condition in pharmacy order page 5 years ago
mosazaid 2a91ae787f commit 5 years ago
Sultan Khan 92b0b6d6ea Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
5 years ago
hussam al-habibeh 8b8207cb0d search 5 years ago
Sultan Khan e34a5c3c13 multiple login calls fixed 5 years ago
Sultan Khan f5b7d35f23 bug fixes 5 years ago
Sultan Khan a3e01ff938 flutter tts 5 years ago
Sultan Khan e3e868e47c flutter tts updated 5 years ago
Sultan Khan 8c5746f7b1 bug fixes 5 years ago
Sultan Khan 8d7cc20b70 localized value updated 5 years ago
Sultan Khan 321d31b3bd voice search page updated 5 years ago
Sultan Khan d69b3676a4 weather indicator in progress 5 years ago
hussam al-habibeh 64cbae3602 Search 5 years ago
Sultan Khan 81c8239412 bug fixes 5 years ago
Sultan Khan fc0117754d Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Mohammad Aljammal 1c23e28081 fix merge issues 5 years ago
Mohammad Aljammal ced86de9fe Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into images_info
 Conflicts:
	lib/config/localized_values.dart
	lib/pages/medical/balance/advance_payment_page.dart
	lib/pages/medical/balance/my_balance_page.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 269f682bd5 Added info images description 5 years ago
mosazaid 35d0d3e441 finsi lakum points task 5 years ago
haroon amjad f1a8e09a59 Added info images description 5 years ago
haroon amjad 47b030eb82 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	ios/Flutter/.last_build_id
#	lib/config/config.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad 7edb0c8009 Doctor rating dialog revamped 5 years ago
Sultan Khan 3a055aa02b Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 79c17de0de ltr issue fixed 5 years ago
Mohammad Aljammal 3daef6e53f add images info 5 years ago
Mohammad Aljammal dc898a799d Add Privileges 5 years ago
Sultan Khan 3ab513d9d0 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 98f84c2161 voice search in progress 5 years ago
Elham Rababah 713e44cf8b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
Elham Rababah ea195ea9bf Finish translate CMC HHC 5 years ago
haroon amjad ff0d66ccdb Covid test translations 5 years ago
haroon amjad 4f1f7dcefd ereferral implementation completed 5 years ago
haroon amjad 65fbd7af8e referral finalised 5 years ago
Zohaib Kambrani 1155466d19 Packages and Offer Slider at home 5 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
5 years ago
mosazaid 951c77feb5 working on lakum account 5 years ago
mosazaid 4e5d6a9a00 finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished 5 years ago
Elham Rababah 5bf63174c9 First step from translations 5 years ago
haroon amjad 82e23efd32 working on ereferral 5 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
5 years ago
Sultan Khan 8de838a6dc Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 2fb0ccfdbd Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 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
5 years ago
haroon amjad 0181043da8 Ereferral fixes, smartwatch health data integration 5 years ago
Mohammad Aljammal 2185f5ce11 Merge branch 'hhc_cmc' into 'master'
Hhc cmc

See merge request Cloud_Solution/diplomatic-quarter!138
5 years ago
Elham Rababah 1e1677a365 naming issue fix 5 years ago
Elham Rababah 05deaa6322 Address Added Successfully 5 years ago
Sultan Khan 078183c1fb not authenticated page updated 5 years ago
Elham Rababah 68e4b92717 Address Added Successfully 5 years ago
Sultan Khan de2a5e55eb Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 7d3c1ac852 weather indicator updated 5 years ago
Sultan Khan 648d9d245d health weather indicator 5 years ago
Zohaib Kambrani 27182ee8db no message 5 years ago
Elham Rababah ed56476d81 second step from location fixes 5 years ago
Mohammad Aljammal 54d8965773 done child Vaccination 5 years ago
haroon amjad 97b8aeeff5 Version Control finished 5 years ago
haroon amjad a03d5c6d57 App initial release to stores 5 years ago
Sultan Khan e7c862c801 health weather indicator 5 years ago
Sultan Khan 909401cc7e Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan a9cb645833 health weather indicator 5 years ago
Sultan Khan 19d6057f66 health weather indicator 5 years ago
Elham Rababah 7aa7af6de7 finish CMC module 5 years ago
haroon amjad 92db2b2be9 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
Elham Rababah fd80afeb5a finish hhc module 5 years ago
Elham Rababah 3ef22be7da Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
 Conflicts:
	lib/config/config.dart
5 years ago
Elham Rababah a87855f445 Fix issues on hhc module 5 years ago
Mohammad Aljammal 49974f81db add translations to child Vaccination 5 years ago
Sultan Khan 5e6bcadec0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 603833db37 login changes 5 years ago
Sultan Khan 340b9770c8 login 5 years ago
haroon amjad e5feef8a9d Updates & UI Fixes 5 years ago
Sultan Khan 799fca346b health weather indicator 5 years ago
Sultan Khan 8612ae91c4 sultan 5 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
5 years ago
Mohammad Aljammal fa01d132c7 merger DQ live and fix some issues on Child Vaccines 5 years ago
Mohammad Aljammal a556e8c1f8 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
 Conflicts:
	lib/config/config.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
5 years ago
haroon amjad 01512e6332 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
Mohammad Aljammal 482ec536de Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixing
 Conflicts:
	lib/config/config.dart
5 years ago
Mohammad Aljammal b6d2878cf1 add Radiology translations and colors 5 years ago
Fatimah Alshammari d328c74fc4 fix order and orderdetails 5 years ago
Sultan Khan 22676fcbd1 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 5bb780c4ac push 5 years ago
haroon amjad ebb8a8fa2c Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
Mohammad Aljammal d0891ba16b Merge branch 'hot_fixing' into 'diplomatic-quarter-live'
fix lab result translations and colors

See merge request Cloud_Solution/diplomatic-quarter!128
5 years ago
Mohammad Aljammal b504f379de fix lab result translations and colors 5 years ago
Mohammad Aljammal 2731c5b1d4 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!127
5 years ago
Sultan Khan d6a0188c76 fingerprint 5 years ago
Sultan Khan 7c33c06c0c fingerprint 5 years ago
Sultan Khan 1b678e0aca fingerprint 5 years ago
Sultan Khan 6a14214a0f no message 5 years ago
Sultan Khan 24b7bca471 no message 5 years ago
haroon amjad c74ac3b7ca Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
haroon amjad 85062859c8 updates 5 years ago
Mohammad Aljammal 0ac599ea1c fix vital Sign 5 years ago
haroon amjad 10025103ac Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
haroon amjad 21c7c94ef2 updates & fixes 5 years ago
Sultan Khan b61e734f80 feedback permission 5 years ago
Sultan Khan 6bbdf05f90 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 857fc813cd button feedback 5 years ago
Sultan Khan 571bda9100 permission 5 years ago
haroon amjad d284ceac04 advance payment & payment flow issues fixed 5 years ago
Sultan Khan 8429f83d7c registration done 5 years ago
Sultan Khan 391e178484 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 8d499704dc family file changes 5 years ago
Mohammad Aljammal 91cada6901 fix Advance Payment 5 years ago
Mohammad Aljammal dcbc0de69f fix prescription 5 years ago
Mohammad Aljammal f70ca95a38 fix merge issues 5 years ago
Mohammad Aljammal 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
5 years ago
Mohammad Aljammal 939840bbe7 fix master 5 years ago
Mohammad Aljammal 67cc5e2033 fix Prescriptions 5 years ago
Sultan Khan 2f454055b9 login fixed 5 years ago
Sultan Khan 18a2393d92 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 6e152951b4 notification count 5 years ago
Mohammad Aljammal 0966269537 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!116
5 years ago
Sultan Khan d2f391ab7f setting page inprogress 5 years ago
Sultan Khan 4c8c4e3725 setting page inprogress 5 years ago
Sultan Khan 0ed29be214 launch 5 years ago
Sultan Khan 00b0154987 my family 5 years ago
Mohammad Aljammal 3c1257b379 fix Medicine Search 5 years ago
Zohaib Kambrani 8fcf1b6708 Swipe the Native loading « arguments 5 years ago
Sultan Khan 30a8e24521 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 91be66ecdd family file changes 5 years ago
Mohammad Aljammal b785f87dac fix App drawer after logout 5 years ago
Mohammad Aljammal ddc7eca605 fix Insurance Cards 5 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
5 years ago
Mohammad Aljmma 501692587f change the base Url 5 years ago
Mohammad Aljmma a9b11a6b03 fix lab result 5 years ago
Sultan Khan fdef34a394 viral sign issue 5 years ago
Zohaib Kambrani 69d1e4bb0b no message 5 years ago
Sultan Khan 3589b21590 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Mohammad Aljmma 770d28033d fix issues#26 & 27 & 28 5 years ago
Mohammad Aljmma ed7b9d609f fix lab result 5 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
5 years ago
haroon amjad b89c1f03b3 language translation fixes 5 years ago
Sultan Khan 431306f0e1 insurance details 5 years ago
Sultan Khan 1f4f81b454 insurance card details 5 years ago
Sultan Khan bedafa24cd insurance details 5 years ago
Sultan Khan d81cc7119d insurance details 5 years ago
Mohammad Aljmma 8f38dc6077 fix issue #24 5 years ago
Sultan Khan a16145d7f1 bugfixes 5 years ago
Sultan Khan 0eedb788c3 register page 5 years ago
Sultan Khan 536682e953 merge 5 years ago
Sultan Khan 1eb6516ea6 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 3fef1b9d52 theme and login issues fixed 5 years ago
Mohammad Aljmma a1684bdd9e fix issue #17 & 18 5 years ago
Mohammad Aljmma e42ebfbf64 fix issue #16 5 years ago
Mohammad Aljmma 59defa4532 fix issue #15 5 years ago
Mohammad Aljmma 97a8fe4f9b fix issue #14 5 years ago
Mohammad Aljmma 5e8b61bf2d fix issue #13 5 years ago
Mohammad Aljmma 0f938fafd2 fix issue #12 5 years ago
Mohammad Aljmma 741126102d fix issue #11 5 years ago
Mohammad Aljmma fdeac4823e fix issue #10 5 years ago
Mohammad Aljmma 179df475b4 fix issue #9 5 years ago
Mohammad Aljmma 20ece68ddb fix issue # 6 & 7 & 8 5 years ago
Mohammad Aljmma 216c5609c6 fix issue # 6 & 7 & 8 5 years ago
Mohammad Aljmma b913e5a7b7 fix issue#6 5 years ago
Mohammad Aljmma 7b55454fde fix issue#5 5 years ago
Mohammad Aljmma a742f896be fix issue#4 5 years ago
Mohammad Aljmma bfaacb2719 fix issue#3 5 years ago
Mohammad Aljmma 5b3a4e674d fix issue#2 5 years ago
Mohammad Aljmma 27594f15b8 fix issue#1 5 years ago
Mohammad Aljmma e1f6ef5e5b fix Prescriptions history 5 years ago
Sultan Khan 58b1f648c1 setting theme 5 years ago
hussam al-habibeh 69ea8b7bd7 daynmic products listing 5 years ago
Sultan Khan 283473a06a theme changes 5 years ago
Sultan Khan d1336eec8b login type 5 years ago
Sultan Khan c00391d3e5 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
haroon amjad 9096ccd4d4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
Mohammad Aljmma d76b679a7f fix issues 5 years ago
Mohammad Aljmma 6181e52ef1 fix authenticated user data 5 years ago
Sultan Khan f05b235cd0 login issue 5 years ago
haroon amjad 2e484d7535 QR Code loading issue resolved 5 years ago
Zohaib Kambrani 0c71fbad5f no message 5 years ago
Sultan Khan cced69502a Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
haroon amjad 6062716209 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
haroon amjad 10efccbce8 my appointment fixes 5 years ago
Sultan Khan aec2ab75d0 settings update 5 years ago
Sultan Khan aa8f9f18e1 forgot password 5 years ago
Fatimah Alshammari ddf032bb47 Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
#	android/app/build.gradle
#	android/app/src/main/AndroidManifest.xml
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/pages/landing/home_page.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Fatimah Alshammari f137bd44c0 created order and order details UI pages 5 years ago
Mohammad Aljmma 981020fce5 fix my family issues 5 years ago
Mohammad Aljmma 1111f26a9d Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_family 5 years ago
haroon amjad 94fb41581e config update 5 years ago
haroon amjad 9868a43e7b Merge branch 'master' into pharmacy
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/landing/home_page.dart
5 years ago
haroon amjad 506e32e8c8 Payment issues resolved 5 years ago
haroon amjad 05ad8f8db5 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
Sultan Khan 4976870d2e Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 875bf10c73 settings page added 5 years ago
Mohammad Aljmma 6a83538544 add info for Medical 5 years ago
Mohammad Aljmma a077d87dd8 fix user authentication data 5 years ago
haroon amjad 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
5 years ago
Mohammad Aljmma 7d2f1cf318 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_authentication 5 years ago
Mohammad Aljmma 570aa514cd fix user authentication data 5 years ago
haroon amjad b7b7ead3ba Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
haroon amjad ee67852970 Bottom navbar count & ToDo list fixed 5 years ago
haroon amjad f0897881d1 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
haroon amjad d75e5caf08 fixed appointment online checkIn issue 5 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
5 years ago
Mohammad Aljmma 4a4d5248a2 fix status issue 5 years ago
Elham Rababah 64f970c40c Fix issues after the merge 5 years ago
haroon amjad 5020c24e8b Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/confirm-login.dart
#	lib/services/authentication/auth_provider.dart
5 years ago
Elham Rababah 5ed4d76a54 Merge branches 'diplomatic-quarter-live' and 'notifications_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into notifications_page
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad 15a8e64e7c updates & fixes 5 years ago
Elham Rababah 41b919183f Fix bug on read notifications_page.dart 5 years ago
Mohammad Aljmma 9880b0236b fix my family issues 5 years ago
Sultan Khan 0443a37886 register page updated 5 years ago
Sultan Khan b9b5797cbc login issue fixed 5 years ago
haroon amjad 89022231d7 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
hussam al-habibeh 6162833bba offers products page 5 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
5 years ago
hussam al-habibeh 69a6bc2812 offers page 5 years ago
Elham Rababah 5bd3c7d9ce finish step from notifications_page and create notification_details_page 5 years ago
Sultan Khan d939b2ec9b Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan f8e05fc447 regiter issue 5 years ago
Mohammad Aljmma 747cffacfc fix lab result 5 years ago
haroon amjad 4f53d058d4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
mosazaid 2095f2c62a fix merge issue 5 years ago
mosazaid dade295656 fix merge issue 5 years ago
mosazaid 11ff27bae3 Merge branch 'master' 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/pages/landing/landing_page.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
	pubspec.yaml
5 years ago
mosazaid 9a169ff77b finish home page and start working on order preview page 5 years ago
Elham Rababah 9f2beceb22 First step from notifications_page 5 years ago
Mohammad Aljmma e42f953bd1 fix prescription report issues 5 years ago
haroon amjad ff3368eefb Login check implemented for appointment & ToDo 5 years ago
Mohammad Aljmma 54a7f98eff fix login issues 5 years ago
Mohammad Aljmma a796e0392b Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_login
 Conflicts:
	lib/pages/login/confirm-login.dart
	lib/pages/login/login.dart
5 years ago
Mohammad Aljmma f79d8eb8f9 fix login issues 5 years ago
haroon amjad af780bca76 registration fixes 5 years ago
enadhilal 778e9fd8da Merge branch 'pharmacy_module_feature_home_page' into enad_pharmacy2
# Conflicts:
#	lib/core/service/client/base_app_client.dart
#	lib/pages/landing/home_page.dart
5 years ago
haroon amjad dbb53e7821 fixed forgot password issue, Implemented new loader in login flow 5 years ago
hussam al-habibeh e74e168e88 Merge branch 'pharmacy_module_feature_home_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
 Conflicts:
	android/app/build.gradle
	lib/config/config.dart
	lib/core/service/client/base_app_client.dart
	lib/locator.dart
5 years ago
hussam al-habibeh f7cee8f484 pharmacy module app && category home page 5 years ago
mosazaid d1ac4080ca working on pharmacy home page 5 years ago
Mohammad Aljmma 59d592778b Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page 5 years ago
Mohammad Aljmma e7e32a414b fix barcode 5 years ago
Mohammad Aljammal 1775766a08 Merge branch 'loader_fix' into 'diplomatic-quarter-live'
Fix loader issue.

See merge request Cloud_Solution/diplomatic-quarter!90
5 years ago
Elham Rababah fa88e9055f make loader center 5 years ago
Elham Rababah 042de21831 Fix loader issue. 5 years ago
haroon amjad aeab57beab Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	lib/main.dart
#	lib/pages/landing/home_page.dart
5 years ago
haroon amjad f5a2870fac Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
Implemented Badge count on ToDo list & my appointments
5 years ago
Mohammad Aljmma 479aea4df8 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
 Conflicts:
	lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljmma d4be20b07b add icons 5 years ago
Mohammad Aljmma e10a0a4d54 add splash page fix language issues 5 years ago
haroon amjad 1553e71e7d New loading dialog added into appointment flow 5 years ago
umasoodch 23083fd5ad Merge branch 'master' into pharmacy
# Conflicts:
#	lib/config/config.dart
#	lib/widgets/others/app_scaffold_widget.dart
5 years ago
Mohammad Aljmma d5afb50ed3 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
 Conflicts:
	lib/pages/landing/landing_page.dart
5 years ago
Mohammad Aljmma 856ab52439 fix ui issues 5 years ago
haroon amjad 6fd7a3fa3d updates 5 years ago
Mohammad Aljmma 89cfcd3cad fix design issues 5 years ago
Mohammad Aljmma 0b90d3c687 fix issues 5 years ago
Mohammad Aljmma 894494ec4e Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
 Conflicts:
	ios/Flutter/.last_build_id
	lib/main.dart
	lib/pages/landing/home_page.dart
5 years ago
Mohammad Aljmma 874de15040 change the home page design 5 years ago
Mohammad Aljammal 94c25d2188 Merge branch 'loader' into 'diplomatic-quarter-live'
Loader

See merge request Cloud_Solution/diplomatic-quarter!84
5 years ago
Elham Rababah 6f5b5ed0c2 move gif loader utils 5 years ago
Elham Rababah bf412e1edf Finish loader as Gif image in all cases where the network is busy 5 years ago
haroon amjad d5118bda11 Login / Register UI fixes 5 years ago
Elham Rababah cd7c354458 loader first step 5 years ago
haroon amjad 3354058738 Branding updated according to DQ 5 years ago
haroon amjad 3ae6df1dcb Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-live 5 years ago
haroon amjad 6a630f6d33 logo & colors changed for login & registration flow 5 years ago
Sultan Khan deb828b4dd Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 23b48485ed voice command 5 years ago
Mohammad Aljmma 1cf4797d4f add font 5 years ago
Mohammad Aljmma 26cf849f2b hot fixing 5 years ago
Mohammad Aljammal 50dffe9af9 Merge branch 'Haroon' into 'master'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!74
5 years ago
Mohammad Aljmma d0ed776ff6 new home health service 5 years ago
haroon amjad dfa7e0e02f updates & fixes 5 years ago
haroon amjad 0b6cd845f1 implementing Smart Watch Integration 5 years ago
haroon amjad 22ef24c4ff Merge branch 'master' into Haroon
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
5 years ago
jammal 9328f942ba done ER service 5 years ago
Fatimah Alshammari 1e00b9a4d8 added my-profile 5 years ago
Fatimah Alshammari 56aa60f871 Merge branch 'pharmacy' into pharmacy-Fatima 5 years ago
jammal 7dc55f3378 Merge branch 'home_health_care' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ios_issues
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/locator.dart
	lib/pages/AlHabibMedicalService/E-Referral/e_referral_index_page.dart
	lib/pages/AlHabibMedicalService/h2o/h2o_index_page.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
jammal bd2254491c done ER service 5 years ago
enadhilal 613206f9d3 Merge branch 'enad_pharmacy2' into pharmacy
# Conflicts:
#	lib/config/config.dart
#	lib/widgets/others/app_scaffold_widget.dart
5 years ago
enadhilal 5445cced89 Merge branch 'master' into enad_pharmacy2
# Conflicts:
#	lib/config/config.dart
#	lib/widgets/others/app_scaffold_widget.dart
5 years ago
jammal 57f938aa09 fix ios issues 5 years ago
enadhilal bf88d84022 Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into enad_pharmacy
# Conflicts:
#	lib/config/config.dart
#	lib/widgets/others/app_scaffold_widget.dart
5 years ago
jammal 0fceca8f3e fix ios issues 5 years ago
enadhilal 7ca6e6caa7 fix widget of product_tile 5 years ago
enadhilal d6d1c26c9a add product_tile widget 5 years ago
enadhilal 068382e76f add call for backend service 5 years ago
haroon amjad 68b0e3857a updates 5 years ago
Sultan Khan f03a711dff symptom checker gender page updated 5 years ago
haroon amjad 6b316bf262 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	lib/config/config.dart
#	lib/pages/AlHabibMedicalService/​ health_calculators.dart
#	lib/pages/BookAppointment/widgets/DoctorView.dart
#	lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
5 years ago
enadhilal 815bc39268 add wishlist page 5 years ago
haroon amjad 7edb6fd179 UI Fixes in LiveCare 5 years ago
Mohammad Aljammal e025321c71 fix issues 5 years ago
Mohammad Aljammal 29f0402cbd Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
 Conflicts:
	lib/config/config.dart
	lib/config/shared_pref_kay.dart
	lib/core/service/client/base_app_client.dart
	lib/pages/AlHabibMedicalService/​ health_calculators.dart
	lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/login/confirm-login.dart
	lib/pages/login/login.dart
	lib/services/appointment_services/GetDoctorsList.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/drawer/app_drawer_widget.dart
	lib/widgets/others/app_scaffold_widget.dart
5 years ago
Mohammad Aljammal d3d0fa00e7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
 Conflicts:
	lib/pages/landing/home_page.dart
5 years ago
Mohammad Aljammal e7cf452a79 Merge branch 'insurance' into 'master'
files import fix

See merge request Cloud_Solution/diplomatic-quarter!66
5 years ago
Mohammad Aljammal a31796322b fix icons issue 5 years ago
Mohammad Aljammal 15ac74fadb Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into haroon_s
 Conflicts:
	lib/pages/AlHabibMedicalService/​ health_calculators.dart
5 years ago
Mohammad Aljammal 53bbafdc2b fix Authenticated User Object 5 years ago
Sultan Khan d0d262f139 robot icon updates 5 years ago
hussam al-habibeh cd36749e4e files import fix 5 years ago
Elham Rababah c0a54c8cbc remove commit 5 years ago
Sultan Khan 8095e56b32 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 3ad928902b voice command 5 years ago
Elham Rababah a359a6cd1a fix the loader issue 5 years ago
Mohammad Aljammal b0fa7811e5 Merge branch 'insurance' into 'master'
women health

See merge request Cloud_Solution/diplomatic-quarter!65
5 years ago
Mohammad Aljammal 39a4020b69 Merge branch 'child_vaccines' into 'master'
Child vaccines

See merge request Cloud_Solution/diplomatic-quarter!64
5 years ago
hussam al-habibeh c6a9b66538 women health 5 years ago
Amjad amireh 83735ab68d modified Child vaccintion note 5 years ago
haroon amjad a8ee7db62b fixes
# Conflicts:
#	lib/config/config.dart
5 years ago
haroon amjad 41d50e23e3 covid drivethru implemented 5 years ago
Mohammad Aljammal 84bb68789d Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into haroon_s
 Conflicts:
	lib/config/config.dart
	lib/pages/BookAppointment/widgets/DoctorView.dart
	lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
	lib/pages/ContactUs/findus/hospitrals_page.dart
	lib/pages/ContactUs/findus/pharmacies_page.dart
5 years ago
Mohammad Aljammal 06416b4934 add Not authenticated Page 5 years ago
haroon amjad 5f36c900a4 fixes 5 years ago
haroon amjad 0daa0dc683 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
Sultan Khan da317431ba Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Elham Rababah 83ab1b4d61 fix issues in the services logic and add some translation 5 years ago
Amjad amireh 8ddec0ad99 child Vaccines add new child modified 5 years ago
Amjad amireh 67e3a13a95 child Vaccines add new child modified 5 years ago
Fatimah Alshammari d05988a679 added pharmacy folder 5 years ago
Elham Rababah da7131015e remove print statements 5 years ago
Mohammad Aljammal 847ccb9c07 Merge branch 'child_vaccines' into 'master'
Child vaccines

See merge request Cloud_Solution/diplomatic-quarter!62
5 years ago
Amjad amireh cb2a78e2ee child Vaccines 5 years ago
Sultan Khan 7b6135a6c7 voice search 5 years ago
Sultan Khan 83bc2cddce Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 8f18d1025a voice search 5 years ago
Amjad amireh 24795e808f child Vaccines 5 years ago
hussam al-habibeh 84f429e559 merge 5 years ago
hussam al-habibeh bafcc4331e Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into insurance
 Conflicts:
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	pubspec.yaml
5 years ago
hussam al-habibeh dbda69baa1 health Calculator'General Health' 5 years ago
Amjad amireh dcb93bf5cc child Vaccines 5 years ago
Elham Rababah 9ebc6980dd change the checkup item based on service 5 years ago
Amjad amireh 1d29aa36a2 child Vaccines 5 years ago
Amjad amireh fe17c20bdf child Vaccines 5 years ago
Mohammad Aljammal 1ce55e687f Ambulance Service second step 5 years ago
Amjad amireh 6830996f9c child Vaccines 5 years ago
Amjad amireh 8a6511404f child Vaccines 5 years ago
Amjad amireh 42554ffa67 child Vaccines 5 years ago
haroon amjad 063eebfc74 covid drivethru implemented 5 years ago
Elham Rababah 31b217aa19 First step from CMC 5 years ago
Amjad amireh 4009aed000 child Vaccines 5 years ago
Sultan Khan 227731f8f8 Merge 5 years ago
Amjad amireh e14d619edd child Vaccines 5 years ago
Amjad amireh 37b817e0c8 child Vaccines 5 years ago
Amjad amireh 0e4ff1f804 child Vaccines 5 years ago
Elham Rababah 0b9a834673 Finish cancel order 5 years ago
Amjad amireh 9ab0d66888 child Vaccines 5 years ago
Elham Rababah 293c557b54 First step from Home health care service 5 years ago
Sultan Khan ea86e88e2e Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Mohammad Aljammal 3d6eafe473 Ambulance Service first step 5 years ago
Amjad amireh db19eec35f Blood Denote 5 years ago
Sultan Khan 5c859034d6 voice search 5 years ago
Amjad amireh 42fd2e0eee Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into child_vaccines
 Conflicts:
	lib/core/viewModels/base_view_model.dart
5 years ago
Amjad amireh 20ef255ee6 Blood Denote 5 years ago
Amjad amireh 98947d5f6b Blood Denote 5 years ago
Mohammad Aljammal 0d12210116 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers 5 years ago
Mohammad Aljammal c7d396875e Ambulance Service steps 5 years ago
Elham Rababah fdc8ef36ef Refactor today page 5 years ago
Elham Rababah 0a60b27ab4 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
 Conflicts:
	lib/locator.dart
5 years ago
Mohammad Aljammal ac871bb416 Merge branch 'Blood_Donation' into 'master'
Blood donation

See merge request Cloud_Solution/diplomatic-quarter!58
5 years ago
Mohammad Aljammal f543126152 Ambulance Service 5 years ago
haroon amjad 6c0bb12c84 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/pages/BookAppointment/widgets/DoctorView.dart
#	lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
#	lib/pages/ContactUs/findus/hospitrals_page.dart
#	lib/pages/ContactUs/findus/pharmacies_page.dart
5 years ago
haroon amjad 929e289a6f started implementing Covid-19 DriveThru Test Module 5 years ago
Amjad amireh b658e7be4d Blood Denote 5 years ago
Elham Rababah dd76ae05a7 fix H2O page issue 5 years ago
Amjad amireh a00b3a133c Blood Denote 5 years ago
Amjad amireh 675d544514 Blood Denote 5 years ago
haroon amjad 7fdc0da9dc livecare scheduling implemented 5 years ago
Amjad amireh 0ec39920f0 Blood Denote 5 years ago
Amjad amireh 5e50c0dc32 Blood Denote 5 years ago
Mohammad Aljammal 020d10fccc Merge branch 'insurance' into 'master'
Health Converter

See merge request Cloud_Solution/diplomatic-quarter!56
5 years ago
Elham Rababah bf6a8cecc6 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/landing/landing_page.dart
	pubspec.yaml
5 years ago
Mohammad Aljammal bae6fe4ad6 fix marge issues 5 years ago
Elham Rababah 3fab844ac9 improve E-referral 5 years ago
Elham Rababah 37d9eae9ea improve E-referral 5 years ago
Mohammad Aljammal 3946f0355c Merge branches 'master' and 'my_trackers' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
 Conflicts:
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/locator.dart
	lib/pages/landing/landing_page.dart
5 years ago
Mohammad Aljammal d6a27a8e28 change medical profile icons 5 years ago
haroon amjad c9256a654a LiveCare Scheduling updates 5 years ago
Mohammad Aljammal 3ffff9686d Done allergies service 5 years ago
Elham Rababah c994c39c6b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral 5 years ago
Elham Rababah a00bc8268e improve E-referral 5 years ago
Elham Rababah 91a8b94382 Merge branch 'E_referral' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/landing/landing_page.dart
5 years ago
Elham Rababah b1b6c77d62 Finish H2O Services 5 years ago
hussam al-habibeh 3e184f43db Health Converter 5 years ago
Elham Rababah b853bede68 first step from h2o 5 years ago
Amjad amireh 43689d19ce Contact us , virtual tout ,News 5 years ago
Mohammad Aljammal 82c2577d36 Done ask doctor service 5 years ago
Amjad amireh 9a6eadc3fb Contact us and virtual tout 5 years ago
Sultan Khan 79502de682 update 5 years ago
Sultan Khan 03ff56f2de Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Mohammad Aljammal 986a2e92f6 Merge branch 'find_us' into 'master'
Find us

See merge request Cloud_Solution/diplomatic-quarter!54
5 years ago
Amjad amireh 7c48a6f16a Contact us 5 years ago
Amjad amireh 5ce252d296 Contact us 5 years ago
Amjad amireh 50d862b076 Contact us 5 years ago
Amjad amireh 97d0c439c7 Contact us 5 years ago
Amjad amireh 5f981c9248 Contact us 5 years ago
haroon amjad 06798ef327 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/pages/ContactUs/findus/hospitrals_page.dart
#	lib/pages/ContactUs/findus/pharmacies_page.dart
5 years ago
haroon amjad f25d18353f icons updated 5 years ago
Sultan Khan 591e9e9a4c updated 5 years ago
Elham Rababah ae147b5988 first step from search referrals 5 years ago
Mohammad Aljammal 82226e62e1 Merge branch 'insurance' into 'master'
HMG Service layout

See merge request Cloud_Solution/diplomatic-quarter!52
5 years ago
Mohammad Aljammal 2952fd56ab Done Active Medications Service 5 years ago
Elham Rababah 1e3ff89dbd finish new e-referral except calling the service 5 years ago
Amjad amireh aa66e427b1 Contact us 5 years ago
Amjad amireh 24456895ee Contact us 5 years ago
Amjad amireh 24693f2992 Contact us 5 years ago
Amjad amireh de5633d58b Contact us 5 years ago
hussam al-habibeh 3c5adc0a1d HMG Service layout 5 years ago
Elham Rababah f582eee991 make index page of add new referral as page controller 5 years ago
Amjad amireh 6aa6b85f4b Contact us 5 years ago
Amjad amireh c2cfea7360 Contact us 5 years ago
Amjad amireh 571023e521 Contact us 5 years ago
Mohammad Aljammal 9f06ce7d1d done EyeMeasurements service 5 years ago
Amjad amireh c2b7507005 Contact us 5 years ago
Amjad amireh dd3608e9ee Contact us 5 years ago
Elham Rababah a4905783ad refactor dialogs structure 5 years ago
Elham Rababah 7840ec4c3b finish activation process until step 2 5 years ago
Mohammad Aljammal c01e6095f2 done my trackers 5 years ago
Amjad amireh a4ea5f8e3e Contact us 5 years ago
Elham Rababah f1f3b6bd56 first step from e-referral 5 years ago
haroon amjad b9a0438ebb Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
haroon amjad a5fd9f53ab Payment flow implemented in advance payment 5 years ago
Mohammad Aljammal 14f3e08077 Merge branch 'amjad_amireh' into 'master'
edit card_position.dart

See merge request Cloud_Solution/diplomatic-quarter!47
5 years ago
haroon amjad 478917b240 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
Mohammad Aljammal b4a7408962 Merge branch 'payment_service' into 'master'
add payment service page and translations

See merge request Cloud_Solution/diplomatic-quarter!49
5 years ago
Mohammad Aljammal 4ac77593ad add payment service page and translations 5 years ago
haroon amjad 38c980be81 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
haroon amjad 5400d534db updates for push notifications 5 years ago
Mohammad Aljammal b6db1d1fd8 Merge branch 'my_balance' into 'master'
done My balance

See merge request Cloud_Solution/diplomatic-quarter!48
5 years ago
Mohammad Aljammal a0300738e8 done My balance 5 years ago
Amjad amireh 368db03ab8 edit card_position.dart 5 years ago
Amjad amireh a41dd736c4 edit card_position.dart 5 years ago
Amjad amireh d1a01f5afa edit card_position.dart 5 years ago
Sultan Khan 92efbcbd2f my family 5 years ago
Sultan Khan da7fa1038a Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 0a2cb22042 design issues fixed 5 years ago
Amjad amireh 6fb063bf48 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh 5 years ago
Amjad amireh dc10f883db Merge branch 'amjad_amireh' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh 5 years ago
Mohammad Aljammal 4dd3f9ad01 done Patient Sick Leave 5 years ago
Amjad amireh 525080c09e edit card_position.dart 5 years ago
Mohammad Aljammal 57ed83a139 Merge branch 'vaccine' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into patient_sick_leave
 Conflicts:
	lib/config/config.dart
5 years ago
Mohammad Aljammal 11f9daa3ff add PatientSickLeave 5 years ago
Sultan Khan 63e6d06e74 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 5e252d21d2 voice search added more medical option 5 years ago
Mohammad Aljammal ea02622977 fix merge issues 5 years ago
Mohammad Aljammal fbb4b326a8 Merge branch 'amjad_amireh' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
 Conflicts:
	lib/locator.dart
	pubspec.yaml
5 years ago
Mohammad Aljammal 8e96c79d05 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
 Conflicts:
	lib/config/localized_values.dart
5 years ago
Mohammad Aljammal 33bd972984 add my vaccines item screen 5 years ago
Amjad amireh 62d96a3f1c edit card_position.dart 5 years ago
Sultan Khan f5d6864291 voice search coc 5 years ago
Sultan Khan 3dc54230be Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 5d34398998 insurance updated 5 years ago
Mohammad Aljammal 9159928e27 edit on vaccine service 5 years ago
Sultan Khan a535543863 more pages added on the voice search 5 years ago
Amjad amireh e638464657 edit card_position.dart 5 years ago
Mohammad Aljammal ddf53ce999 ER 5 years ago
Mohammad Aljammal 50d1e50df4 ER 5 years ago
Mohammad Aljammal ed1c04ab25 ER 5 years ago
Sultan Khan 7908506d5f Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Mohammad Aljammal 294a752338 ER 5 years ago
Sultan Khan 77f6dd94ef search page change 5 years ago
haroon amjad 8387af844a Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
haroon amjad 0628aef62a applied dental change in SearchByClinic 5 years ago
Mohammad Aljammal 629251d216 ER 5 years ago
Mohammad Aljammal b7f73bf397 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into monthly_reports 5 years ago
Mohammad Aljammal 153335538a done monthly reports 5 years ago
Sultan Khan a2b3878a27 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan a98bc226e6 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Mohammad Aljammal 5485cbab36 ER 5 years ago
Mohammad Aljammal 2ef36d3d8a ER 5 years ago
Mohammad Aljammal f534f8a348 ER 5 years ago
Sultan Khan 0f63b922d1 speech to text 5 years ago
Mohammad Aljammal 20f9f6f06c ER 5 years ago
haroon amjad cbf19f0cd1 Merge branch 'master' into 'Haroon'
# Conflicts:
#   lib/core/service/client/base_app_client.dart
5 years ago
Mohammad Aljammal b0f0b87345 fix merge issues 5 years ago
haroon amjad c5794e5c70 Dental flow in my appointments 5 years ago
Mohammad Aljammal 68466c8d03 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/models/Appointments/DoctorListResponse.dart
	lib/pages/BookAppointment/widgets/DoctorView.dart
	lib/pages/MyAppointments/MyAppointments.dart
	lib/uitl/translations_delegate_base.dart
	pubspec.yaml
5 years ago
Mohammad Aljammal fe66ee5993 fix lab result issues 5 years ago
Mohammad Aljammal db79f299b6 ER 5 years ago
Mohammad Aljammal e254261ef9 ER 5 years ago
Sultan Khan f6a3f0e615 family file 5 years ago
Mohammad Aljammal 02ce04a397 medical_profile_page.dart 5 years ago
Mohammad Aljammal e909c16b80 ER 5 years ago
haroon amjad 3e5ef26b29 my appointment sorting implemented 5 years ago
haroon amjad ce9903fd13 nearest appointment flow implemented 5 years ago
haroon amjad 51078227ab Dental appointment flow implemented 5 years ago
Mohammad Aljammal d52e612bff Merge branch 'insurance' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/medical/medical_profile_page.dart
	pubspec.yaml
5 years ago
Mohammad Aljammal 1b3a780a29 add ar lan for medical profile 5 years ago
hussam al-habibeh 3a79ddb488 vaccine service 5 years ago
Sultan Khan 826c50ebf1 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 20a17c0070 clinic search 5 years ago
haroon amjad 1886f3a763 implementing Dental Appointment flow 5 years ago
Sultan Khan 4a75215a19 search 5 years ago
Sultan Khan 6b2f1a86df Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 3a4c016f4e search 5 years ago
Mohammad Aljammal 4ffbb80f3d ER 5 years ago
Mohammad Aljammal 5ec3935c68 ER 5 years ago
Mohammad Aljammal ef4a57223c fix DoctorView.dart UI issues 5 years ago
haroon amjad a7f5dfab5c fixes 5 years ago
haroon amjad 35cd02494c implemented search by doctor list 5 years ago
haroon amjad 13adb46319 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/config/shared_pref_kay.dart
5 years ago
haroon amjad e29c6a892e updates 5 years ago
haroon amjad f669adcb9d Location service implemented 5 years ago
Sultan Khan badb4e52df Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Mohammad Aljammal 91e5a20fd0 fix merge issues 5 years ago
Mohammad Aljammal 54b766de81 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/config/shared_pref_kay.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
5 years ago
Mohammad Aljammal d16ea676cf done parking service ,fix design issues in home page and add new icon 5 years ago
Mohammad Aljammal 01a011a03d done dashboard page 5 years ago
Sultan Khan e7a3d1a4ab speech search 5 years ago
Sultan Khan f52e73477a Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan f1e0bcf86e speech to tex 5 years ago
haroon amjad 84e92cb040 updates & fixes 5 years ago
haroon amjad 96b7d00b4b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
haroon amjad 823eda0d5c updates 5 years ago
Mohammad Aljammal 4bc806671a Merge branch 'amjad_amireh' into 'master'
filter doctor by department

See merge request Cloud_Solution/diplomatic-quarter!33
5 years ago
Mohammad Aljammal 9e47dc19f9 filter doctor by department 5 years ago
Sultan Khan 130fb53a65 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 3247378c02 search 5 years ago
haroon amjad 30e08b4417 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/pages/login/login.dart
5 years ago
haroon amjad 7a8392a97e updates 5 years ago
Mohammad Aljammal c0c6376f55 filter doctor by department 5 years ago
Mohammad Aljammal dc9b9e21ad filter doctor by department 5 years ago
Mohammad Aljammal 895c09efa4 parking service 5 years ago
Sultan Khan 1974e51602 merge 5 years ago
Sultan Khan 5d112b5464 merge 5 years ago
Sultan Khan 8516f7de1b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 9b55309d53 text to speech 5 years ago
Mohammad Aljammal 4adc2916b4 fix merge issues 5 years ago
Mohammad Aljammal 30c0963063 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/localized_values.dart
	lib/locator.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 8989fbc9b7 done design dashboard 5 years ago
haroon amjad 61dba06236 Twilio implemented in LiveCare 5 years ago
Sultan Khan 2f9885ecf8 family file changes 5 years ago
Sultan Khan 8887ba85fe family file 5 years ago
haroon amjad 732ab90b2f Book Appointment check login 5 years ago
Sultan Khan cb99b2a7a7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 327c4585a6 family file change 5 years ago
haroon amjad 760db6a873 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/locator.dart
5 years ago
haroon amjad cc4f5c0615 updates 5 years ago
haroon amjad 5f1413a2ac implementing Twilio in LiveCare 5 years ago
Mohammad Aljammal 9cf5c80aae add time line and appointment rate 5 years ago
Mohammad Aljammal f5b16734c6 add time line 5 years ago
Mohammad Aljammal f6d30178bf done medical report 5 years ago
Mohammad Aljammal b6319c558c Merge branch 'report_service' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
 Conflicts:
	lib/locator.dart
	lib/pages/medical/medical_profile_page.dart
5 years ago
Mohammad Aljammal 75fdf28036 fix lab Result 5 years ago
Mohammad Aljammal 8495260c5a fix issues in feedback 5 years ago
haroon amjad db30fbdfd2 implementing livecare 5 years ago
haroon amjad 59c279998c working on vital signs integration 6 years ago
Sultan Khan 47c42808fd Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 6 years ago
Sultan Khan 913729fc58 speech search 6 years ago
Mohammad Aljammal 5619b8c06f fix issues in feedback 6 years ago
Mohammad Aljammal 2b0e35a907 fix issues in base app client 6 years ago
haroon amjad 73cf37a3a5 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/core/service/client/base_app_client.dart
6 years ago
haroon amjad b9d913e6a5 Merge fixes & updates 6 years ago
Sultan Khan 03b34115c4 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 6 years ago
Sultan Khan 3b2f9251dc search 6 years ago
Mohammad Aljammal a5e63817f2 done vital sign 6 years ago
Sultan Khan 4c1a8dc38f new changes 6 years ago
Sultan Khan 9afeecf9fa new 6 years ago
Mohammad Aljammal 32e2732c43 feedback service 6 years ago
haroon amjad 3b881f1ab3 appointment details scenarios handled 6 years ago
Amjad Amireh 97dbe62f93 done report service 6 years ago
haroon amjad 7972d01dff Insurance Approval implemented 6 years ago
haroon amjad fde47a5c2c Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	lib/core/service/client/base_app_client.dart
6 years ago
haroon amjad 206f9a4371 fixes 6 years ago
haroon amjad 750746aabe updates & fixes 6 years ago
Mohammad Aljammal d093ecd5e6 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
 Conflicts:
	ios/Podfile
	ios/Runner.xcodeproj/project.pbxproj
	lib/config/config.dart
	lib/uitl/translations_delegate_base.dart
6 years ago
Mohammad Aljammal f229958e1c add ions 6 years ago
Mohammad Aljammal 22de043892 fix merge issues 6 years ago
Mohammad Aljammal b4b33be3e9 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
 Conflicts:
	lib/core/service/client/base_app_client.dart
6 years ago
Mohammad Aljammal 37b874fe3f Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
6 years ago
Sultan Khan 3f0c60aea5 sessionID 6 years ago
Mohammad Aljammal a1fa2c0727 done vital sign 6 years ago
Sultan Khan da6f238c89 family files changes 6 years ago
haroon amjad c50530734d added my appointments in medical file page 6 years ago
Sultan Khan adbdd2dd0d Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 6 years ago
Sultan Khan 621870eca1 family file changes 6 years ago
haroon amjad 7d0efda1c4 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/medical/medical_profile_page.dart
#	lib/services/authentication/auth_provider.dart
#	lib/uitl/translations_delegate_base.dart
#	pubspec.yaml
6 years ago
hussam al-habibeh f77d4fac66 insurance translation 6 years ago
Haroon Amjad 8ad2941836 Appointment payment finalised, Ask Doc implemeted & other updates 6 years ago
Haroon Amjad 41c922bfeb Appointment payment implemented, Book Success implemented, Appointment flow implemented 6 years ago
haroon amjad 3a9fa97c91 updates 6 years ago
Mohammad Aljammal 716482bc4d Merge branch 'sultan' into 'master'
login changes

See merge request Cloud_Solution/diplomatic-quarter!17
6 years ago
Mohammad Aljammal 5cee1cef4e fix merge issues 6 years ago
Sultan Khan 6af7ac54ba login changes 6 years ago
Mohammad Aljammal 2e0afdb49c Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into insurance
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/prescriptions/prescriptions_home_page.dart
6 years ago
Sultan Khan d1871bb71f Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 6 years ago
Sultan Khan 8ee3b3b557 family files. 6 years ago
hussam al-habibeh 492cfa084b insurance card and insurance update and insurance approval 6 years ago
Mohammad Aljammal 125360ced7 fix merge issues 6 years ago
Mohammad Aljammal 002efe3b45 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
 Conflicts:
	lib/pages/landing/landing_page.dart
6 years ago
Mohammad Aljammal a84341af58 fix merge issues 6 years ago
Mohammad Aljammal 5ea0df9f1e Merge remote-tracking branch 'origin/sultan' into sultan
# Conflicts:
#	lib/uitl/date_uitl.dart
6 years ago
Mohammad Aljammal 7d230ea14c fix issues 6 years ago
Mohammad Aljammal cfd5b2ccff feedback Service done 6 years ago
Sultan Khan 8e3fb6831d registration changes 6 years ago
Sultan Khan e735855c33 registration done. 6 years ago
haroon amjad 28fde5c500 My Appointments implemented, Appointment Details functionality updated, Logged In User details added in APIs & other updates 6 years ago
Mohammad Aljammal 29768feefd merge master 6 years ago
Mohammad Aljammal 05222207da Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
 Conflicts:
	lib/config/config.dart
	lib/core/service/client/base_app_client.dart
6 years ago
Mohammad Aljammal a12197fe70 labs result done add some file to git ignore for ios 6 years ago
haroon amjad 00d9214460 Merge branch 'sultan' 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
#	lib/widgets/others/app_scaffold_widget.dart
6 years ago
Sultan Khan ecfa1756d3 login changes 6 years ago
Sultan Khan 0bc529f420 login changes 6 years ago
haroon amjad 192a3835d6 implemented payment method selection & payment details dialog. Added Calendar events to add remindar in calendar for appointment. 6 years ago
Mohammad Aljammal 1bbbd18373 labs services 6 years ago
Sultan Khan 9d0a2e1e43 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 6 years ago
Sultan Khan 8d0834ff3e login inprogress 6 years ago
haroon amjad b3e5047820 Payment method selection page created, Appointment details functions implemented 6 years ago
Mohammad Aljammal 940b327561 done Prescriptions 6 years ago
haroon amjad 06f95c5379 Appointment Details implementation continued 6 years ago
Sultan Khan 41b438fd74 login page changes 6 years ago
haroon amjad 0171664779 Master Merged in to local 6 years ago
haroon amjad 049d455e3c Implementing appointment details functions 6 years ago
Mohammad Aljammal ec09721869 fix merge issues 6 years ago
Mohammad Aljammal 5874f4ba21 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
 Conflicts:
	lib/pages/landing/landing_page.dart
6 years ago
Mohammad Aljammal 5a38479254 fix merge issues 6 years ago
Mohammad Aljammal 1ac420ef7c Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
6 years ago
Sultan Khan 3a15c16883 login changes 6 years ago
Mohammad Aljammal 43349542da Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile 6 years ago
Mohammad Aljammal 8de50bfe74 medical - my doctor and prescription services and pages 6 years ago
haroon amjad f5ddfabf50 Todo list implemented, Appointment details implemented, Appointment Reschedule implemented, Appointment Confirmed implemented 6 years ago
hussam al-habibeh e92cb2e1ac Design and return Pharmacy List 6 years ago
haroon amjad 7f4fbadfab Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/landing_page.dart
6 years ago
haroon amjad d8fe501341 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/pages/BookAppointment/BookingOptions.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/others/app_scaffold_widget.dart
6 years ago
Sultan Khan 31fe444150 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 6 years ago
Sultan Khan b0989d6ca0 login pages changes 6 years ago
Sultan Khan 76aeeffad7 login page changes 6 years ago
Mohammad Aljammal 93bfcbc20f Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
 Conflicts:
	lib/pages/landing/landing_page.dart
	pubspec.yaml
6 years ago
Mohammad Aljammal e147787be9 merge search and return medicine 6 years ago
Mohammad Aljammal 01b230accf Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into SearchMedicineAndReturnMedicineList
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/main.dart
	lib/pages/landing/landing_page.dart
	lib/uitl/translations_delegate_base.dart
	pubspec.yaml
6 years ago
Sultan Khan 5b411c3120 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 6 years ago
Sultan Khan c018597d90 confrim login page added 6 years ago
haroon amjad e34da6485b Doctor Free Slots implemented 6 years ago
Mohammad Aljammal 4bc68c6afd merge sultan 6 years ago
Mohammad Aljammal 2d5b725818 Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_merge
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/pages/landing/landing_page.dart
	lib/uitl/translations_delegate_base.dart
6 years ago
Mohammad Aljammal b2875fbce3 merge haroun 6 years ago
hussam al-habibeh 31d2816e64 design for search medicine and return medicine list 6 years ago
Mohammad Aljammal 3a68e0e092 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_haron
 Conflicts:
	lib/config/config.dart
	lib/widgets/others/app_scaffold_widget.dart
6 years ago
Sultan Khan 5a08cb720c login changes 6 years ago
Mohammad Aljammal fc749de77e create doctor card and medical page 6 years ago
Sultan Khan f8d8e1c685 new pages added 6 years ago
Sultan Khan 192b21a7e7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
# Conflicts:
#	lib/main.dart
#	lib/widgets/input/date_picker/button_actions.dart
#	lib/widgets/input/text_field.dart
#	lib/widgets/others/app_scaffold_widget.dart
6 years ago
Sultan Khan 8dd38a8b3c no message 6 years ago
haroon amjad ca7b4534a8 Search By Clinic & Search By Doctor Name implemented 6 years ago
Haroon Amjad 9eb9f01dbd Get Clinic List API Implemented, Architecture for HTTP requests implemented 6 years ago
Mohammad Aljammal d02151bea8 fix import in main 6 years ago
haroon amjad a0173c5b4d Appointment Details page, ToDo List Page implemented 6 years ago
Mohammad Aljammal 257cc92691 add MVVM and di Mohammad Aljammal and Elham Rababah 6 years ago
haroon amjad 9842c3a0b1 Translation updates 6 years ago
haroon amjad 1554a6bdf5 Book Appointment Flow added 6 years ago
Sultan Khan d897463b42 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter 6 years ago
Sultan Khan 4a0cc17069 login module started 6 years ago
Mohammad Aljammal 198a1854a9 add documentation Mohammad Aljammal and Elham Rababah 6 years ago
Mohammad Aljammal 6d6c71655a add new widget by Elham Rababah and Mohammad Aljammal 6 years ago
Mohammad Aljammal 19676549e1 add base client, landing page, bottom_nav_bar , List Container, List Item, drawer progress indicator and asset file 6 years ago
Mohammad Aljammal 3ed5c3878f init project structure By Mohammad and Elham 6 years ago