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

527 Commits (bebcd8555751f1c2552aaeb5bcd3e71718a6e640)

Author SHA1 Message Date
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
 3 years ago
Fatimah Alshammari 78fc77159c fix lakum issues 3 years ago
haroon amjad 8d6278a59b Pharmacy fixes 3 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
 3 years ago
haroon amjad fa5fd8e323 Merge branch 'development_new_design_2.0' into haroon-new-design 3 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
 3 years ago
haroon amjad 62974b7b72 Updates & fixes 3 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
 3 years ago
Zohaib Iqbal Kambrani 9d71793e88 no message 3 years ago
haroon amjad 73822300f9 Health Calculators APIs updated 3 years ago
haroon amjad cb69684bb8 SessionID update 3 years ago
haroon amjad 5e5f540431 Merge branch 'development_new_design_2.0' into haroon-new-design 
# Conflicts:
#	lib/config/config.dart
 3 years ago
haroon amjad b08dfb117c Updates & fixes 3 years ago
Zohaib Iqbal Kambrani 4c5b9b4244 Merge branch 'development_new_design_2.0' into zik_new_design_2.0 
* development_new_design_2.0:
  Translation update
  Fixes & updates
  Blood donation fixes
  Pharmacy Payment method design fix, Blood Donation fix
  improvements
  blood donation dialog change & improvements.
  Pharmacy updates
  Pharmacy prescriptions page design
  LiveCare design fixes
 3 years ago
Zohaib Iqbal Kambrani 9fd2304d33 tamara. 3 years ago
Elham Rababh 2c30b5a494 fix issues 3 years ago
haroon amjad ddf764897a Pharmacy Payment method design fix, Blood Donation fix 3 years ago
Zohaib Iqbal Kambrani ebfa9cd630 Merge branch 'development_new_design_2.0' into zik_new_design_2.0 
* development_new_design_2.0:
  Layout files
  pharmacy updates
  fixed issues
  Updates
  UI fixes
  Updates
  Smartwatch updates
  Smartwatch updates
  fixed issues
  fixed loader issue
 3 years ago
Zohaib Iqbal Kambrani f3462dfc19 Applied cost from api at cart 3 years ago
haroon amjad 6f92a093ab Merge branch 'development_new_design_2.0' into haroon-new-design 
# Conflicts:
#	lib/config/config.dart
 3 years ago
Zohaib Iqbal Kambrani 8b1ac05012 Merge branch 'development_new_design_2.0' into zik_new_design_2.0 
* development_new_design_2.0: (105 commits)
  app bar back icon issue
  improvements
  emergency nearest ui changes
  Zoom Avatar implementation
  no message
  Child Vaccine 3
  register
  register page
  Working on Health data
  Child Vaccine 2
  registration
  Ereferral fixed, HHC moved to new APIs, Notification new design implemented
  registration done
  Child Vaccine 1.0
  In App Review
  In App Review
  oder log merge fix
  design fixes 3
  Chart fix & In-App update implemented
  design fixes 1.1
  ...

# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/fragments/home_page_fragment2.dart
 3 years ago
haroon amjad 1fff2dad25 Smartwatch updates 3 years ago
Zohaib Iqbal Kambrani aad071ac67 Packages and Offers apply token 3 years ago
haroon amjad d409875741 Smartwatch updates 3 years ago
haroon amjad 1f077f71f8 no message 3 years ago
haroon amjad 2032053cb7 Working on Health data 3 years ago
haroon amjad 3db4094585 Ereferral fixed, HHC moved to new APIs, Notification new design implemented 3 years ago
haroon amjad 494b1f221d Updates & fixes 3 years ago
haroon amjad 1858be18b7 Feedback Status fixes 3 years ago
Haroon Amjad 59dac89118 updates 3 years ago
Sikander Saleem 706832a1cb Merge branch 'development' into development_new_design_2.0 
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/parmacyModule/parmacy_module_service.dart
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart
#	lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
#	lib/locator.dart
#	lib/main.dart
#	lib/pages/final_products_page.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/parent_categorise_page.dart
#	lib/pages/pharmacies/product_detail.dart
#	lib/pages/pharmacies/screens/cart-order-preview.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/widgets/ProductTileItem.dart
#	lib/pages/search_products_page.dart
#	lib/services/pharmacy_services/product_detail_service.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/buttons/secondary_button.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/others/app_scafold_detail_page.dart
#	lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
 3 years ago
haroon amjad 5f963b0327 Translation updates, CMC, HHC & RRT APIs updates 3 years ago
haroon amjad babb48b1db base app client changes 3 years ago
haroon amjad 03882c166c Translation & UI updates 3 years ago
haroon amjad e564cdc7e5 Updates & fixes 3 years ago
haroon amjad 6511ca8dc7 UI fixes & updates 3 years ago
Sikander Saleem ae85f75e81 Merge branch 'new_design_sikander' into development_new_design_2.0 
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/feedback/status_feedback_page.dart
#	lib/uitl/translations_delegate_base.dart
 3 years ago
Sikander Saleem a026fbf940 feedback status added. 3 years ago
haroon amjad 07a98d75c6 My tracker fixes 3 years ago
haroon amjad 40cbca565a fixes 3 years ago
haroon amjad b475adb5c3 Updates & fixes 3 years ago
haroon amjad e62e3dae1b CMC APIs coverting to RC 3 years ago
haroon amjad 0a9d0e5eaa fixes 3 years ago
haroon amjad cb220031dd Updates & fixes 3 years ago
mosazaid 9a1dc3c678 pharmacy cart and wishlist fixes 3 years ago
haroon amjad 7264d03818 Family Files previleges fix 3 years ago
haroon amjad 259581c4f8 updates & fixes 3 years ago
haroon amjad 2c4ff16f0c updates & fixes 3 years ago
haroon amjad 01ca8b8f84 updates & fixes 3 years ago
mosazaid c1f3d3cc1c fixes 3 years ago