Commit Graph

173 Commits (57ed83a139755c92f64b36e76a82d21b6a32b9b8)

Author SHA1 Message Date
Mohammad Aljammal 57ed83a139 Merge branch 'vaccine' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into patient_sick_leave
 Conflicts:
	lib/config/config.dart
4 years ago
Mohammad Aljammal 11f9daa3ff add PatientSickLeave 4 years ago
Mohammad Aljammal fbb4b326a8 Merge branch 'amjad_amireh' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
 Conflicts:
	lib/locator.dart
	pubspec.yaml
4 years ago
Mohammad Aljammal 8e96c79d05 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
 Conflicts:
	lib/config/localized_values.dart
4 years ago
Mohammad Aljammal 33bd972984 add my vaccines item screen 4 years ago
Amjad amireh 62d96a3f1c edit card_position.dart 4 years ago
Mohammad Aljammal 9159928e27 edit on vaccine service 4 years ago
Amjad amireh e638464657 edit card_position.dart 4 years ago
Mohammad Aljammal ddf53ce999 ER 4 years ago
Mohammad Aljammal 50d1e50df4 ER 4 years ago
Mohammad Aljammal ed1c04ab25 ER 4 years ago
Mohammad Aljammal 629251d216 ER 4 years ago
Mohammad Aljammal b7f73bf397 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into monthly_reports 4 years ago
Mohammad Aljammal 153335538a done monthly reports 4 years ago
Mohammad Aljammal 5485cbab36 ER 4 years ago
Mohammad Aljammal 2ef36d3d8a ER 4 years ago
Mohammad Aljammal f534f8a348 ER 4 years ago
Mohammad Aljammal 20f9f6f06c ER 4 years ago
haroon amjad cbf19f0cd1 Merge branch 'master' into 'Haroon'
# Conflicts:
#   lib/core/service/client/base_app_client.dart
4 years ago
Mohammad Aljammal b0f0b87345 fix merge issues 4 years ago
haroon amjad c5794e5c70 Dental flow in my appointments 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
Mohammad Aljammal db79f299b6 ER 4 years ago
Mohammad Aljammal e254261ef9 ER 4 years ago
Mohammad Aljammal 02ce04a397 medical_profile_page.dart 4 years ago
Mohammad Aljammal e909c16b80 ER 4 years ago
haroon amjad 3e5ef26b29 my appointment sorting implemented 4 years ago
haroon amjad ce9903fd13 nearest appointment flow implemented 4 years ago
haroon amjad 51078227ab Dental appointment flow implemented 4 years ago
Mohammad Aljammal d52e612bff Merge branch 'insurance' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/medical/medical_profile_page.dart
	pubspec.yaml
4 years ago
Mohammad Aljammal 1b3a780a29 add ar lan for medical profile 4 years ago
hussam al-habibeh 3a79ddb488 vaccine service 4 years ago
haroon amjad 1886f3a763 implementing Dental Appointment flow 4 years ago
Mohammad Aljammal 4ffbb80f3d ER 4 years ago
Mohammad Aljammal ef4a57223c fix DoctorView.dart UI issues 4 years ago
haroon amjad a7f5dfab5c fixes 4 years ago
haroon amjad 35cd02494c implemented search by doctor list 4 years ago
haroon amjad 13adb46319 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/config/shared_pref_kay.dart
4 years ago
haroon amjad e29c6a892e updates 4 years ago
haroon amjad f669adcb9d Location service implemented 4 years ago
Mohammad Aljammal 91e5a20fd0 fix merge issues 4 years ago
Mohammad Aljammal 54b766de81 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/config/shared_pref_kay.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
4 years ago
Mohammad Aljammal d16ea676cf done parking service ,fix design issues in home page and add new icon 4 years ago
Mohammad Aljammal 01a011a03d done dashboard page 4 years ago
haroon amjad 84e92cb040 updates & fixes 4 years ago
haroon amjad 96b7d00b4b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 4 years ago
haroon amjad 823eda0d5c updates 4 years ago
Sultan Khan 130fb53a65 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
haroon amjad 30e08b4417 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/pages/login/login.dart
4 years ago