Commit Graph

786 Commits (18dad434a01304833ee1e81b4f82ceadc37fc071)

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
4 years ago
Mohammad Aljammal 6bda03e935 hot fixing 4 years ago
Sultan Khan e6a94f8014 login design 4 years ago
Sultan Khan b992978af4 login 4 years ago
Sultan Khan 764e706000 dashboard issue fixed 4 years ago
Sultan Khan c01246acf0 hot fix 4 years ago
Sultan Khan 2b48578e07 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 016dffcb87 change 4 years ago
Mohammad Aljammal 4263672f00 fim last vital sign data 4 years ago
Mohammad Aljammal 80da19555c Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
Hot fixes

See merge request Cloud_Solution/diplomatic-quarter!218
4 years ago
Mohammad Aljammal 519a474d41 fix live care label and vital sign data 4 years ago
Mohammad Aljammal 5e3f6363cf fix issues 4 years ago
Mohammad Aljammal 754e60eb72 fix send email lab result 4 years ago
Sultan Khan 6b4bae7370 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 827768e96d language change 4 years ago
Mohammad Aljammal 591d56e624 change the info images and change the out patient color 4 years ago
Mohammad Aljammal 5c8e43c163 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes 4 years ago
Sultan Khan 8becd4f920 login issue fixed 4 years ago
Sultan Khan 3edae19ad6 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan c9538c6a84 family files 4 years ago
Mohammad Aljammal 33c61afd2a add powered by 4 years ago
Mohammad Aljammal 5e29dff448 fix issues insurance and medical profile order 4 years ago
Sultan Khan 355286768a Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 73c8e00852 bug fixes 4 years ago
Haroon Amjad b0ea1fc262 updates & fixes 4 years ago
Sultan Khan 18f492e52f Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan d53031b0e6 blood type update for family files 4 years ago
Mohammad Aljammal b9958acd53 fix issues 4 years ago
Mohammad Aljammal 2059b76fc1 fix Medical profile 4 years ago
Mohammad Aljammal 4d8f42b517 fix issues vital sign issue 4 years ago
Mohammad Aljammal 4f015a1cda Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes 4 years ago
Mohammad Aljammal f6983c138a fix issues 4 years ago
Sultan Khan 37ab778fd0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan b505ed1be7 blood type added 4 years ago
Mohammad Aljammal 09a85d9127 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes 4 years ago
Mohammad Aljammal 9c12e949e8 hot fixes 4 years ago
Sultan Khan 6b1e7587a8 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan a0baaac314 bug fixes 4 years ago
Mohammad Aljammal a8b0af9ee1 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes 4 years ago
Mohammad Aljammal 9c18c69d90 hot fixes 4 years ago
haroon amjad 53282e3ae6 ToDo back issue fixed 4 years ago
haroon amjad ac3bebd59e Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon 4 years ago
haroon amjad 8c9762c24f Fixes 4 years ago
Sultan Khan 073e79c325 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 040c8f38ab hot fixes 4 years ago
Mohammad Aljammal 7bc8fdb819 fix merge issues 4 years ago
Mohammad Aljammal 3c2af11084 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master
 Conflicts:
	lib/pages/landing/landing_page.dart
4 years ago
Zohaib Kambrani d8996cf879 Geofence Android Finished 4 years ago
Mohammad Aljammal d28870a629 fix merge issues 4 years ago
Mohammad Aljammal 6d7cb1b970 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master
 Conflicts:
	ios/Runner.xcodeproj/project.pbxproj
	lib/core/service/AuthenticatedUserObject.dart
	lib/pages/landing/landing_page.dart
	lib/pages/login/login.dart
	lib/widgets/drawer/app_drawer_widget.dart
4 years ago