1015 Commits (ced7761a32ac6948f95d2378d88d797d3aa10749)

Author	SHA1	Message	Date
Mohammad Aljammal	ced7761a32	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_theme_issues	4 years ago
Mohammad Aljammal	b36e00d2a5	fix the line chart issues	4 years ago
Sultan Khan	60b1688bb4	chatbot	4 years ago
Sultan Khan	9bfd725e4f	bug fixes	4 years ago
Sultan Khan	ca2a48e860	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Sultan Khan	0445011e53	bug fixes	4 years ago
Mohammad Aljammal	ad88f6de04	fix theme issues	4 years ago
Sultan Khan	35c940a209	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Sultan Khan	80d96ba785	Privilege issue fixed	4 years ago
haroon amjad	454957ebba	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development ... # Conflicts: # lib/config/config.dart # lib/config/localized_values.dart	4 years ago
Sultan Khan	616212828d	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Sultan Khan	66acce3b40	ancillary order pages added	4 years ago
haroon amjad	db0fcd51cc	pharmacy updates	4 years ago
haroon amjad	74671d2f25	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development ... # Conflicts: # lib/core/service/client/base_app_client.dart # lib/core/service/parmacyModule/order-preview-service.dart # lib/pages/pharmacies/screens/cart-order-preview.dart	4 years ago
haroon amjad	e0ebb922ed	pharmacy fixes	4 years ago
mosazaid	ed1626f8ee	Merge branch 'development' into fix_order_checkout_payment	4 years ago
mosazaid	74dd274502	working on pharmacy some fixes on cart page and request body	4 years ago
haroon amjad	ed3dba3eb3	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development ... # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	4 years ago
haroon amjad	b9a12341d5	updates & fixes	4 years ago
Mohammad Aljammal	4dcb70d7eb	Merge branch 'pharmacy-bugs' into 'development' ... Pharmacy bugs See merge request Cloud_Solution/diplomatic-quarter!282	4 years ago
hussam al-habibeh	a534b1415e	products filtering fix	4 years ago
Mohammad Aljammal	861dba9a94	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ed_online ... Conflicts: lib/config/localized_values.dart lib/uitl/translations_delegate_base.dart	4 years ago
Mohammad Aljammal	ec401d4848	Done Ed online	4 years ago
Mohammad Aljammal	cacb6722b9	Merge branch 'pharmacy-bugs' into 'development' ... daynimic listing See merge request Cloud_Solution/diplomatic-quarter!279	4 years ago
hussam al-habibeh	b39e88d9c8	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs	4 years ago
Sultan Khan	a6196d3c30	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Sultan Khan	b891c1bd80	theme issue	4 years ago
hussam al-habibeh	2723422bbf	daynimic listing	4 years ago
Mohammad Aljammal	123b1de1a4	Merge branch 'pharmacy-bugs' into 'development' ... hussam See merge request Cloud_Solution/diplomatic-quarter!278	4 years ago
Mohammad Aljammal	50a45528d1	Merge branch 'pharmacy-bug-fixes' into 'development' ... bug-fixes See merge request Cloud_Solution/diplomatic-quarter!276	4 years ago
hussam al-habibeh	299a1bed25	hussam	4 years ago
hussam al-habibeh	790fbbcf6c	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs ... Conflicts: lib/pages/pharmacy_categorise.dart	4 years ago
hussam al-habibeh	3af37a6a5c	hussam	4 years ago
Fatimah Alshammari	8624d695dc	fixed order details	4 years ago
Fatimah Alshammari	747763c4be	Merge branch 'development' into pharmacy-Fatima ... # Conflicts: # lib/config/localized_values.dart # lib/locator.dart # lib/uitl/translations_delegate_base.dart # pubspec.yaml	4 years ago
mosazaid	44287db553	bug-fixes	4 years ago
Mohammad Aljammal	576181a72e	Merge branch 'sultan-patientapp' into 'development' ... Sultan patientapp See merge request Cloud_Solution/diplomatic-quarter!251	4 years ago
Sultan Khan	6f68cf5a15	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	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
mosazaid	dfeb70c892	Merge branch 'development' into pharmacy-payment-feature ... # Conflicts: # lib/pages/pharmacy/order/OrderDetails.dart	4 years ago
mosazaid	0b2002d4dd	finish payment order	4 years ago
Sultan Khan	1a35fe37b6	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Sultan Khan	e61c26b853	Auto SMS, Themes, Voice Command	4 years ago
Fatimah Alshammari	c629fcb85c	fixed recommended products new design	4 years ago
haroon amjad	da3ad90ddd	added app-wide route transition animation	4 years ago
Fatimah Alshammari	e5829d8513	fix recommended for you	4 years ago
haroon amjad	d8e11f7187	Merge branch 'development' into Haroon	4 years ago
haroon amjad	deb0b40cfe	fixes	4 years ago
mosazaid	c64769e422	Merge branch 'development' into pharmacy-payment-feature	4 years ago
mosazaid	f3cdd08857	adding fharmacy payment feature	4 years ago