Commit Graph

25 Commits (e48d4e5eb258ea1fba7b0aab74d66d15e836dfd0)

Author SHA1 Message Date
haroon amjad 5396138962 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
# Conflicts:
#	lib/pages/ToDoList/payment_method_select.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
5 years ago
haroon amjad 3bb0a8b85b Apple Pay finalized, Translation issues fixed, other updates 5 years ago
Mirza.Shafique a234618df8 Update, Insurance card and My Balance Design 5 years ago
haroon amjad 4469ae1209 updates & fixes 5 years ago
Mohammad Aljammal 9a850d0ca3 fix advance payment 5 years ago
Mohammad Aljammal 7c1fd8043b fix chart and eye and balance 5 years ago
Sultan Khan b891c1bd80 theme issue 5 years ago
haroon amjad da3ad90ddd added app-wide route transition animation 5 years ago
haroon amjad b6c617888b Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/localized_values.dart
5 years ago
Mohammad Aljammal 30ddea6419 hot fixing 5 years ago
Mohammad Aljammal 298b4d6525 change color 5 years ago
Mohammad Aljammal f77d2b497e fix issues 5 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
5 years ago
Mohammad Aljammal 591d56e624 change the info images and change the out patient color 5 years ago
Mohammad Aljammal 2059b76fc1 fix Medical profile 5 years ago
Mohammad Aljammal 9c18c69d90 hot fixes 5 years ago
haroon amjad dfa1952f4d Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app 5 years ago
haroon amjad f1a8e09a59 Added info images description 5 years ago
Zohaib Kambrani 27182ee8db no message 5 years ago
haroon amjad d284ceac04 advance payment & payment flow issues fixed 5 years ago
Mohammad Aljammal ddc7eca605 fix Insurance Cards 5 years ago
Amjad amireh 4009aed000 child Vaccines 6 years ago
haroon amjad a5fd9f53ab Payment flow implemented in advance payment 6 years ago
Mohammad Aljammal 4ac77593ad add payment service page and translations 6 years ago
Mohammad Aljammal a0300738e8 done My balance 6 years ago