Commit Graph

549 Commits (944bbce1bfa3b72efb630de6b4a5f9dfaa8ac11c)

Author SHA1 Message Date
Mohammad Aljammal 0150bc4684 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
 Conflicts:
	lib/pages/pharmacies/ProductCheckTypeWidget.dart
	lib/pages/pharmacies/screens/cart-order-page.dart
	lib/pages/pharmacies/screens/pharmacy_module_page.dart
4 years ago
Mohammad Aljammal eb19daa98f fix car count 4 years ago
Elham Rababh b0b278a7e3 fix bugs 4 years ago
mosazaid 4d37bc2958 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
 Conflicts:
	lib/pages/pharmacies/screens/product-details/product-detail.dart
	lib/pages/pharmacies/screens/product-details/recommended_products.dart
	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
	lib/widgets/others/app_scafold_detail_page.dart
4 years ago
mosazaid a41980b252 fix bugs pharmacy wishlist 4 years ago
Elham Rababh 58d43f7e46 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page 4 years ago
mosazaid 0d2d4c64c2 fix bugs pharmacy home and increase performance 4 years ago
Elham Rababh 7dfc700d26 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page 4 years ago
Elham Rababh 47e19c4ab5 add loader and cache on images 4 years ago
Mohammad Aljammal b175fb7ce0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile 4 years ago
mosazaid 6acb8031d0 fix bugs pharmacy home 4 years ago
mosazaid 594b2710b3 fix bugs pharmacy home 4 years ago
Mohammad Aljammal 9e31d497ed fix wish list issue 4 years ago
mosazaid 185d66e342 fix bugs pharmacy home 4 years ago
mosazaid f47d59c43f fix bugs pharmacy home 4 years ago
mosazaid fdb61c78c5 fix bugs pharmacy home 4 years ago
mosazaid a398ede172 fix bugs pharmacy home 4 years ago
mosazaid f329eea798 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs 4 years ago
mosazaid 01a77d5352 fix bugs pharmacy 4 years ago
Mohammad Aljammal 8c7f397ac8 Merge branch 'pharmacy_fix' into 'development'
Pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!397
4 years ago
hussam al-habibeh dbf7ebf287 fix most viewed & best sellers moduls 4 years ago
Elham Rababh cc88f0f81e first step of fixing 4 years ago
Fatimah Alshammari 7ebeb8cb4b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/pages/parent_categorise_page.dart
#	lib/pages/sub_categorise_page.dart
4 years ago
Mohammad Aljammal 473f372a85 Merge branch 'blood_pressure' into 'development'
fix pharmacy products filtering

See merge request Cloud_Solution/diplomatic-quarter!388
4 years ago
hussam al-habibeh cb9d8cb9d9 fix pharmacy products filtering 4 years ago
Fatimah Alshammari 8c0dca781c fixed compare issues and arabic version 4 years ago
Fatimah Alshammari 62167baec5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 4 years ago
Fatimah Alshammari 6d72be2a73 fixed cart order issues 4 years ago
haroon amjad e679c7df0d updates & fixes 4 years ago
haroon amjad 44d59ed01a updates & fixes 4 years ago
Mohammad Aljammal 55f9bbcba4 Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!379
4 years ago
haroon amjad 8cb9a5e619 updates 4 years ago
haroon amjad faff3b90cb Merge branch 'development' into Haroon
# Conflicts:
#	lib/core/service/er/am_service.dart
4 years ago
haroon amjad e9ec2e2faf Ambulance request APIs revamped 4 years ago
Fatimah Alshammari f09cdd944d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sultan Khan 1726f8cc11 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
haroon amjad 4c2b70fcb5 Merge branch 'development' into Haroon 4 years ago
haroon amjad 21c3686e05 Ambulance request services revamping 4 years ago
Fatimah Alshammari b6981299d9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 4 years ago
Fatimah Alshammari 239ad530ce fixed isuues 4 years ago
Mohammad Aljammal 36142f0f6d Merge branch 'fix_bug_pharmacy' into 'development'
fix bugs pharmacy

See merge request Cloud_Solution/diplomatic-quarter!375
4 years ago
mosazaid a2e60e7584 fix bugs pharmacy 4 years ago
Fatimah Alshammari 72ba0c7c74 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 4 years ago
Fatimah Alshammari f3b545ff74 fixed products issues 4 years ago
Sultan Khan b116079843 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 4325bd3448 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 5fe6a6c3dd doctor schedule 4 years ago
haroon amjad e96157c74a Covid certificate passport CR implemented 4 years ago
haroon amjad 73097d15de Covid Lab result generate certificate implemented 4 years ago
haroon amjad 5f521556dc Dental flow fixes 4 years ago