244 Commits (4823919fcb701a4adc3894db34bc5eec32b700c3)

Author	SHA1	Message	Date
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
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
Sultan Khan	9e31a3c560	bug fixes	3 years ago
Sultan Khan	11ffed2ae3	bug fixes	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
haroon amjad	eadba3f767	Working on livecare appointment booking page	3 years ago
haroon amjad	5c8e9f4e19	Merge branch 'Haroon' into 'development' ... Haroon See merge request Cloud_Solution/diplomatic-quarter!352	3 years ago
haroon amjad	2242b78116	Merge branch 'development' into Haroon ... # Conflicts: # lib/config/config.dart	3 years ago
haroon amjad	e28fdaade1	Dental Invoices implementation completed	3 years ago
Zohaib Iqbal Kambrani	c215b22cf7	Merge branch 'development' into ZohaibIqbalKambrani ... * development: fixes registration	3 years ago
Zohaib Iqbal Kambrani	f442cc251c	Pre Post Images Dental Doctor Profile	3 years ago
Sultan khan	ce867b85f2	Merge branch 'ZohaibIqbalKambrani' into 'development' ... Zohaib iqbal kambrani See merge request Cloud_Solution/diplomatic-quarter!347	3 years ago
haroon amjad	a32501f3dc	My invoices implementation continued	3 years ago
Sikander Saleem	56c0adaada	Merge branch 'development' into development_new_design_2.0 ... # Conflicts: # lib/config/localized_values.dart	3 years ago
Sultan Khan	b1453b52e3	registration	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
Zohaib Iqbal Kambrani	bf303a7be0	RRT Implementation	3 years ago
Sultan Khan	97d7f9225e	package name changed	3 years ago
haroon amjad	5007064105	Jira fixes	3 years ago
Sikander Saleem	f6ae7ed770	merge changes-4	3 years ago
Sikander Saleem	889ae24f07	merge changes-3	3 years ago
Mirza.Shafique	49bfa2e9a7	Home page 1.3	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
hussam al-habibeh	981e78936e	jira bugs	3 years ago
Haroon Amjad	213d104d57	Covid test procedure selection implemented	3 years ago
Sultan khan	487d63ec7f	Merge branch 'bug_fix_mirza' into 'development' ... Check-In NFC See merge request Cloud_Solution/diplomatic-quarter!326	3 years ago
Sikander Saleem	eb9005510d	bug fixes and insurance approvals improvements.	3 years ago
Mirza.Shafique	b31813770e	Check-In NFC done	3 years ago
haroon amjad	7b6270c67f	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon	3 years ago
haroon amjad	bcb4f48785	build fix	3 years ago
Sultan Khan	33465b04e5	permission	3 years ago
Sultan Khan	d5d48703f9	camera permission fixed	3 years ago
Sultan Khan	85e803651c	permission issue fixed	3 years ago
Sultan Khan	bcabd81f88	BUG FIXES	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
Fatimah Alshammari	265d13b970	fixed an issue in recommended page	4 years ago
Sultan Khan	3d6858d0ec	bug fixes	4 years ago
haroon amjad	f754e48034	Merge branch 'development' into Haroon ... # Conflicts: # lib/widgets/in_app_browser/InAppBrowser.dart	4 years ago
Sultan Khan	1b770420be	bug fixes	4 years ago
haroon amjad	accc39d972	jira bug fixes	4 years ago
haroon amjad	e0ebb922ed	pharmacy 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
Fatimah Alshammari	c629fcb85c	fixed recommended products new design	4 years ago
mosazaid	f3cdd08857	adding fharmacy payment feature	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
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
haroon amjad	b6c617888b	Merge branch 'development' into Haroon ... # Conflicts: # lib/config/localized_values.dart	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
Mohammad Aljammal	d477481856	fix security issues in pharmacy	4 years ago
haroon amjad	0b83089b86	Merge branch 'development' into Haroon	4 years ago
haroon amjad	146019432a	LiveCare schedule implemented	4 years ago
Sikander Saleem	8f37fbf260	Qr icon added, notify me api added & improvements	4 years ago
haroon amjad	6945230965	Merge branch 'development' into Haroon ... # Conflicts: # lib/config/config.dart # lib/config/localized_values.dart # lib/pages/Covid-DriveThru/covid-drivethru-location.dart # lib/pages/landing/home_page.dart # lib/pages/medical/smart_watch_health_data/health_data_list.dart # lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart # lib/uitl/translations_delegate_base.dart # pubspec.yaml	4 years ago
Fatimah Alshammari	0f22a50a5d	Merge branch 'development' into pharmacy-Fatima ... # Conflicts: # lib/pages/pharmacy/profile/profile.dart	4 years ago
Fatimah Alshammari	ba4003cb56	Merge branch 'pharmacy' into pharmacy-Fatima ... # Conflicts: # lib/locator.dart # lib/pages/pharmacies/screens/pharmacy_module_page.dart # lib/pages/pharmacy/profile/profile.dart	4 years ago
Fatimah Alshammari	52fa0f6f89	fixed orders	4 years ago
Mohammad Aljammal	3fb522e15f	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge ... Conflicts: lib/config/config.dart lib/config/localized_values.dart lib/config/shared_pref_kay.dart lib/core/model/pharmacies/LakumInquiryInformationObjVersion.dart lib/core/model/pharmacies/order_model.dart lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart lib/core/viewModels/pharmacyModule/order_model_view_model.dart lib/locator.dart lib/main.dart lib/pages/landing/landing_page_pharmcy.dart lib/pages/parent_categorise_page.dart lib/pages/pharmacies/screens/cart-order-page.dart lib/pages/pharmacies/screens/cart-order-preview.dart lib/pages/pharmacies/screens/pharmacy_module_page.dart lib/pages/pharmacies/wishlist.dart lib/pages/pharmacy/order/Order.dart lib/pages/pharmacy/order/OrderDetails.dart lib/pages/pharmacy/order/ProductReview.dart lib/pages/pharmacy/pharmacyAddresses/AddAddress.dart lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart lib/pages/pharmacy/profile/profile.dart lib/services/pharmacy_services/orderDetails_service.dart lib/services/pharmacy_services/order_service.dart lib/services/pharmacy_services/pharmacyAddress_service.dart lib/services/pharmacy_services/wishList_service.dart lib/uitl/translations_delegate_base.dart lib/widgets/buttons/borderedButton.dart lib/widgets/others/app_scaffold_widget.dart lib/widgets/pharmacy/product_tile.dart	4 years ago
Mohammad Aljammal	16d1f667d4	Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_merge ... Conflicts: android/app/build.gradle lib/config/config.dart lib/pages/pharmacy/profile/profile.dart lib/widgets/pharmacy/product_tile.dart	4 years ago
mosazaid	38d58ebaaf	Merge branch 'pharmacy' into pharmacy_mosa_branch ... # Conflicts: # lib/config/config.dart # lib/config/localized_values.dart # lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart # lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart # lib/services/pharmacy_services/pharmacyAddress_service.dart # lib/uitl/translations_delegate_base.dart	4 years ago
Mohammad Aljammal	18dad434a0	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_master ... Conflicts: lib/config/config.dart lib/core/service/client/base_app_client.dart lib/core/service/weather_service.dart lib/core/viewModels/dashboard_view_model.dart lib/main.dart lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart lib/pages/AlHabibMedicalService/health-weather/health-weather-indicator.dart lib/pages/BookAppointment/Search.dart lib/pages/ErService/AmbulanceReq.dart lib/pages/MyAppointments/widgets/AppointmentCardView.dart lib/pages/ToDoList/ToDo.dart lib/pages/landing/home_page.dart lib/pages/landing/landing_page.dart lib/pages/login/login.dart lib/pages/login/register.dart lib/pages/medical/allergies_page.dart lib/pages/medical/balance/advance_payment_page.dart lib/pages/medical/doctor/doctor_home_page.dart lib/pages/medical/medical_profile_page.dart lib/pages/medical/prescriptions/prescriptions_home_page.dart lib/pages/medical/vital_sign/vital_sign_details_screen.dart lib/uitl/location_util.dart lib/widgets/drawer/app_drawer_widget.dart pubspec.yaml	4 years ago
enadhilal	10734d5994	connecting pages. ... trnaslate. calling API. review page. product details page. Wishlist page. Brands page.	4 years ago
Fatimah Alshammari	c0920e7099	Merge branch 'pharmacy' into pharmacy-Fatima ... # Conflicts: # lib/widgets/pharmacy/product_tile.dart	4 years ago
Sultan Khan	a0baaac314	bug fixes	4 years ago
Mohammad Aljammal	7167d58ce2	fix merge issues	4 years ago
Mohammad Aljammal	aa89a05f1d	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter ... Conflicts: ios/Flutter/.last_build_id lib/config/config.dart lib/config/localized_values.dart lib/config/shared_pref_kay.dart lib/core/service/client/base_app_client.dart lib/core/service/medical/prescriptions_service.dart lib/core/viewModels/project_view_model.dart lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart lib/pages/BookAppointment/BookConfirm.dart lib/pages/BookAppointment/DoctorProfile.dart lib/pages/DrawerPages/family/my-family.dart lib/pages/MyAppointments/MyAppointments.dart lib/pages/MyAppointments/models/ArrivedButtons.dart lib/pages/MyAppointments/widgets/AppointmentActions.dart lib/pages/MyAppointments/widgets/AppointmentCardView.dart lib/pages/ToDoList/ToDo.dart lib/pages/feedback/send_feedback_page.dart lib/pages/insurance/insurance_approval_screen.dart lib/pages/insurance/insurance_card_screen.dart lib/pages/landing/home_page.dart lib/pages/landing/landing_page.dart lib/pages/login/confirm-login.dart lib/pages/login/login.dart lib/pages/medical/balance/my_balance_page.dart lib/pages/medical/labs/laboratory_result_page.dart lib/pages/medical/labs/labs_home_page.dart lib/pages/medical/medical_profile_page.dart lib/pages/medical/patient_sick_leave_page.dart lib/pages/medical/prescriptions/prescription_details_page.dart lib/pages/medical/prescriptions/prescription_items_page.dart lib/pages/medical/radiology/radiology_details_page.dart lib/pages/medical/radiology/radiology_home_page.dart lib/pages/medical/reports/report_home_page.dart lib/pages/medical/reports/reports_page.dart lib/pages/pharmacies/pharmacies_list_screen.dart lib/pages/settings/profile_setting.dart lib/services/authentication/auth_provider.dart lib/uitl/translations_delegate_base.dart lib/widgets/buttons/floatingActionButton.dart lib/widgets/data_display/medical/LabResult/LabResultWidget.dart lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart lib/widgets/data_display/medical/doctor_card.dart lib/widgets/drawer/app_drawer_widget.dart lib/widgets/others/app_scaffold_widget.dart	4 years ago
mosazaid	359eba2da0	make some updates in firebase version and update gradle, finish review order	4 years ago
Sultan Khan	eec67ac930	big fixes	4 years ago
Sultan Khan	8a554aa2f8	auth services fixed	4 years ago
Fatimah Alshammari	4a84483698	fixed order details	4 years ago
Sultan Khan	b759758a68	bug fixes	4 years ago
haroon amjad	9d046fd971	updates & fixes	4 years ago
mosazaid	6ac8d67b83	finish address add/edit/delete/select	4 years ago
Sultan Khan	21ccf1ef86	bug fixes	4 years ago
haroon amjad	e495d3e5ad	Health Data integration implementing	4 years ago
enadhilal	9c55571072	Merge branch 'pharmacy' into enad_pharmacy2	4 years ago
enadhilal	c22ca4e29e	Merge branch 'pharmacy' into enad_pharmacy2 ... # Conflicts: # lib/config/config.dart # lib/core/service/client/base_app_client.dart # lib/locator.dart # lib/pages/base/base_view.dart # lib/pages/landing/home_page.dart # lib/widgets/others/app_scaffold_widget.dart # lib/widgets/pharmacy/product_tile.dart	4 years ago
enadhilal	888a74fb9b	add these pages ... ​Product Tile Component Product Detail Page ​Wishlist Page ​Reviews Page Brands Page + Search	4 years ago
Fatimah Alshammari	706980248a	Merge branch 'pharmacy' into pharmacy-Fatima ... # Conflicts: # lib/config/config.dart # lib/pages/landing/home_page.dart	4 years ago
Fatimah Alshammari	9b8103bfd6	fixe order and order details	4 years ago
Sultan Khan	f5b7d35f23	bug fixes	4 years ago
haroon amjad	7edb0c8009	Doctor rating dialog revamped	4 years ago
umasoodch	0431eb1ac8	Merge branch 'master' into pharmacy ... # Conflicts: # lib/config/config.dart # lib/locator.dart # lib/pages/base/base_view.dart # lib/pages/landing/home_page.dart # lib/widgets/others/app_scaffold_widget.dart # pubspec.yaml	4 years ago
Zohaib Kambrani	27182ee8db	no message	4 years ago
Sultan Khan	603833db37	login changes	4 years ago
Fatimah Alshammari	d328c74fc4	fix order and orderdetails	4 years ago
Sultan Khan	b61e734f80	feedback permission	4 years ago
Sultan Khan	6bbdf05f90	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	857fc813cd	button feedback	4 years ago
Sultan Khan	571bda9100	permission	4 years ago
haroon amjad	d284ceac04	advance payment & payment flow issues fixed	4 years ago
Sultan Khan	8d499704dc	family file changes	4 years ago
Sultan Khan	2f454055b9	login fixed	4 years ago
Sultan Khan	6e152951b4	notification count	4 years ago
Sultan Khan	d2f391ab7f	setting page inprogress	4 years ago
Sultan Khan	4c8c4e3725	setting page inprogress	4 years ago
Sultan Khan	91be66ecdd	family file changes	4 years ago