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

73 Commits (ff72b4b31e64d9d670161172961c75832ddf709c)

Author SHA1 Message Date
haroon amjad 40d649dfa4 Updates & fixes 3 years ago
Fatimah Alshammari e5f0f5777b Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2 
# Conflicts:
#	lib/services/pharmacy_services/product_detail_service.dart
 3 years ago
haroon amjad 6d88607631 Updates & fixes 3 years ago
Fatimah Alshammari 57d10d9e1f fix compare issue 3 years ago
haroon amjad c05772c63a pharmacy fixes 3 years ago
haroon amjad b15bd2362b Updates & fixes 3 years ago
haroon amjad 7733c74f00 Updates & fixes 3 years ago
haroon amjad 330f2d6c86 Fixes & updates 3 years ago
Elham Rababh 34596163d1 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 3 years ago
Elham Rababh 12e47aba82 fix as first step 3 years ago
haroon amjad 333b41632c fixes 3 years ago
Fatimah Alshammari 5dc1561992 fixed notify issue 3 years ago
haroon amjad 777d88be30 updates 3 years ago
haroon amjad 79d99dd48a Pharmacy security updates applied 3 years ago
haroon amjad d630c6c45f Pharmacy fixes 3 years ago
Fatimah Alshammari f5de786745 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 3 years ago
haroon amjad 3ec2f990b1 product detail page updates 3 years ago
Fatimah Alshammari c4e185ea60 fixed issues 3 years ago
haroon amjad 11d37d26e5 Product Detail page fix 3 years ago
haroon amjad 6ffa07392c Product detail page updates 3 years ago
haroon amjad 925e3cb686 Merge branch 'development' into haroon-new-design 
# Conflicts:
#	lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
#	lib/main.dart
#	lib/pages/final_products_page.dart
#	lib/pages/landing/landing_page_pharmcy.dart
#	lib/pages/login/login.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/screens/product-details/product-detail.dart
#	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
#	lib/pages/pharmacy/profile/profile.dart
#	lib/services/pharmacy_services/product_detail_service.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
 3 years ago
mosazaid 4939fe63d1 pharmacy cart fixe counter 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
mosazaid 9a1dc3c678 pharmacy cart and wishlist fixes 3 years ago
Mohammad Aljammal 29d0afdea4 Merge branch 'product_detail_page' into 'development' 
fix bottom sheet functions

See merge request Cloud_Solution/diplomatic-quarter!424
 3 years ago
Elham Rababh be21cb352b return recommended products 3 years ago
Fatimah Alshammari 8baad999c5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 
# Conflicts:
#	lib/config/config.dart
#	lib/pages/parent_categorise_page.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/wishlist.dart
 3 years ago
Fatimah Alshammari 4309952b17 fixed subCategories 3 years ago
Elham Rababh b0b278a7e3 fix bugs 3 years ago
mosazaid 594b2710b3 fix bugs pharmacy home 3 years ago
Sultan Khan 08933632d3 tracker services done rrt in progress 3 years ago
Mohammad Aljammal 43e7bb9ff3 fix bottom navigation bar 3 years ago
haroon amjad 05354f72cc pharmacy import fixes 3 years ago
haroon amjad b51989e798 Merge branch 'development_new_design_2.0' into haroon-new-design 
# Conflicts:
#	lib/pages/pharmacies/compare.dart
#	lib/pages/pharmacies/my_reviews.dart
#	lib/pages/pharmacies/wishlist.dart
 3 years ago
Sikander Saleem f0bb94c422 Merge branch 'development' into development_new_design_2.0 
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
 3 years ago
haroon amjad 7467da7409 Imports organized 3 years ago
Fatimah Alshammari 8c0dca781c fixed compare issues and arabic version 3 years ago
haroon amjad f795ba24c5 updates & fixes 3 years ago
Fatimah Alshammari f3b545ff74 fixed products issues 3 years ago
Zohaib Iqbal Kambrani 429fcb1e60 Merge branch 'development' into ZohaibIqbalKambrani 
* development: (32 commits)
  changes
  package name changed
  Jira Fixes
  Jira fixes
  PAP-664
  PAP-664
  PAP-664
  langauge issue
  bug fix
  PAP-777
  PAP-729
  fix button
  fix translate issues
  CONFIG
  PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.
  bug fixes
  fix bugs
  fixing dashboard issue
  fixing dashboard issue
  jira bugs
  ...

# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
 3 years ago
Zohaib Iqbal Kambrani bf303a7be0 RRT Implementation 3 years ago
haroon amjad 7b6270c67f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 3 years ago
Fatimah Alshammari 265d13b970 fixed an issue in recommended page 4 years ago
haroon amjad accc39d972 jira bug fixes 4 years ago
haroon amjad e0ebb922ed pharmacy fixes 4 years ago
Fatimah Alshammari a46dddea9a Merge branch 'development' into pharmacy-Fatima 
# Conflicts:
#	lib/core/model/pharmacies/order_model.dart
#	lib/pages/pharmacies/product-brands.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacy/order/Order.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
#	lib/pages/pharmacy/profile/profile.dart
 4 years ago
Fatimah Alshammari c629fcb85c fixed recommended products new design 4 years ago
mosazaid f3cdd08857 adding fharmacy payment feature 4 years ago
enadhilal 0c6fb67718 fixed issues 4 years ago
Fatimah Alshammari ac32ba998c fixed order isuee 4 years ago