619 Commits (e4c8575a7ffe16170e686d6364dbb37092cd7ad6)

Author	SHA1	Message	Date
Fatimah Alshammari	b6981299d9	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new	3 years ago
Fatimah Alshammari	239ad530ce	fixed isuues	3 years ago
Mohammad Aljammal	36142f0f6d	Merge branch 'fix_bug_pharmacy' into 'development' ... fix bugs pharmacy See merge request Cloud_Solution/diplomatic-quarter!375	3 years ago
mosazaid	a2e60e7584	fix bugs pharmacy	3 years ago
Sikander Saleem	ca363adee2	merge & improvements	3 years ago
Sikander Saleem	6191377914	Merge branch 'development' into development_new_design_2.0 ... # Conflicts: # lib/pages/login/login.dart # lib/uitl/translations_delegate_base.dart # lib/widgets/data_display/medical/LabResult/LabResultWidget.dart # lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart	3 years ago
Fatimah Alshammari	72ba0c7c74	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new	3 years ago
Fatimah Alshammari	f3b545ff74	fixed products issues	3 years ago
Sultan Khan	b116079843	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	3 years ago
Sultan Khan	4325bd3448	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	3 years ago
Sultan Khan	5fe6a6c3dd	doctor schedule	3 years ago
haroon amjad	e96157c74a	Covid certificate passport CR implemented	3 years ago
haroon amjad	73097d15de	Covid Lab result generate certificate implemented	3 years ago
Sikander Saleem	94ff5cff40	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	5f521556dc	Dental flow fixes	3 years ago
Sikander Saleem	acd3855c77	Merge branch 'development' into development_new_design_2.0	3 years ago
Sikander Saleem	bb18645d85	Merge branch 'development' into development_new_design_2.0 ... # Conflicts: # lib/config/localized_values.dart # lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart # lib/pages/MyAppointments/AppointmentDetails.dart # lib/pages/landing/landing_page.dart # lib/pages/medical/medical_profile_page.dart # lib/uitl/translations_delegate_base.dart	3 years ago
haroon amjad	3235f489b9	Merge branch 'development' into Haroon	3 years ago
haroon amjad	5009e48f64	Updates in Ambulance Request & Covid test	3 years ago
Sultan Khan	9e31a3c560	bug fixes	3 years ago
Sultan Khan	57d87dfc03	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	3 years ago
Sultan Khan	11ffed2ae3	bug fixes	3 years ago
Sikander Saleem	458dc2474b	Merge branch 'development' into development_new_design_2.0 ... # Conflicts: # lib/uitl/translations_delegate_base.dart	3 years ago
Sikander Saleem	197e7d5742	Merge branch 'development' into development_new_design_2.0 ... # Conflicts: # lib/config/localized_values.dart # lib/pages/medical/patient_sick_leave_page.dart # lib/uitl/translations_delegate_base.dart # lib/uitl/utils.dart	3 years ago
Fatimah Alshammari	787b55a803	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new ... # Conflicts: # lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart # lib/uitl/translations_delegate_base.dart	3 years ago
Fatimah Alshammari	34ccb132dc	fixed issues	3 years ago
Mohammad Aljammal	d9fabbab17	Fix feedback	3 years ago
Fatimah Alshammari	74d0826342	fixed issues	3 years ago
hussam al-habibeh	0a3c44b5e8	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medication_availability ... Conflicts: lib/config/localized_values.dart lib/uitl/translations_delegate_base.dart	3 years ago
Sikander Saleem	4db432b351	lab results working(cont.) & improvements	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
hussam al-habibeh	d3868844de	Medication availability	3 years ago
Zohaib Iqbal Kambrani	bf303a7be0	RRT Implementation	3 years ago
Zohaib Iqbal Kambrani	e4256d6874	RRT in progress (Service implementations)	3 years ago
Sultan Khan	d88e3faa6b	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	3 years ago
Sultan khan	ba32a37a17	Merge branch 'ZohaibIqbalKambrani' into 'development' ... RRT in progress See merge request Cloud_Solution/diplomatic-quarter!339	3 years ago
Zohaib Iqbal Kambrani	4da163d186	RRT in progress in stage	3 years ago
Sultan Khan	ed20ba65b3	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	3 years ago
Sultan Khan	23ca95b9b6	bug fixes	3 years ago
Haroon Amjad	47e521fe1d	Merge branch 'development' into Haroon ... # Conflicts: # lib/config/config.dart # lib/config/localized_values.dart # lib/pages/feedback/send_feedback_page.dart # lib/pages/landing/home_page.dart # lib/uitl/translations_delegate_base.dart # lib/widgets/in_app_browser/InAppBrowser.dart	3 years ago
Sultan Khan	6442ce178d	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	3 years ago
Sultan khan	a67e320a8e	Merge branch 'ZohaibIqbalKambrani' into 'development' ... Zohaib iqbal kambrani See merge request Cloud_Solution/diplomatic-quarter!333	3 years ago
Sultan Khan	8766a69928	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	3 years ago
hussam al-habibeh	6dc0d89f61	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs ... Conflicts: lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart lib/uitl/utils.dart	3 years ago
hussam al-habibeh	981e78936e	jira bugs	3 years ago
Zohaib Iqbal Kambrani	4abdd9bde7	no message	3 years ago
Sultan Khan	446f86dbcf	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	3 years ago
Sultan Khan	c88bea4461	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	3 years ago
Sultan Khan	9acb5b087d	bug fixes	3 years ago
Elham Rababh	86414b46fd	PAP-304 : show CBC details	3 years ago
Elham Rababh	f830bfdb19	PAP-722 : fix send email	3 years ago
Sultan khan	f54b9a63aa	Merge branch 'sultan-patientapp' into 'development' ... Sultan patientapp See merge request Cloud_Solution/diplomatic-quarter!328	3 years ago
Sikander Saleem	eb9005510d	bug fixes and insurance approvals improvements.	3 years ago
Sultan Khan	14ef096c32	changes and fixes	3 years ago
haroon amjad	0d2a91c124	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon	3 years ago
Sultan khan	15f620d720	Merge branch 'Jul_fixes' into 'development' ... Jul fixes See merge request Cloud_Solution/diplomatic-quarter!322	3 years ago
hussam al-habibeh	fefde8f575	jira bugs	3 years ago
haroon amjad	7b6270c67f	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon	3 years ago
Sultan khan	924f9bedc0	Merge branch 'bug_fixing' into 'development' ... Bug fixing See merge request Cloud_Solution/diplomatic-quarter!319	3 years ago
Sultan khan	10f8ee5e81	Merge branch 'bug_fix_mirza' into 'development' ... Bug Fix: 873, 878 to 881 See merge request Cloud_Solution/diplomatic-quarter!320	3 years ago
Mirza.Shafique	58d5734f1a	Bug Fix: 873, 878 to 881	3 years ago
Sikander Saleem	38f134b6ff	Bug PAP-884 fixed, email was not updating.	3 years ago
hussam al-habibeh	446021eb90	adding doctor list to health calculator	3 years ago
hussam al-habibeh	854352d9ce	jira bugs	3 years ago
Sikander Saleem	b2e9060c3f	Bug PAP-877 fixed, blood tracker exception.	3 years ago
Elham Rababh	2e1c9780d7	PAP-610: prevent show send email button if user have no vaccine	3 years ago
Sikander Saleem	3128810fb0	improvements.	3 years ago
Sikander Saleem	b7fbee3252	improvements	3 years ago
Sikander Saleem	e41040b1b9	PAP-675 fixed, H2O Week chart vales from -1 to 1.	3 years ago
Mohammad Aljammal	1607aecb4a	Merge branch 'pharmacy-Fatima' into 'development' ... fixed an issue in recommended page See merge request Cloud_Solution/diplomatic-quarter!304	4 years ago
Sultan Khan	724e0098fb	bug fixes	4 years ago
Fatimah Alshammari	265d13b970	fixed an issue in recommended page	4 years ago
haroon amjad	6b675acc94	Merge branch 'development' into Haroon ... # Conflicts: # lib/pages/feedback/send_feedback_page.dart	4 years ago
Mohammad Aljammal	e04421079e	Merge branch 'fix_bugs_Mar' into 'development' ... Fix bugs mar See merge request Cloud_Solution/diplomatic-quarter!301	4 years ago
Elham Rababah	5dd2e9986e	PAP-559: fix hospital_service	4 years ago
Mohammad Aljammal	0a4f17dc88	Merge branch 'pharmacy-Fatima' into 'development' ... Pharmacy fatima See merge request Cloud_Solution/diplomatic-quarter!298	4 years ago
Mohammad Aljammal	9a850d0ca3	fix advance payment	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
haroon amjad	f754e48034	Merge branch 'development' into Haroon ... # Conflicts: # lib/widgets/in_app_browser/InAppBrowser.dart	4 years ago
Sultan Khan	d4c3b03a5f	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Sultan Khan	1b770420be	bug fixes	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
haroon amjad	accc39d972	jira bug fixes	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
Zohaib Iqbal Kambrani	f410ce20ca	Packages and Offers in Progress	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	50a45528d1	Merge branch 'pharmacy-bug-fixes' into 'development' ... bug-fixes See merge request Cloud_Solution/diplomatic-quarter!276	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
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
Sultan Khan	1a35fe37b6	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	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
mosazaid	c64769e422	Merge branch 'development' into pharmacy-payment-feature	4 years ago
mosazaid	f3cdd08857	adding fharmacy payment feature	4 years ago
enadhilal	0cb493d56c	Merge branch 'development' into enad_pharmacy2 ... # Conflicts: # lib/pages/pharmacies/product_detail.dart	4 years ago
enadhilal	0c6fb67718	fixed issues	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
Fatimah Alshammari	ac32ba998c	fixed order isuee	4 years ago
Zohaib Iqbal Kambrani	516df96e21	no message	4 years ago
hussam al-habibeh	e050f87a64	pharmacy bugs	4 years ago
hussam al-habibeh	8c58dced7d	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs ... Conflicts: lib/core/service/pharmacy_categorise_service.dart lib/pages/final_products_page.dart	4 years ago
hussam al-habibeh	1b76d9c192	pharmacy bugs fixed	4 years ago
mosazaid	125dd27a00	Merge branch 'development' into fix-pharmacy	4 years ago
mosazaid	5d0a122689	fix bugs	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	d02b74142a	Merge branch 'development' into fix-pharmacy ... # Conflicts: # lib/core/service/client/base_app_client.dart	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
enadhilal	60648d368f	Merge branch 'development' into enad_pharmacy2	4 years ago
enadhilal	830e871e2c	Merge branch 'development' into enad_pharmacy2 ... # Conflicts: # lib/config/config.dart # lib/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart	4 years ago
Mohammad Aljammal	0632af3fb5	Fix the Authentication Pharmacy	4 years ago
Mohammad Aljammal	0098345d05	add Prescription Delivery Address Page amd fix the Authentication Pharmacy	4 years ago
mosazaid	b70c7d7d05	fix pharmacy auth	4 years ago
enadhilal	292e983614	fixing issues	4 years ago
Fatimah Alshammari	ef8312f2b8	Merge branch 'development' into pharmacy-Fatima ... # Conflicts: # lib/core/service/parmacyModule/parmacy_module_service.dart # lib/core/service/parmacyModule/prescription_service.dart # lib/pages/pharmacies/product_detail.dart	4 years ago
Fatimah Alshammari	ce64da11e4	homepage and product details design	4 years ago
mosazaid	cbe422cbc6	Merge branch 'hmg-services-fixing' into development ... # Conflicts: # lib/config/config.dart # lib/config/localized_values.dart # lib/core/service/client/base_app_client.dart # lib/uitl/translations_delegate_base.dart	4 years ago
mosazaid	0444b21101	Merge branch 'development' into hmg-services-fixing ... # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	4 years ago
Sultan Khan	d33918c932	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Mohammad Aljammal	e964afd4f2	Merge branch 'fix_security_issue' into 'development' ... fix security issues in pharmacy See merge request Cloud_Solution/diplomatic-quarter!261	4 years ago