Commit Graph

20 Commits (ac871bb416d3b9d3277f6d312d0016e0f73be182)

Author SHA1 Message Date
Mohammad Aljammal 2952fd56ab Done Active Medications Service 4 years ago
Mohammad Aljammal ea02622977 fix merge issues 4 years ago
Mohammad Aljammal 68466c8d03 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/models/Appointments/DoctorListResponse.dart
	lib/pages/BookAppointment/widgets/DoctorView.dart
	lib/pages/MyAppointments/MyAppointments.dart
	lib/uitl/translations_delegate_base.dart
	pubspec.yaml
4 years ago
Mohammad Aljammal fe66ee5993 fix lab result issues 4 years ago
haroon amjad 96b7d00b4b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 4 years ago
haroon amjad 7a8392a97e updates 4 years ago
Sultan Khan 5d112b5464 merge 4 years ago
Sultan Khan 8516f7de1b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
haroon amjad db30fbdfd2 implementing livecare 4 years ago
Sultan Khan 47c42808fd Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 4c1a8dc38f new changes 4 years ago
haroon amjad 750746aabe updates & fixes 4 years ago
Mohammad Aljammal 22de043892 fix merge issues 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 4d28209b07 add permission android 4 years ago
haroon amjad b3e5047820 Payment method selection page created, Appointment details functions implemented 4 years ago
Sultan Khan 76aeeffad7 login page changes 4 years ago
Sultan Khan 5a08cb720c login changes 4 years ago
Sultan Khan f8d8e1c685 new pages added 4 years ago
Mohammad Aljammal 3ed5c3878f init project structure By Mohammad and Elham 4 years ago