Commit Graph

36 Commits (01bfe8464489de10fdcfd0f65822215e59dbc965)

Author SHA1 Message Date
Mohammad Aljammal f77d2b497e fix issues 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
Mohammad Aljammal 591d56e624 change the info images and change the out patient color 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
Mohammad Aljammal a45216b902 hot fixes 4 years ago
Mohammad Aljammal a57d5eb69f hot fixes 4 years ago
Zohaib Kambrani 0f64c45e67 no message 4 years ago
Zohaib Kambrani 1dc9400ffc Geofencing work in progress on android 4 years ago
Zohaib Kambrani 78928335ef Geofences Login check (unregister/register geozones on logout/logout) 4 years ago
Zohaib Kambrani 6f6ab8d987 no message 4 years ago
Zohaib Kambrani 9947b30d3f fix merge conflict 4 years ago
Zohaib Kambrani c534061c4f no message 4 years ago
Zohaib Kambrani b7088f70cd Merge master in to my branch with Geofence iOS 4 years ago
Zohaib Kambrani 67f4b4e167 iOS Geofence in progress 4 years ago
Zohaib Kambrani 8457972fda no message 4 years ago
Mohammad Aljammal b25bdbb6fa fix LiveChatPage Service LabOrderResult MedicineSearch issues 4 years ago
Zohaib Kambrani 8d5d55a150 Geofencing in progress 4 years ago
Mohammad Aljammal 4e2c955b09 add missing translation 4 years ago
Zohaib Kambrani 27182ee8db no message 4 years ago
haroon amjad a03d5c6d57 App initial release to stores 4 years ago
Zohaib Kambrani 69d1e4bb0b no message 4 years ago
Zohaib Kambrani 0c71fbad5f no message 4 years ago
Mohammad Aljmma 0b309ebba3 change the home page design 4 years ago
jammal bd2254491c done ER service 4 years ago
jammal 57f938aa09 fix ios issues 4 years ago
jammal 0fceca8f3e fix ios issues 4 years ago
haroon amjad 41d50e23e3 covid drivethru implemented 4 years ago
Mohammad Aljammal 2952fd56ab Done Active Medications Service 4 years ago
Mohammad Aljammal 1b3a780a29 add ar lan for medical profile 4 years ago
haroon amjad 61dba06236 Twilio implemented in LiveCare 4 years ago
haroon amjad 7d0efda1c4 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/medical/medical_profile_page.dart
#	lib/services/authentication/auth_provider.dart
#	lib/uitl/translations_delegate_base.dart
#	pubspec.yaml
4 years ago
Mohammad Aljammal a12197fe70 labs result done add some file to git ignore for ios 4 years ago
haroon amjad d8fe501341 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/pages/BookAppointment/BookingOptions.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/others/app_scaffold_widget.dart
4 years ago
Mohammad Aljammal b2875fbce3 merge haroun 4 years ago
Mohammad Aljammal fc749de77e create doctor card and medical page 4 years ago
Mohammad Aljammal 3ed5c3878f init project structure By Mohammad and Elham 4 years ago