Commit Graph

72 Commits (02ce04a39760e671d2de199862dc6427e8f3f63a)

Author SHA1 Message Date
Mohammad Aljammal 02ce04a397 medical_profile_page.dart 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
hussam al-habibeh 3a79ddb488 vaccine service 4 years ago
Mohammad Aljammal 91e5a20fd0 fix merge issues 4 years ago
Sultan Khan 8516f7de1b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Mohammad Aljammal 30c0963063 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/localized_values.dart
	lib/locator.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 8989fbc9b7 done design dashboard 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
haroon amjad 760db6a873 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/locator.dart
4 years ago
haroon amjad cc4f5c0615 updates 4 years ago
Mohammad Aljammal 9cf5c80aae add time line and appointment rate 4 years ago
Mohammad Aljammal f6d30178bf done medical report 4 years ago
Mohammad Aljammal b6319c558c Merge branch 'report_service' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
 Conflicts:
	lib/locator.dart
	lib/pages/medical/medical_profile_page.dart
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
haroon amjad 73cf37a3a5 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/core/service/client/base_app_client.dart
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
Sultan Khan 4c1a8dc38f new changes 4 years ago
Mohammad Aljammal 32e2732c43 feedback service 4 years ago
Amjad Amireh 97dbe62f93 done report service 4 years ago
haroon amjad 7972d01dff Insurance Approval implemented 4 years ago
haroon amjad 750746aabe updates & fixes 4 years ago
Mohammad Aljammal d093ecd5e6 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
 Conflicts:
	ios/Podfile
	ios/Runner.xcodeproj/project.pbxproj
	lib/config/config.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 37b874fe3f Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal a1fa2c0727 done vital sign 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
hussam al-habibeh f77d4fac66 insurance translation 4 years ago
Haroon Amjad 8ad2941836 Appointment payment finalised, Ask Doc implemeted & other updates 4 years ago
Haroon Amjad 41c922bfeb Appointment payment implemented, Book Success implemented, Appointment flow implemented 4 years ago
haroon amjad 3a9fa97c91 updates 4 years ago
Mohammad Aljammal 5cee1cef4e fix merge issues 4 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
4 years ago
hussam al-habibeh 492cfa084b insurance card and insurance update and insurance approval 4 years ago
Mohammad Aljammal cfd5b2ccff feedback Service done 4 years ago
haroon amjad 28fde5c500 My Appointments implemented, Appointment Details functionality updated, Logged In User details added in APIs & other updates 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
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
4 years ago
Sultan Khan 0bc529f420 login changes 4 years ago
Mohammad Aljammal 1bbbd18373 labs services 4 years ago
haroon amjad b3e5047820 Payment method selection page created, Appointment details functions implemented 4 years ago
Mohammad Aljammal 940b327561 done Prescriptions 4 years ago
haroon amjad 06f95c5379 Appointment Details implementation continued 4 years ago
haroon amjad 0171664779 Master Merged in to local 4 years ago
haroon amjad 049d455e3c Implementing appointment details functions 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 5a38479254 fix merge issues 4 years ago