Commit Graph

153 Commits (b78f8f76dbf34acfdb1a2a51d73d60b84ce84c57)

Author SHA1 Message Date
Sikander Saleem b78f8f76db improvement. 4 years ago
Sikander Saleem bdb7f29d4c Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/pages/BookAppointment/DentalComplaints.dart
#	lib/pages/login/login.dart
4 years ago
Mirza.Shafique 089ad0d321 Booking appointment 1.3 4 years ago
haroon amjad e9c26ee85f Dental procedures implemented 4 years ago
Sikander Saleem ca363adee2 merge & improvements 4 years ago
Mohammad Aljammal 8b3a0b3ada Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
4 years ago
Sikander Saleem 8367fc09f3 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/widgets/new_design/doctor_header.dart
4 years ago
Mirza.Shafique ad025f3d8e Booking appointment 1.2 4 years ago
Mirza.Shafique d2b2b4063d Booking appointment 1.1 5 years ago
Mirza.Shafique bd1cf9bcc7 Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/pages/BookAppointment/components/SearchByClinic.dart
#	lib/widgets/drawer/app_drawer_widget.dart
5 years ago
Mirza.Shafique 62631677ad Booking appointment 1.0 5 years ago
Sikander Saleem 4152eafa17 Merge branch 'development_new_design_2.0' into new_design_sikander 5 years ago
Sikander Saleem 94ff5cff40 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Sikander Saleem 970887b0c5 changes 5 years ago
Elham Rababh 9777b3f2ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages 5 years ago
Elham Rababh ceeda154d5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
 Conflicts:
	lib/pages/landing/landing_page.dart
5 years ago
haroon amjad 5f521556dc Dental flow fixes 5 years ago
Sikander Saleem bb18645d85 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/medical/medical_profile_page.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Sultan Khan 57d87dfc03 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 11ffed2ae3 bug fixes 5 years ago
Elham Rababh 13737548bb Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages 5 years ago
Elham Rababh ab2fc6aa2c fix issues related to footer 5 years ago
Sikander Saleem 350ff20a1a my doctor screen. 5 years ago
haroon amjad 0121337d1b LiveCare Flow from book appointment flow implemented 5 years ago
Elham Rababh f85c359cf4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
 Conflicts:
	lib/pages/landing/landing_page.dart
5 years ago
haroon amjad eadba3f767 Working on livecare appointment booking page 5 years ago
Elham Rababh 8626b4f269 first step from add footer for all pages 5 years ago
haroon amjad 5c8e9f4e19 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!352
5 years ago
Zohaib Iqbal Kambrani f442cc251c Pre Post Images Dental Doctor Profile 5 years ago
haroon amjad a32501f3dc My invoices implementation continued 5 years ago
haroon amjad 90db04cee1 Jira Fixes 5 years ago
haroon amjad 5007064105 Jira fixes 5 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
5 years ago
Mirza.Shafique b31813770e Check-In NFC done 5 years ago
haroon amjad 6b675acc94 Merge branch 'development' into Haroon
# Conflicts:
#	lib/pages/feedback/send_feedback_page.dart
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 deb0b40cfe fixes 5 years ago
Mohammad Aljammal 29f4e6acb6 Merge branch 'hmg-services-fixing' into 'development'
Hmg services fixing

See merge request Cloud_Solution/diplomatic-quarter!262
5 years ago
haroon amjad 9ecf745747 fixes 5 years ago
haroon amjad b6c617888b Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/localized_values.dart
5 years ago
mosazaid 0444b21101 Merge branch 'development' into hmg-services-fixing
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
mosazaid 822defbd04 working on bmi calculator design and functionality 5 years ago
haroon amjad 7c538b350f LiveCare Scheduling finalized, Appointments in ToDo list categorized 5 years ago
haroon amjad dde10cd27b working in LiveCare Scheduling 5 years ago
Mohammad Aljammal 298b4d6525 change color 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
Haroon Amjad b0ea1fc262 updates & fixes 5 years ago
haroon amjad 8c9762c24f Fixes 5 years ago
Mohammad Aljammal 7167d58ce2 fix merge issues 5 years ago