244 Commits (aafdf3760d1ae47173870a3f6c5f121cd9437cff)

Author	SHA1	Message	Date
haroon amjad	a819660536	Merge branch 'development_new_design_2.0' into haroon-new-design ... # Conflicts: # lib/config/localized_values.dart	3 years ago
haroon amjad	01ccd484f4	Calendar plugin changed	3 years ago
Sikander Saleem	08960867f7	Merge branch 'new_design_sikander' into development_new_design_2.0	3 years ago
Sikander Saleem	55df00dcd4	h20 today ui (cont.)	3 years ago
haroon amjad	a7ccc73c36	updates	3 years ago
Mirza.Shafique	205b4d6b21	Photo view in CMC	3 years ago
haroon amjad	728c22cc68	Merge branch 'development_new_design_2.0' into haroon-new-design ... # Conflicts: # lib/config/localized_values.dart # lib/pages/insurance/insurance_approval_screen.dart # lib/uitl/translations_delegate_base.dart	3 years ago
haroon amjad	bbcf22ddfa	Merge branch 'development_new_design_2.0' into haroon-new-design ... # Conflicts: # lib/pages/landing/fragments/home_page_fragment2.dart	3 years ago
Mirza.Shafique	ef2bcc1c65	Web RTC Design implementation	3 years ago
haroon amjad	d9d4720ded	pubspec updated	3 years ago
haroon amjad	0a90791aca	Push notification fixes	3 years ago
Zohaib Iqbal Kambrani	3f178e3e3f	Google_Huawei Map -> AppMap	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
Mirza.Shafique	d865e97ce1	Vital Sings Home Page	3 years ago
hussam al-habibeh	4b90f16ab9	baby age in ovulation period	3 years ago
Mirza.Shafique	32e867421f	Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 ... # Conflicts: # lib/uitl/date_uitl.dart # lib/uitl/translations_delegate_base.dart	3 years ago
Mirza.Shafique	bbaeec5b85	Medical Profile Complete	3 years ago
Sikander Saleem	889ae24f07	merge changes-3	3 years ago
Sikander Saleem	53e4815866	no auth ui modifications	3 years ago
Zohaib Iqbal Kambrani	4da163d186	RRT in progress in stage	3 years ago
Zohaib Iqbal Kambrani	08e0ce52c8	Merge branch 'development' into ZohaibIqbalKambrani ... * development: fix bugs	3 years ago
mosazaid	2e33c2b240	fix bugs	3 years ago
Mirza.Shafique	d37f225c1b	Home page 1.2	3 years ago
Mirza.Shafique	090556f4d1	Merge branch 'mirza_home_page' into development_new_design_2.0	3 years ago
Mirza.Shafique	5dc88f51c3	Home Page 1.0	3 years ago
Sikander Saleem	1ec48b9598	Poppins font added.	3 years ago
Zohaib Iqbal Kambrani	dbf525c484	no message	3 years ago
Mirza.Shafique	b31813770e	Check-In NFC done	3 years ago
Mirza.Shafique	107d50826c	nfc package test	3 years ago
haroon amjad	bcb4f48785	build fix	3 years ago
Sultan Khan	33465b04e5	permission	3 years ago
Zohaib Iqbal Kambrani	c7c96f913f	no message	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
Zohaib Iqbal Kambrani	f410ce20ca	Packages and Offers in Progress	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	e61c26b853	Auto SMS, Themes, Voice Command	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	516df96e21	no message	4 years ago
Sultan Khan	3e947dda37	Merge branch 'sultan-patientapp' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Sultan Khan	e20eed2f6e	voice command changes merged	4 years ago
Sultan Khan	b3e6c4efda	voice command changes	4 years ago
Mohammad Aljammal	0098345d05	add Prescription Delivery Address Page amd fix the Authentication Pharmacy	4 years ago
Mohammad Aljammal	29f4e6acb6	Merge branch 'hmg-services-fixing' into 'development' ... Hmg services fixing See merge request Cloud_Solution/diplomatic-quarter!262	4 years ago
haroon amjad	b6c617888b	Merge branch 'development' into Haroon ... # Conflicts: # lib/config/localized_values.dart	4 years ago
Fatimah Alshammari	ce64da11e4	homepage and product details design	4 years ago
mosazaid	822defbd04	working on bmi calculator design and functionality	4 years ago
Mohammad Aljammal	9ed8f2365d	fix barcode issues	4 years ago
Sultan Khan	ccd2fc5068	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Sultan Khan	c65983bfdb	code merged	4 years ago
Zohaib Iqbal Kambrani	bbd953ae43	Order Delivery Driver tracking [inprogress]	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	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
Haroon Amjad	b0ea1fc262	updates & 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
Mohammad Aljammal	4e823c2be4	fix chart and duplicated data in Patient Lab Result	4 years ago
Zohaib Kambrani	8457972fda	no message	4 years ago
Zohaib Kambrani	8d5d55a150	Geofencing in progress	4 years ago
Sultan Khan	542335364e	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Sultan Khan	c050c3f189	voice command updated	4 years ago
Mohammad Aljammal	459ba828d9	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter ... Conflicts: lib/config/shared_pref_kay.dart lib/core/service/client/base_app_client.dart lib/locator.dart lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart lib/pages/landing/home_page.dart lib/pages/medical/vital_sign/vital_sign_item.dart lib/routes.dart lib/uitl/translations_delegate_base.dart lib/widgets/others/app_scaffold_widget.dart pubspec.yaml	4 years ago
Mohammad Aljammal	77dcb918c3	Revert "Merge branch 'pharmacy-hussam' into 'master'" ... This reverts merge request !149	4 years ago
Sultan Khan	af1c59394c	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Sultan Khan	496163a61a	voice command updated	4 years ago
haroon amjad	dfa1952f4d	Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app	4 years ago
hussam al-habibeh	a1906a4072	Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam ... Conflicts: lib/config/config.dart lib/config/localized_values.dart lib/locator.dart lib/pages/landing/home_page.dart lib/uitl/translations_delegate_base.dart lib/widgets/others/app_scaffold_widget.dart pubspec.yaml	4 years ago
umasoodch	1f9d592268	removed access key code in pubspec	4 years ago
umasoodch	b5413d1749	Merge branch 'master' into pharmacy ... # Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dart	4 years ago
Sultan Khan	f5b7d35f23	bug fixes	4 years ago
Sultan Khan	4669252d1f	flutter tts	4 years ago
Sultan Khan	8d7cc20b70	localized value updated	4 years ago
Sultan Khan	321d31b3bd	voice search page updated	4 years ago
Sultan Khan	d69b3676a4	weather indicator in progress	4 years ago
hussam al-habibeh	64cbae3602	Search	4 years ago
Sultan Khan	3ab513d9d0	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Sultan Khan	98f84c2161	voice search in progress	4 years ago
Elham Rababah	d9ffc5d3da	remove duplicated package	4 years ago
Elham Rababah	713e44cf8b	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc ... Conflicts: lib/config/localized_values.dart lib/uitl/translations_delegate_base.dart	4 years ago
Zohaib Kambrani	1155466d19	Packages and Offer Slider at home	4 years ago
mosazaid	98f660e29b	Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page ... Conflicts: lib/config/config.dart lib/config/localized_values.dart lib/core/service/client/base_app_client.dart lib/locator.dart lib/uitl/translations_delegate_base.dart lib/widgets/others/app_scaffold_widget.dart	4 years ago
mosazaid	4e5d6a9a00	finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished	4 years ago
Elham Rababah	5bf63174c9	First step from translations	4 years ago
haroon amjad	82e23efd32	working on ereferral	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	15918e2d62	no message	4 years ago
Zohaib Kambrani	27182ee8db	no message	4 years ago
haroon amjad	a03d5c6d57	App initial release to stores	4 years ago
Mohammad Aljammal	a556e8c1f8	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter ... Conflicts: lib/config/config.dart lib/pages/landing/home_page.dart lib/pages/landing/landing_page.dart	4 years ago
Sultan Khan	571bda9100	permission	4 years ago
Mohammad Aljammal	0d098def04	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_master ... Conflicts: assets/app_icons/config.json assets/app_icons/fonts/DQIcons.ttf lib/config/config.dart lib/config/shared_pref_kay.dart lib/d_q_icons_icons.dart lib/locator.dart lib/pages/landing/home_page.dart lib/pages/landing/landing_page.dart lib/pages/rateAppointment/rate_appointment_doctor.dart lib/uitl/utils.dart lib/widgets/others/app_scaffold_widget.dart	4 years ago
Sultan Khan	2f454055b9	login fixed	4 years ago
Sultan Khan	d2f391ab7f	setting page inprogress	4 years ago
Zohaib Kambrani	69d1e4bb0b	no message	4 years ago
Sultan Khan	3589b21590	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan	4 years ago
haroon amjad	b89c1f03b3	language translation fixes	4 years ago
Sultan Khan	431306f0e1	insurance details	4 years ago
Sultan Khan	bedafa24cd	insurance details	4 years ago