Commit Graph

2070 Commits (333247faa2b3fd03887bb7dbc763c0dade83e9ec)

Author SHA1 Message Date
Mirza.Shafique a766c2522e Child Vaccine 1.0 4 years ago
haroon amjad 3d22cdb17c Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 680dcfc255 In App Review 4 years ago
Mirza.Shafique 41db218e9a oder log merge fix 4 years ago
Mirza.Shafique d3698a0e74 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/orders_log_details_page.dart
4 years ago
Mirza.Shafique 3d480bac5c design fixes 3 4 years ago
haroon amjad 4b0382d7c4 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 12a58856e5 Chart fix & In-App update implemented 4 years ago
Mirza.Shafique a273bacc17 design fixes 1.1 4 years ago
Sikander Saleem 4dca22bec1 Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem afad83182d h20 dialog ui changes 4 years ago
haroon amjad 0c895348e7 my family fix 4 years ago
haroon amjad a710406317 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_page.dart
#	lib/pages/DrawerPages/family/my-family.dart
4 years ago
haroon amjad 75d3751719 Offers API 4 years ago
haroon amjad 494b1f221d Updates & fixes 4 years ago
Mirza.Shafique 792bb4df0b Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/pages/medical/my_trackers/Weight/WeightMonthlyPage.dart
#	lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart
#	lib/pages/medical/my_trackers/Weight/WeightYeaPage.dart
4 years ago
Mirza.Shafique 0ba4e9047b design fixes 1.0 4 years ago
haroon amjad 8001c0140c Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart
4 years ago
haroon amjad 1858be18b7 Feedback Status fixes 4 years ago
Sikander Saleem 554b9558b1 add reminder & send mail button color change. 4 years ago
Sikander Saleem 14ccae993e my tracker tabs switching issue fixed. 4 years ago
Haroon Amjad 59dac89118 updates 4 years ago
haroon amjad ade3cb0899 File no & UI changes 4 years ago
haroon amjad 1dcfe44e96 Translations 4 years ago
haroon amjad 2ed8008790 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
haroon amjad 832d48971f updates 4 years ago
Mirza.Shafique 4cf9a9b2c2 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
Mirza.Shafique 3dbef4095f Payment page design 4 years ago
Sikander Saleem ba4792cd38 merge improvements. 4 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
4 years ago
haroon amjad 43a672cc68 Updates & fixes 4 years ago
haroon amjad 5d44fff28d Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 5f963b0327 Translation updates, CMC, HHC & RRT APIs updates 4 years ago
Mirza.Shafique ab6f7b8915 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
Mirza.Shafique eeaf7d9d2f HMG Services Detail View 4 years ago
Sikander Saleem f13871de9a find us and prescription availability hospital location ui changes, 4 years ago
Fatimah Alshammari f649701276 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 4 years ago
Fatimah Alshammari 3be7f7f899 fixed loader issue 4 years ago
haroon amjad ed4fca2d4c Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!444
4 years ago
haroon amjad babb48b1db base app client changes 4 years ago
haroon amjad cf7291e379 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
haroon amjad 03882c166c Translation & UI updates 4 years ago
haroon amjad 90843252c3 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart
#	lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Fatimah Alshammari 9cf0794cf6 Fixed out of stuck items issues 4 years ago
Sultan Khan 18f35a22bb FAMILY FILE 4 years ago
Sultan Khan 5a9ab457e5 family files 4 years ago
haroon amjad 6d3ead24e1 localisation update 4 years ago
Sultan Khan a31f55aaa7 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan 4780039cc7 family file change 4 years ago
Mirza.Shafique 05a6860081 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique e1b79ef5c1 E-Refreal design 4 years ago
Sikander Saleem ecb6315f9c blood pressure, blood sugar, weight, order log & send feedback dialog changes and improvements (cont). 4 years ago
haroon amjad 2db050a228 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad e564cdc7e5 Updates & fixes 4 years ago
Sikander Saleem 0b4305de03 all dialog changes and improvements (cont). 4 years ago
haroon amjad 6511ca8dc7 UI fixes & updates 4 years ago
Sultan Khan 448a3aaa48 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan 881644a22e family files changes 4 years ago
Fatimah Alshammari e2763a5bd5 fixed cart shopping issues 4 years ago
haroon amjad 6cd2f65ce8 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 9d30bf63d0 Notification page fix 4 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
4 years ago
haroon amjad 43c67a5a84 Notifications UI fix 4 years ago
Sikander Saleem a026fbf940 feedback status added. 4 years ago
haroon amjad f60684ad08 Notifications UI redesigned 4 years ago
haroon amjad 8cf6642c79 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 803f5a786b Blood pressure chart fix 4 years ago
Sultan khan f5b17444fe Merge branch 'sultan_new_design' into 'development_new_design_2.0'
my family

See merge request Cloud_Solution/diplomatic-quarter!441
4 years ago
haroon amjad 07a98d75c6 My tracker fixes 4 years ago
Sultan Khan a39658206d my family 4 years ago
haroon amjad 40cbca565a fixes 4 years ago
haroon amjad e1f5eb8b83 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
haroon amjad 8ea6a5de04 localization fix 4 years ago
Sultan Khan 160049973e Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan e3a7c08e7c blood type changes 4 years ago
Sikander Saleem 54c3beadf2 improvements. 4 years ago
Sikander Saleem 8f371f87d2 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 58c78656bf Rating dialog updates 4 years ago
Mirza.Shafique dde16a13fe General page in profile 4 years ago
Sikander Saleem 21863cfe06 improvements. 4 years ago
Sikander Saleem ad98dfce67 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/AlHabibMedicalService/h2o/h2o_page.dart
4 years ago
Sikander Saleem 1223ab7a17 h20 week & month graph updated & improvements. 4 years ago
haroon amjad 4a2e01b8b1 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad b475adb5c3 Updates & fixes 4 years ago
Sultan Khan 5c8b809e39 family file fixes 4 years ago
Fatimah Alshammari d8db5ad590 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/pages/landing/landing_page_pharmcy.dart
#	lib/pages/pharmacies/screens/cart-order-page.dart
4 years ago
Fatimah Alshammari 30a1353be6 fixed brands design and recommended products issues 4 years ago
hussam al-habibeh a8fb7152b1 add to cart fix 4 years ago
hussam al-habibeh 75ef3fde80 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix
 Conflicts:
	lib/widgets/pharmacy/bottom_nav_pharmacy_item.dart
4 years ago
Mirza.Shafique d664a216c6 Profile Page and Back Button Click 4 years ago
hussam al-habibeh 66acda38a3 add to cart fix 4 years ago
Elham Rababh 75fdadafbd refactor widget in the cart preview 4 years ago
Elham Rababh 2526d6bc6f fix issue in cart page 4 years ago
haroon amjad e62e3dae1b CMC APIs coverting to RC 4 years ago
haroon amjad 6902e6529c Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Sultan khan 5dbb257194 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!433
4 years ago
Sikander Saleem f6b96dcb7b Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/BookAppointment/components/SearchByDoctor.dart
4 years ago
Sultan Khan 3b4e03c618 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan b5cd6afa4b family file fixs 4 years ago
Sikander Saleem c9662c7451 schedule appointment navigation fix. 4 years ago
haroon amjad 0a9d0e5eaa fixes 4 years ago
Mirza.Shafique 6261f01ab6 Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
Mirza.Shafique 9c7e8e3637 Back Button on Landing Page 1 4 years ago
haroon amjad 3f3ddd7af0 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/MyAppointments/SchedulePage.dart
4 years ago
Sikander Saleem f509679173 Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
haroon amjad cbf2e84959 fixes 4 years ago
Sikander Saleem 1346eab593 h2o today page, prescription & schedule appointment improvements. 4 years ago
haroon amjad 022b1bd000 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Sultan Khan 02f5b43b64 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan ca70926050 family file fixes 4 years ago
haroon amjad cb220031dd Updates & fixes 4 years ago
mosazaid b779c250a4 pharmacy cart and wishlist fixes 4 years ago
Mirza.Shafique d48a4ff4e3 Back Button on Landing Page 4 years ago
Mirza.Shafique 3a07d39bff Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
mosazaid 9a1dc3c678 pharmacy cart and wishlist fixes 4 years ago
haroon amjad 6c4afaf114 Advance payment API updates 4 years ago
Fatimah Alshammari 10f75191c6 added shopping cart to categories 4 years ago
Mirza.Shafique 4d372bffb2 Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
Mirza.Shafique e788f09ed9 Show Chart Widget 4 years ago
Haroon Amjad 1fa6a4409b Family files fixes 4 years ago
haroon amjad 587210ee58 UI fixes 4 years ago
haroon amjad a819660536 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
haroon amjad 01ccd484f4 Calendar plugin changed 4 years ago
Sultan khan 7e095248c5 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
family files changes

