Commit Graph

54 Commits (39ba2cfde72a51ec2b8a10b45ba8a20f41c702a9)

Author SHA1 Message Date
Sultan khan 54e1d51f18 Merge branch 'ZohaibIqbalKambrani' into 'development'
RRT in progress

See merge request Cloud_Solution/diplomatic-quarter!337
4 years ago
Zohaib Iqbal Kambrani 5f1d753895 no message 4 years ago
Haroon Amjad 47e521fe1d Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/pages/feedback/send_feedback_page.dart
#	lib/pages/landing/home_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
4 years ago
Zohaib Iqbal Kambrani 4abdd9bde7 no message 4 years ago
haroon amjad 7b6270c67f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 4 years ago
Elham Rababah 36d422c7aa PAP-563: fix pickup location from hospital 5 years ago
Elham Rababah aa1c92c142 PAP-562: fix status 5 years ago
haroon amjad 6b675acc94 Merge branch 'development' into Haroon
# Conflicts:
#	lib/pages/feedback/send_feedback_page.dart
5 years ago
Elham Rababah 66a9239698 PAP-558: Remove the choose Drop-off 5 years ago
haroon amjad a6a9a92c6f JIRA bug fixes 5 years ago
haroon amjad f754e48034 Merge branch 'development' into Haroon
# Conflicts:
#	lib/widgets/in_app_browser/InAppBrowser.dart
5 years ago
haroon amjad 49c454b132 fixes 5 years ago
Elham Rababah 86dda2b6d6 PAP-560: fix design 5 years ago
Elham Rababah a1ecfbf16a PAP-560: fix design 5 years ago
Elham Rababah efb6ea68b8 PAP-561: fix design 5 years ago
Elham Rababah 2e035e2c6b PAP-576: fix design 5 years ago
haroon amjad 33e1bf8103 Jira fixes 5 years ago
Mohammad Aljammal ec401d4848 Done Ed online 5 years ago
haroon amjad da3ad90ddd added app-wide route transition animation 5 years ago
Mohammad Aljammal 4457b5f109 add translation to ER service 5 years ago
Mohammad Aljammal 200334d8f8 Fix ER service 5 years ago
mosazaid 5bcc67b77d Nearest Er fix design 5 years ago
mosazaid 01bfe84644 solving NearestEr design problem 5 years ago
Mohammad Aljammal 634c874eee fix design 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 269f682bd5 Added info images description 5 years ago
Mohammad Aljmma d0ed776ff6 new home health service 5 years ago
jammal 9328f942ba done ER service 5 years ago
jammal bd2254491c done ER service 5 years ago
Mohammad Aljammal e025321c71 fix issues 5 years ago
Mohammad Aljammal 06416b4934 add Not authenticated Page 5 years ago
Mohammad Aljammal 1ce55e687f Ambulance Service second step 5 years ago
Mohammad Aljammal 3d6eafe473 Ambulance Service first step 5 years ago
Mohammad Aljammal c7d396875e Ambulance Service steps 5 years ago
Mohammad Aljammal f543126152 Ambulance Service 5 years ago
Amjad amireh 368db03ab8 edit card_position.dart 5 years ago
Amjad amireh a41dd736c4 edit card_position.dart 5 years ago
Amjad amireh d1a01f5afa edit card_position.dart 5 years ago
Amjad amireh 525080c09e edit card_position.dart 5 years ago
Amjad amireh 62d96a3f1c edit card_position.dart 5 years ago
Amjad amireh e638464657 edit card_position.dart 5 years ago
Mohammad Aljammal ddf53ce999 ER 5 years ago
Mohammad Aljammal 50d1e50df4 ER 5 years ago
Mohammad Aljammal ed1c04ab25 ER 5 years ago
Mohammad Aljammal 629251d216 ER 5 years ago
Mohammad Aljammal 5485cbab36 ER 5 years ago
Mohammad Aljammal 2ef36d3d8a ER 5 years ago
Mohammad Aljammal f534f8a348 ER 5 years ago
Mohammad Aljammal 20f9f6f06c ER 5 years ago