Commit Graph

442 Commits (874de15040bf45ea4ae07e2c2a7776feb93c8c54)
 

Author SHA1 Message Date
haroon amjad 3a9fa97c91 updates 4 years ago
Mohammad Aljammal 716482bc4d Merge branch 'sultan' into 'master'
login changes

See merge request Cloud_Solution/diplomatic-quarter!17
4 years ago
Mohammad Aljammal 0c5784fe48 Merge branch 'insurance' into 'master'
insurance card and insurance update  and insurance approval

See merge request Cloud_Solution/diplomatic-quarter!15
4 years ago
Mohammad Aljammal 5cee1cef4e fix merge issues 4 years ago
Sultan Khan 6af7ac54ba login changes 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
Mohammad Aljammal a090339351 Merge branch 'sultan' into 'master'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!16
4 years ago
Sultan Khan d1871bb71f Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 8ee3b3b557 family files. 4 years ago
hussam al-habibeh 492cfa084b insurance card and insurance update and insurance approval 4 years ago
Mohammad Aljammal 32af329915 Merge branch 'medical_profile' into 'master'
Medical profile

See merge request Cloud_Solution/diplomatic-quarter!14
4 years ago
Mohammad Aljammal 125360ced7 fix merge issues 4 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
4 years ago
Mohammad Aljammal b0dc479afa Merge branch 'sultan' into 'master'
registration done.

See merge request Cloud_Solution/diplomatic-quarter!13
4 years ago
Mohammad Aljammal a84341af58 fix merge issues 4 years ago
Mohammad Aljammal 5ea0df9f1e Merge remote-tracking branch 'origin/sultan' into sultan
# Conflicts:
#	lib/uitl/date_uitl.dart
4 years ago
Mohammad Aljammal 4d28209b07 add permission android 4 years ago
Mohammad Aljammal 7d230ea14c fix issues 4 years ago
Mohammad Aljammal cfd5b2ccff feedback Service done 4 years ago
Sultan Khan 8e3fb6831d registration changes 4 years ago
Sultan Khan e735855c33 registration 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 1ab34df4f7 Merge branch 'medical_profile' into 'master'
Medical profile

See merge request Cloud_Solution/diplomatic-quarter!12
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 1c3e088515 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 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
Mohammad Aljammal dc4c7ef067 Merge branch 'sultan' into 'master'
login changes

See merge request Cloud_Solution/diplomatic-quarter!11
4 years ago
Sultan Khan ecfa1756d3 login changes 4 years ago
Mohammad Aljammal 7d084162a6 Merge branch 'sultan' into 'master'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!10
4 years ago
Sultan Khan 0bc529f420 login changes 4 years ago
haroon amjad 192a3835d6 implemented payment method selection & payment details dialog. Added Calendar events to add remindar in calendar for appointment. 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
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
Sultan Khan 41b438fd74 login page changes 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 20ab170e7a Merge branch 'medical_profile' into 'master'
Medical profile

See merge request Cloud_Solution/diplomatic-quarter!9
4 years ago
Mohammad Aljammal ec09721869 fix merge issues 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 3e1311e8b8 Merge branch 'sultan' into 'master'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!7
4 years ago
Mohammad Aljammal 5a38479254 fix merge issues 4 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
4 years ago
Sultan Khan 3a15c16883 login changes 4 years ago
Mohammad Aljammal 43349542da Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile 4 years ago