See merge request Cloud_Solution/diplomatic-quarter!428
4 years ago
Sikander Saleem 8aa1fbfb4a localized_values fixed. 4 years ago
Sultan Khan 9010558dc9 family files changes 4 years ago
Sikander Saleem 08960867f7 Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem 2aa6ad5d6b h20 today ui (cont.)1 4 years ago
Sikander Saleem 55df00dcd4 h20 today ui (cont.) 4 years ago
haroon amjad 7264d03818 Family Files previleges fix 4 years ago
Sikander Saleem 763c16ddd0 h2o setting ui redesigned. 4 years ago
haroon amjad 259581c4f8 updates & fixes 4 years ago
Mohammad Aljammal 29d0afdea4 Merge branch 'product_detail_page' into 'development'
fix bottom sheet functions

See merge request Cloud_Solution/diplomatic-quarter!424
4 years ago
Elham Rababh be21cb352b return recommended products 4 years ago
haroon amjad 96c290c3f3 Localization file updates 4 years ago
haroon amjad 829fcd1461 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart
4 years ago
haroon amjad 2c4ff16f0c updates & fixes 4 years ago
Sultan Khan 821a9b5ade Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan 2c1d7c511e family file changes 4 years ago
haroon amjad 230d87c473 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/feedback/send_feedback_page.dart
4 years ago
haroon amjad 01ca8b8f84 updates & fixes 4 years ago
Mirza.Shafique cb230db0c5 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique a9773e81e7 Bug Fixes prescription 4 years ago
Sikander Saleem 8b49eed6ae hospital text replaced with branch 4 years ago
Fatimah Alshammari ac63f09633 edit arabic version 4 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
4 years ago
Elham Rababh 8fac62bcb1 fix bottom sheet functions 4 years ago
Fatimah Alshammari 74929f76e5 edit home page 4 years ago
Mohammad Aljammal bcd99555e3 Merge branch 'pharmacy_fix_bugs' into 'development'
Pharmacy fix bugs

See merge request Cloud_Solution/diplomatic-quarter!423
4 years ago
mosazaid c1f3d3cc1c fixes 4 years ago
Elham Rababh 944bbce1bf add count to cart 4 years ago
Elham Rababh bfbd04e35d add count to cart 4 years ago
mosazaid acdd19eeed calling cart from pharmacy home and add provider to it 4 years ago
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 3dc28d318a fix bugs on wish list 4 years ago
Fatimah Alshammari 4309952b17 fixed subCategories 4 years ago
Sikander Saleem b4031e973e chevron icon to arrow forward 4 years ago
Elham Rababh b0b278a7e3 fix bugs 4 years ago
haroon amjad 503ab739ca prescription availability design revamped 4 years ago
Elham Rababh 145117aa63 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
 Conflicts:
	lib/pages/pharmacies/screens/product-details/product-name-and-price.dart
4 years ago
Elham Rababh 9254004125 fix coloring issue 4 years ago
mosazaid 8b5e1e57c7 fix bugs pharmacy wishlist 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 7de8c2588f fix coloring issue 4 years ago
haroon amjad 46a572674f Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 69af6799c4 updates 4 years ago
Mirza.Shafique 3a40eb92be Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique 06c5ee269b Bug Fixes 4 years ago
Sultan Khan 1b387c2dbf changes pushed 4 years ago
Elham Rababh 58d43f7e46 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page 4 years ago
Elham Rababh 2981eb3236 fix public card issues 4 years ago
haroon amjad 2690bddcac Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 5163c826ad Updates & fixes 4 years ago
Sultan Khan d514f64870 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan 76e16594ba FAMILY FILES 4 years ago
Sikander Saleem 6099738a5c improvements 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
Sikander Saleem df31c82fd5 doctor header review on tap improvement. 4 years ago
Elham Rababh 055b888ba2 fix address 4 years ago
Elham Rababh 3b79d0ac41 return the disable colors 4 years ago
Elham Rababh 47e19c4ab5 add loader and cache on images 4 years ago
Sikander Saleem 5410b826c3 prescriptions new ui updated. 4 years ago
Mohammad Aljammal 48642a3c7c Merge branch 'product_detail_page' into 'development'
Product detail page

See merge request Cloud_Solution/diplomatic-quarter!414
4 years ago
Mohammad Aljammal b175fb7ce0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile 4 years ago
Haroon Amjad 19edcc210e Rate appointment UI implemented 4 years ago
haroon amjad 89e1aa70c0 updates 4 years ago
Elham Rababh 1e1e230908 fix call service in case not login 4 years ago
Mohammad Aljammal b539ff5851 Merge branch 'pharmacy_fix' into 'development'
cart fix

