266 Commits (d33918c932fff01fd18a83fe441752125f665921)

Author	SHA1	Message	Date
Sultan Khan	d33918c932	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Sultan Khan	9fca52efca	voice command	4 years ago
Mohammad Aljammal	d477481856	fix security issues in pharmacy	4 years ago
Sikander Saleem	8f37fbf260	Qr icon added, notify me api added & improvements	4 years ago
Sultan Khan	3ac69692be	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Sultan Khan	0213264b7f	bug fixes	4 years ago
Mohammad Aljammal	3e441c55b2	fix bottom nav bar	4 years ago
Sultan Khan	ccd2fc5068	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	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
Zohaib Iqbal Kambrani	9a5daed5c3	Merge branch 'development' into ZohaibIqbalKambrani ... * development: re-design child vaccine and fix some funcrionalities Fix ER service first step from fix CMC fix issue on cmc return CMC HHC Nearest Er fix design solving NearestEr design problem simple fix hot fixing fix design issues # Conflicts: # lib/config/localized_values.dart	4 years ago
Sultan Khan	c65983bfdb	code merged	4 years ago
Sultan Khan	86cf9300e1	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp ... * 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter: (136 commits) Fix ER service first step from fix CMC fix issue on cmc return CMC HHC Nearest Er fix design solving NearestEr design problem simple fix hot fixing fix design issues some design enhancments fix design fix android fix merge issues fix merge issues commit fix merge issues change color return privilege return privilege fix issues ...	4 years ago
Elham Rababah	d7a046f9ca	fix issue on cmc	4 years ago
Zohaib Iqbal Kambrani	e2bce87e34	resolve merge conflicts.	4 years ago
Mohammad Aljammal	30ddea6419	hot fixing	4 years ago
Zohaib Iqbal Kambrani	dc83b476d6	Merge branch 'development' into ZohaibIqbalKambrani ... # Conflicts: # android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt # ios/Flutter/.last_build_id # lib/pages/landing/landing_page.dart # lib/pages/medical/medical_profile_page.dart # lib/widgets/drawer/app_drawer_widget.dart	4 years ago
Mohammad Aljammal	ed729689a9	Merge branch 'design_issues' into 'development' ... fix design issues See merge request Cloud_Solution/diplomatic-quarter!237	4 years ago
Mohammad Aljammal	634c874eee	fix design issues	4 years ago
mosazaid	2843b1393e	some design enhancments	4 years ago
Mohammad Aljammal	de1b7cc1d0	fix merge issues	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	952e106531	return privilege	4 years ago
Mohammad Aljammal	f77d2b497e	fix issues	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
Mohammad Aljammal	6bda03e935	hot fixing	4 years ago
Mohammad Aljammal	5e3f6363cf	fix issues	4 years ago
Sultan Khan	8becd4f920	login issue fixed	4 years ago
Sultan Khan	73c8e00852	bug fixes	4 years ago
Sultan Khan	18f492e52f	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
Sultan Khan	d53031b0e6	blood type update for family files	4 years ago
Mohammad Aljammal	2059b76fc1	fix Medical profile	4 years ago
Mohammad Aljammal	4d8f42b517	fix issues vital sign issue	4 years ago
Mohammad Aljammal	09a85d9127	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes	4 years ago
Mohammad Aljammal	9c12e949e8	hot fixes	4 years ago
Zohaib Kambrani	508bc191be	geofencing login check fix	4 years ago
Sultan Khan	a0baaac314	bug fixes	4 years ago
Zohaib Kambrani	d8bd7d145d	no message	4 years ago
Sultan Khan	040c8f38ab	hot fixes	4 years ago
Mohammad Aljammal	3c2af11084	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master ... Conflicts: lib/pages/landing/landing_page.dart	4 years ago
Zohaib Kambrani	d8996cf879	Geofence Android Finished	4 years ago
Mohammad Aljammal	d28870a629	fix merge issues	4 years ago
Mohammad Aljammal	6d7cb1b970	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master ... Conflicts: ios/Runner.xcodeproj/project.pbxproj lib/core/service/AuthenticatedUserObject.dart lib/pages/landing/landing_page.dart lib/pages/login/login.dart lib/widgets/drawer/app_drawer_widget.dart	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
Zohaib Kambrani	1dc9400ffc	Geofencing work in progress on android	4 years ago
Sultan Khan	e312671e24	hot fixes	4 years ago
Sultan Khan	cf642da661	landing page	4 years ago
Sultan Khan	eec67ac930	big fixes	4 years ago
Sultan Khan	99ee5b4545	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago