526 Commits (b37dd5780426b3b4c20a00d0d91aad55b52c26cb)

Author	SHA1	Message	Date
Mohammad Aljammal	25d5105caf	Merge branch 'Apr-fixes' into 'development' ... PAP-607: fix issue See merge request Cloud_Solution/diplomatic-quarter!312	4 years ago
Elham Rababah	2a47564c37	PAP-607: fix issue	4 years ago
Fatimah Alshammari	174e0d9673	Merge branch 'development' into pharmacy-Fatima	4 years ago
Fatimah Alshammari	2481e4c9ea	fixed categories issues and home page button	4 years ago
Sultan Khan	cd7845b1a4	bug fix	4 years ago
Sultan Khan	0245875358	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Sultan Khan	3d6858d0ec	bug fixes	4 years ago
Fatimah Alshammari	235fdfba54	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development	4 years ago
Fatimah Alshammari	71a393df68	fixed categories issue	4 years ago
mosazaid	b623bd0dce	Merge branch 'development' into fix_bugs	4 years ago
mosazaid	e5474b3062	fix perscription pages bugs	4 years ago
Mohammad Aljammal	126fad61c0	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_eye_balance ... Conflicts: lib/core/service/client/base_app_client.dart	4 years ago
Mohammad Aljammal	53e4dfa99d	Merge branch 'ZohaibIqbalKambrani' into 'development' ... Zohaib iqbal kambrani See merge request Cloud_Solution/diplomatic-quarter!292	4 years ago
Mohammad Aljammal	7c1fd8043b	fix chart and eye and balance	4 years ago
Zohaib Iqbal Kambrani	b91ce441e2	Merge branch 'development' into ZohaibIqbalKambrani ... # Conflicts: Resolved # lib/core/model/pharmacies/order_model.dart # lib/core/service/client/base_app_client.dart # lib/main.dart # lib/pages/landing/home_page.dart # lib/pages/pharmacy/order/OrderDetails.dart # lib/pages/pharmacy/order/TrackDriver.dart # lib/routes.dart # lib/uitl/translations_delegate_base.dart # lib/uitl/utils.dart # lib/widgets/in_app_browser/InAppBrowser.dart # lib/widgets/others/app_scaffold_widget.dart # pubspec.yaml	4 years ago
hussam al-habibeh	f9b8191a5e	jira bugs	4 years ago
Zohaib Iqbal Kambrani	6f2c947687	Packages And offers..	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
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	e0ebb922ed	pharmacy fixes	4 years ago
Zohaib Iqbal Kambrani	f410ce20ca	Packages and Offers in Progress	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
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
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
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
enadhilal	0cb493d56c	Merge branch 'development' into enad_pharmacy2 ... # Conflicts: # lib/pages/pharmacies/product_detail.dart	4 years ago
Fatimah Alshammari	42bf76f712	Merge branch 'development' into pharmacy-Fatima ... # Conflicts: # lib/config/config.dart # lib/core/service/parmacyModule/parmacy_module_service.dart # lib/pages/pharmacies/product_detail.dart # lib/pages/pharmacies/screens/pharmacy_module_page.dart	4 years ago
Zohaib Iqbal Kambrani	15ec3ec9b9	Translation Track Driver, enhancement, initial camera	4 years ago
Zohaib Iqbal Kambrani	63663f1b24	Track Delivery Driver Completed	4 years ago
Fatimah Alshammari	ac32ba998c	fixed order isuee	4 years ago
Zohaib Iqbal Kambrani	516df96e21	no message	4 years ago
Mohammad Aljammal	e6da54c201	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon ... Conflicts: lib/config/localized_values.dart lib/core/service/client/base_app_client.dart lib/uitl/translations_delegate_base.dart	4 years ago
Mohammad Aljammal	20ad10b9dc	Merge branches 'development' and 'fix-pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix-pharmacy ... Conflicts: lib/config/localized_values.dart lib/core/service/client/base_app_client.dart lib/uitl/translations_delegate_base.dart	4 years ago
Mohammad Aljammal	8899bdf460	Done Prescription Delivery Address	4 years ago
mosazaid	1a45f99606	some fixes on pharmacy	4 years ago
haroon amjad	5e8e3806d6	Covid Drive-Thru implemented	4 years ago
Sultan Khan	144ef52c70	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Sultan Khan	b3e6c4efda	voice command changes	4 years ago