See merge request Cloud_Solution/diplomatic-quarter!413
4 years ago
Elham Rababh a5751f0d70 handel un login cases 4 years ago
hussam al-habibeh c56e4a1a5c cart fix 4 years ago
Mohammad Aljammal 6339e30369 Merge branch 'pharmacy_fix_bugs' into 'development'
fix bugs pharmacy home

See merge request Cloud_Solution/diplomatic-quarter!412
4 years ago
mosazaid a9d0b7a14b fix bugs pharmacy home 4 years ago
Elham Rababh 19cb48e133 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page 4 years ago
Elham Rababh 338901d423 remove add to cart 4 years ago
Elham Rababh 7c15bca746 fix item 4 years ago
mosazaid 6acb8031d0 fix bugs pharmacy home 4 years ago
Mohammad Aljammal 76eef8625d Merge branch 'pharmacy_fix_bugs' into 'development'
fix bugs pharmacy home

See merge request Cloud_Solution/diplomatic-quarter!411
4 years ago
mosazaid 594b2710b3 fix bugs pharmacy home 4 years ago
haroon amjad 22c6a8ce42 no message 4 years ago
haroon amjad 85d68b0388 ereferral fixes 4 years ago
Mohammad Aljammal 1f9e7563a9 Merge branch 'product_detail_page' into 'development'
fix scaffold

See merge request Cloud_Solution/diplomatic-quarter!409
4 years ago
Sultan Khan fed33ae4dc Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan fee23de1fd hhc changes 4 years ago
Elham Rababh ad0c8eaffb fix scaffold 4 years ago
Mohammad Aljammal b64a5b29c5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
 Conflicts:
	lib/pages/pharmacy/profile/profile.dart
4 years ago
Mohammad Aljammal 9e31d497ed fix wish list issue 4 years ago
Mohammad Aljammal 361b72624b Merge branch 'pharmacy_fix' into 'development'
Pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!407
4 years ago
Elham Rababh 65cf4316ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
 Conflicts:
	lib/pages/pharmacies/screens/pharmacy_module_page.dart
	lib/widgets/others/app_scaffold_widget.dart
4 years ago
Elham Rababh bb96201c2e remove the custom scaffold 4 years ago
Sikander Saleem 28c0450544 lab result filterName improvement. 4 years ago
hussam al-habibeh f3000d0ee3 My account design fix 4 years ago
Elham Rababh e20e90c20c fix quantity_box 4 years ago
haroon amjad f6d779431a fixes 4 years ago
haroon amjad 8133f8a23a Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 46cc73bdd7 CMC changes 4 years ago
Sultan Khan 6159be0f75 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan 5fe0214e04 bug fixes 4 years ago
haroon amjad 8cc36ae848 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad dfafb6b664 fixes 4 years ago
Mirza.Shafique c23478b838 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique 205b4d6b21 Photo view in CMC 4 years ago
Mohammad Aljammal 424552d672 Merge branch 'pharmacy_fix' into 'development'
add pharmacy icons for bottom nav

See merge request Cloud_Solution/diplomatic-quarter!403
4 years ago
Elham Rababh d5f1a162c0 replace bottom sheet button 4 years ago
hussam al-habibeh 85e6032875 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix 4 years ago
mosazaid 185d66e342 fix bugs pharmacy home 4 years ago
hussam al-habibeh d4fd95606e add pharmacy icons for bottom nav 4 years ago
Sikander Saleem d1f3428def Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem df32ae0142 lab order clinic/hospital name, prescription reminder ui, prescription availibility 4 years ago
haroon amjad 879ce4ee06 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 7675a4496a my vaccine & lab result fix 4 years ago
Sultan Khan a4ab22a4aa Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan 5b988dff4f BUG FIXES 4 years ago
Mirza.Shafique 5e383e57d9 CMC error Fixes 4 years ago
Elham Rababh 6fe41382c0 first step from design 4 years ago
Sikander Saleem 3403e07aba recall prescription order log when refill or cancel order. 4 years ago
mosazaid c558fe6bd9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs 4 years ago
mosazaid f47d59c43f fix bugs pharmacy home 4 years ago
Haroon Amjad 062ca5c11c EReferral fixes 4 years ago
Haroon Amjad abcb71e86e Invoice details UI revamped 4 years ago
haroon amjad c91b8ce777 My Vaccines design revamped 4 years ago
Elham Rababh 2839af658a fix issues 4 years ago
haroon amjad dfeb249a54 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad a4a2389a78 updates & fixes 4 years ago
Sikander Saleem f63293ef3e login input rtl 4 years ago
mosazaid fdb61c78c5 fix bugs pharmacy home 4 years ago
Sultan Khan fc9f2fc34e Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan 08933632d3 tracker services done rrt in progress 4 years ago