Commit Graph

89 Commits (9afeecf9fa9d0c6feb3d3c0d98ab2314f674412c)

Author SHA1 Message Date
Sultan Khan 9afeecf9fa new 5 years ago
Mohammad Aljammal f229958e1c add ions 5 years ago
Mohammad Aljammal 22de043892 fix merge issues 5 years ago
Mohammad Aljammal b4b33be3e9 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
 Conflicts:
	lib/core/service/client/base_app_client.dart
5 years ago
Sultan Khan 3f0c60aea5 sessionID 5 years ago
Sultan Khan da6f238c89 family files changes 5 years ago
haroon amjad c50530734d added my appointments in medical file page 5 years ago
Sultan Khan adbdd2dd0d Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 621870eca1 family file changes 5 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
5 years ago
hussam al-habibeh f77d4fac66 insurance translation 5 years ago
Haroon Amjad 8ad2941836 Appointment payment finalised, Ask Doc implemeted & other updates 5 years ago
Haroon Amjad 41c922bfeb Appointment payment implemented, Book Success implemented, Appointment flow implemented 5 years ago
haroon amjad 3a9fa97c91 updates 5 years ago
Mohammad Aljammal 716482bc4d Merge branch 'sultan' into 'master'
login changes

See merge request Cloud_Solution/diplomatic-quarter!17
5 years ago
Mohammad Aljammal 5cee1cef4e fix merge issues 5 years ago
Sultan Khan 6af7ac54ba login changes 5 years ago
Mohammad Aljammal 2e0afdb49c Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into insurance
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/prescriptions/prescriptions_home_page.dart
5 years ago
Sultan Khan d1871bb71f Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 8ee3b3b557 family files. 5 years ago
hussam al-habibeh 492cfa084b insurance card and insurance update and insurance approval 5 years ago
Mohammad Aljammal 125360ced7 fix merge issues 5 years ago
Mohammad Aljammal 002efe3b45 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
 Conflicts:
	lib/pages/landing/landing_page.dart
5 years ago
Mohammad Aljammal a84341af58 fix merge issues 5 years ago
Mohammad Aljammal 5ea0df9f1e Merge remote-tracking branch 'origin/sultan' into sultan
# Conflicts:
#	lib/uitl/date_uitl.dart
5 years ago
Mohammad Aljammal 7d230ea14c fix issues 5 years ago
Mohammad Aljammal cfd5b2ccff feedback Service done 5 years ago
Sultan Khan 8e3fb6831d registration changes 5 years ago
Sultan Khan e735855c33 registration done. 5 years ago
haroon amjad 28fde5c500 My Appointments implemented, Appointment Details functionality updated, Logged In User details added in APIs & other updates 5 years ago
Mohammad Aljammal 29768feefd merge master 5 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
5 years ago
Mohammad Aljammal a12197fe70 labs result done add some file to git ignore for ios 5 years ago
haroon amjad 00d9214460 Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/others/app_scaffold_widget.dart
5 years ago
Sultan Khan ecfa1756d3 login changes 5 years ago
Sultan Khan 0bc529f420 login changes 5 years ago
haroon amjad 192a3835d6 implemented payment method selection & payment details dialog. Added Calendar events to add remindar in calendar for appointment. 5 years ago
Mohammad Aljammal 1bbbd18373 labs services 5 years ago
Sultan Khan 9d0a2e1e43 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 8d0834ff3e login inprogress 5 years ago
haroon amjad b3e5047820 Payment method selection page created, Appointment details functions implemented 5 years ago
Mohammad Aljammal 940b327561 done Prescriptions 5 years ago
haroon amjad 06f95c5379 Appointment Details implementation continued 5 years ago
Sultan Khan 41b438fd74 login page changes 5 years ago
haroon amjad 0171664779 Master Merged in to local 5 years ago
haroon amjad 049d455e3c Implementing appointment details functions 5 years ago
Mohammad Aljammal ec09721869 fix merge issues 5 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
5 years ago
Mohammad Aljammal 5a38479254 fix merge issues 5 years ago
Mohammad Aljammal 1ac420ef7c Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
5 years ago