Commit Graph

39 Commits (bebcd8555751f1c2552aaeb5bcd3e71718a6e640)

Author SHA1 Message Date
Mirza.Shafique a273bacc17 design fixes 1.1 3 years ago
Mirza.Shafique 0ba4e9047b design fixes 1.0 3 years ago
haroon amjad 5f963b0327 Translation updates, CMC, HHC & RRT APIs updates 3 years ago
Mirza.Shafique dde16a13fe General page in profile 3 years ago
Mirza.Shafique d664a216c6 Profile Page and Back Button Click 3 years ago
haroon amjad 7467da7409 Imports organized 3 years ago
Sikander Saleem 402cf5936a improvement. 3 years ago
Sikander Saleem 1a0e1f47a6 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/BookAppointment/components/DocAvailableAppointments.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Sultan Khan d1fc4751ad BUG FIXES 3 years ago
Sikander Saleem f6ae7ed770 merge changes-4 3 years ago
Sikander Saleem c07a8f54c7 merge changes-2 3 years ago
Sikander Saleem 907d90b987 login ui and forgot password ui added. 3 years ago
Sikander Saleem 3707b13986 login type ui & icons added. 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
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
Mohammad Aljammal ad88f6de04 fix theme issues 4 years ago
Sultan Khan e61c26b853 Auto SMS, Themes, Voice Command 4 years ago
Sultan Khan b3e6c4efda voice command changes 4 years ago
Sultan Khan c65983bfdb code merged 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 827768e96d language change 4 years ago
Mohammad Aljammal 9c12e949e8 hot fixes 4 years ago
Sultan Khan 040c8f38ab 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 e28209d4e8 bug fixes 4 years ago
Zohaib Kambrani 27182ee8db no message 4 years ago
Sultan Khan 571bda9100 permission 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 3fef1b9d52 theme and login issues fixed 4 years ago
Sultan Khan 58b1f648c1 setting theme 4 years ago
Sultan Khan 283473a06a theme changes 4 years ago
Sultan Khan aec2ab75d0 settings update 4 years ago
Sultan Khan aa8f9f18e1 forgot password 4 years ago
Sultan Khan 875bf10c73 settings page added 4 years ago