47 Commits (24b7a8a4c47ee2e2aabb9cc2ba8307b1be87a5f9)

Author	SHA1	Message	Date
Sikander Saleem	083d696c62	Merge branch 'development' into development_new_design_2.0 ... # Conflicts: # lib/config/localized_values.dart # lib/pages/landing/landing_page.dart # lib/pages/login/login.dart # lib/uitl/translations_delegate_base.dart	3 years ago
Sultan Khan	e5fb16ad69	langauge issue	3 years ago
Sikander Saleem	f6ae7ed770	merge changes-4	3 years ago
Sikander Saleem	889ae24f07	merge changes-3	3 years ago
Sikander Saleem	473315f8a1	improvements	3 years ago
Sikander Saleem	53e4815866	no auth ui modifications	3 years ago
Sultan Khan	85e803651c	permission issue fixed	3 years ago
Sultan Khan	8c9c309abb	bug fixes	4 years ago
Sultan Khan	1b770420be	bug fixes	4 years ago
Sultan Khan	80d96ba785	Privilege issue fixed	4 years ago
Sultan Khan	1a35fe37b6	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
haroon amjad	da3ad90ddd	added app-wide route transition animation	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	d477481856	fix security issues in pharmacy	4 years ago
Sultan Khan	68f7a9ff9c	login chnages	4 years ago
Sultan Khan	c65983bfdb	code merged	4 years ago
Mohammad Aljammal	298b4d6525	change color	4 years ago
Mohammad Aljammal	952e106531	return privilege	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
Sultan Khan	c01246acf0	hot fix	4 years ago
Mohammad Aljammal	591d56e624	change the info images and change the out patient color	4 years ago
Sultan Khan	73c8e00852	bug fixes	4 years ago
Sultan Khan	d53031b0e6	blood type update for family files	4 years ago
Mohammad Aljammal	9c12e949e8	hot fixes	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
Sultan Khan	b759758a68	bug fixes	4 years ago
Mohammad Aljammal	de1e352e98	fix charts and vital sign	4 years ago
Sultan Khan	1f0d01b6cc	language issue fixed	4 years ago
Sultan Khan	2c50402aa8	language issue fixed	4 years ago
Sultan Khan	ce7a64e86e	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Mohammad Aljammal	a1e92e1fdd	fix merge issue	4 years ago
Mohammad Aljammal	9dfd8a71dc	Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into privileges ... Conflicts: lib/locator.dart lib/pages/DrawerPages/family/my-family.dart lib/pages/login/confirm-login.dart lib/pages/medical/medical_profile_page.dart lib/pages/medical/reports/report_home_page.dart lib/widgets/bottom_navigation/bottom_nav_bar.dart lib/widgets/drawer/app_drawer_widget.dart	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	a3e01ff938	flutter tts	4 years ago
Sultan Khan	8c5746f7b1	bug fixes	4 years ago
Sultan Khan	81c8239412	bug fixes	4 years ago
Mohammad Aljammal	dc898a799d	Add Privileges	4 years ago
Zohaib Kambrani	27182ee8db	no message	4 years ago
haroon amjad	92db2b2be9	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon	4 years ago
Sultan Khan	603833db37	login changes	4 years ago
Sultan Khan	8d499704dc	family file changes	4 years ago
Sultan Khan	00b0154987	my family	4 years ago
Sultan Khan	91be66ecdd	family file changes	4 years ago
Mohammad Aljmma	1111f26a9d	Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_family	4 years ago
Elham Rababah	41b919183f	Fix bug on read notifications_page.dart	4 years ago
Elham Rababah	5bd3c7d9ce	finish step from notifications_page and create notification_details_page	4 years ago
Elham Rababah	9f2beceb22	First step from notifications_page	4 years ago