Commit Graph

14 Commits (2ec9331d2f27e829f5c84e90a2ba2fef2b03f7bb)

Author SHA1 Message Date
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
5 years ago
Sultan Khan a0baaac314 bug fixes 5 years ago
Sultan Khan 040c8f38ab hot fixes 5 years ago
Sultan Khan f5b7d35f23 bug fixes 5 years ago
Zohaib Kambrani 27182ee8db no message 5 years ago
Sultan Khan 3fef1b9d52 theme and login issues fixed 5 years ago
Mohammad Aljmma f79d8eb8f9 fix login issues 5 years ago
Sultan Khan 227731f8f8 Merge 5 years ago
Sultan Khan 327c4585a6 family file change 5 years ago
Sultan Khan 0bc529f420 login changes 6 years ago
Sultan Khan 8d0834ff3e login inprogress 6 years ago
Sultan Khan 41b438fd74 login page changes 6 years ago
Sultan Khan 3a15c16883 login changes 6 years ago
Sultan Khan b0989d6ca0 login pages changes 6 years ago