Commit Graph

74 Commits (fc67d0d14d20355d6e6aee41887aa6bb378ed8dc)

Author SHA1 Message Date
haroon amjad 9d30bf63d0 Notification page fix 3 years ago
haroon amjad 43c67a5a84 Notifications UI fix 3 years ago
haroon amjad f60684ad08 Notifications UI redesigned 3 years ago
Sultan khan f5b17444fe Merge branch 'sultan_new_design' into 'development_new_design_2.0'
my family

See merge request Cloud_Solution/diplomatic-quarter!441
3 years ago
Sultan Khan a39658206d my family 3 years ago
haroon amjad 40cbca565a fixes 3 years ago
Sultan Khan e3a7c08e7c blood type changes 3 years ago
Sultan Khan 3b4e03c618 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan b5cd6afa4b family file fixs 3 years ago
haroon amjad 3f3ddd7af0 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/MyAppointments/SchedulePage.dart
3 years ago
haroon amjad 022b1bd000 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
Sultan Khan 02f5b43b64 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan ca70926050 family file fixes 3 years ago
haroon amjad cb220031dd Updates & fixes 3 years ago
Mirza.Shafique d48a4ff4e3 Back Button on Landing Page 3 years ago
Haroon Amjad 1fa6a4409b Family files fixes 3 years ago
Sultan Khan 9010558dc9 family files changes 3 years ago
haroon amjad 829fcd1461 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart
3 years ago
Sultan Khan 2c1d7c511e family file changes 3 years ago
haroon amjad 01ca8b8f84 updates & fixes 3 years ago
Sultan Khan 76e16594ba FAMILY FILES 3 years ago
Haroon Amjad 062ca5c11c EReferral fixes 3 years ago
haroon amjad 2fc5425884 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
Sultan Khan a57facb876 family file fix 3 years ago
haroon amjad 298a8f4cff Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/AlHabibMedicalService/customer_addresses_service.dart
#	lib/pages/DrawerPages/family/my-family.dart
3 years ago
Sultan Khan dd58b8637b bug fixs 3 years ago
haroon amjad 7467da7409 Imports organized 3 years ago
Sikander Saleem 083d696c62 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/login.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Sultan Khan e5fb16ad69 langauge issue 3 years ago
Sikander Saleem f6ae7ed770 merge changes-4 3 years ago
Sikander Saleem 889ae24f07 merge changes-3 3 years ago
Sikander Saleem 473315f8a1 improvements 3 years ago
Sikander Saleem 53e4815866 no auth ui modifications 3 years ago
Sultan Khan 85e803651c permission issue fixed 3 years ago
Sultan Khan 8c9c309abb bug fixes 4 years ago
Sultan Khan 1b770420be bug fixes 4 years ago
Sultan Khan 80d96ba785 Privilege issue fixed 4 years ago
Sultan Khan 1a35fe37b6 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
haroon amjad da3ad90ddd added app-wide route transition animation 4 years ago
Sultan Khan d33918c932 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Mohammad Aljammal d477481856 fix security issues in pharmacy 4 years ago
Sultan Khan 68f7a9ff9c login chnages 4 years ago
Sultan Khan c65983bfdb code merged 4 years ago
Mohammad Aljammal 298b4d6525 change color 4 years ago
Mohammad Aljammal 952e106531 return privilege 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 c01246acf0 hot fix 4 years ago
Mohammad Aljammal 591d56e624 change the info images and change the out patient color 4 years ago
Sultan Khan 73c8e00852 bug fixes 4 years ago
Sultan Khan d53031b0e6 blood type update for family files 4 years ago