Commit Graph

43 Commits (4b0365480cd4d755791ebecf94134643ebd8fbd2)

Author SHA1 Message Date
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
haroon amjad 51078227ab Dental appointment flow implemented 4 years ago
Mohammad Aljammal 1b3a780a29 add ar lan for medical profile 4 years ago
Mohammad Aljammal ef4a57223c fix DoctorView.dart UI issues 4 years ago
Mohammad Aljammal 4bc806671a Merge branch 'amjad_amireh' into 'master'
filter doctor by department

See merge request Cloud_Solution/diplomatic-quarter!33
4 years ago
Mohammad Aljammal 9e47dc19f9 filter doctor by department 4 years ago
Sultan Khan 3247378c02 search 4 years ago
Sultan Khan 8516f7de1b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Mohammad Aljammal 8989fbc9b7 done design dashboard 4 years ago
Sultan Khan 8887ba85fe family file 4 years ago
Sultan Khan cb99b2a7a7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 327c4585a6 family file change 4 years ago
Mohammad Aljammal 75fdf28036 fix lab Result 4 years ago
Mohammad Aljammal 8495260c5a fix issues in feedback 4 years ago
Sultan Khan 47c42808fd Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 913729fc58 speech search 4 years ago
Mohammad Aljammal 5619b8c06f fix issues in feedback 4 years ago
Mohammad Aljammal 2b0e35a907 fix issues in base app client 4 years ago
haroon amjad b9d913e6a5 Merge fixes & updates 4 years ago
Sultan Khan 03b34115c4 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 3b2f9251dc search 4 years ago
Mohammad Aljammal 32e2732c43 feedback service 4 years ago
haroon amjad 7972d01dff Insurance Approval implemented 4 years ago
Sultan Khan 3f0c60aea5 sessionID 4 years ago
Sultan Khan 621870eca1 family file changes 4 years ago
Mohammad Aljammal 5ea0df9f1e Merge remote-tracking branch 'origin/sultan' into sultan
# Conflicts:
#	lib/uitl/date_uitl.dart
4 years ago
Sultan Khan 8e3fb6831d registration changes 4 years ago
Mohammad Aljammal 29768feefd merge master 4 years ago
Mohammad Aljammal 05222207da Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
 Conflicts:
	lib/config/config.dart
	lib/core/service/client/base_app_client.dart
4 years ago
Mohammad Aljammal a12197fe70 labs result done add some file to git ignore for ios 4 years ago
Sultan Khan 0bc529f420 login changes 4 years ago
Mohammad Aljammal 1bbbd18373 labs services 4 years ago
Sultan Khan 9d0a2e1e43 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 8d0834ff3e login inprogress 4 years ago
Mohammad Aljammal 5874f4ba21 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
 Conflicts:
	lib/pages/landing/landing_page.dart
4 years ago
Mohammad Aljammal 8de50bfe74 medical - my doctor and prescription services and pages 4 years ago
Sultan Khan b0989d6ca0 login pages changes 4 years ago
Sultan Khan 5a08cb720c login changes 4 years ago
Mohammad Aljammal 257cc92691 add MVVM and di Mohammad Aljammal and Elham Rababah 4 years ago