Commit Graph

208 Commits (d4d333ef43476d24ecdae0a31434152ca046c220)
 

Author SHA1 Message Date
Mohammad Aljammal d4d333ef43 Merge branch 'Haroon' into 'master'
Dental flow in my appointments

See merge request Cloud_Solution/diplomatic-quarter!39
5 years ago
haroon amjad cbf19f0cd1 Merge branch 'master' into 'Haroon'
# Conflicts:
#   lib/core/service/client/base_app_client.dart
5 years ago
Mohammad Aljammal 137e16887c Merge branch 'dashboard' into 'master'
Dashboard

See merge request Cloud_Solution/diplomatic-quarter!40
5 years ago
Mohammad Aljammal b0f0b87345 fix merge issues 5 years ago
haroon amjad c5794e5c70 Dental flow in my appointments 5 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
5 years ago
Mohammad Aljammal fe66ee5993 fix lab result issues 5 years ago
Mohammad Aljammal a75adae281 Merge branch 'Haroon' into 'master'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!38
5 years ago
haroon amjad 2219df0db2 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
Mohammad Aljammal 02ce04a397 medical_profile_page.dart 5 years ago
haroon amjad 3e5ef26b29 my appointment sorting implemented 5 years ago
haroon amjad ce9903fd13 nearest appointment flow implemented 5 years ago
haroon amjad 51078227ab Dental appointment flow implemented 5 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
5 years ago
Mohammad Aljammal 1b3a780a29 add ar lan for medical profile 5 years ago
hussam al-habibeh 3a79ddb488 vaccine service 5 years ago
Mohammad Aljammal f916ff7234 Merge branch 'Haroon' into 'master'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!37
5 years ago
haroon amjad 779b08e34e Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
haroon amjad 1886f3a763 implementing Dental Appointment flow 5 years ago
Mohammad Aljammal ef4a57223c fix DoctorView.dart UI issues 5 years ago
haroon amjad a7f5dfab5c fixes 5 years ago
haroon amjad 35cd02494c implemented search by doctor list 5 years ago
Mohammad Aljammal 11104f5ef6 Merge branch 'Haroon' into 'master'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!36
5 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
5 years ago
haroon amjad e29c6a892e updates 5 years ago
haroon amjad 6ea1ed3eaa added geolocation dependency in pubspec 5 years ago
haroon amjad f669adcb9d Location service implemented 5 years ago
Mohammad Aljammal 897326fcf1 Merge branch 'dashboard' into 'master'
Dashboard

See merge request Cloud_Solution/diplomatic-quarter!34
5 years ago
Mohammad Aljammal 91e5a20fd0 fix merge issues 5 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
5 years ago
Mohammad Aljammal d16ea676cf done parking service ,fix design issues in home page and add new icon 5 years ago
Mohammad Aljammal 01a011a03d done dashboard page 5 years ago
haroon amjad 84e92cb040 updates & fixes 5 years ago
haroon amjad 96b7d00b4b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
haroon amjad 823eda0d5c updates 5 years ago
Mohammad Aljammal 4bc806671a Merge branch 'amjad_amireh' into 'master'
filter doctor by department

See merge request Cloud_Solution/diplomatic-quarter!33
5 years ago
Mohammad Aljammal 582853135d Merge branch 'sultan' into 'master'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!31
5 years ago
Mohammad Aljammal 9e47dc19f9 filter doctor by department 5 years ago
Sultan Khan 130fb53a65 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 3247378c02 search 5 years ago
haroon amjad 30e08b4417 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/pages/login/login.dart
5 years ago
haroon amjad 7a8392a97e updates 5 years ago
Mohammad Aljammal 1954346017 Merge branch 'amjad_amireh' into 'master'
Amjad amireh

See merge request Cloud_Solution/diplomatic-quarter!32
5 years ago
Mohammad Aljammal c0c6376f55 filter doctor by department 5 years ago
Mohammad Aljammal dc9b9e21ad filter doctor by department 5 years ago
Mohammad Aljammal 895c09efa4 parking service 5 years ago
Sultan Khan 1974e51602 merge 5 years ago
Sultan Khan 5d112b5464 merge 5 years ago
Sultan Khan 8516f7de1b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 9b55309d53 text to speech 5 years ago