Commit Graph

3384 Commits (dev_v3.13.6)
 

Author SHA1 Message Date
haroon amjad 59c279998c working on vital signs integration 5 years ago
Sultan Khan 47c42808fd Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 913729fc58 speech search 5 years ago
Mohammad Aljammal 09561ac248 Merge branch 'vital_sign' into 'master'
Vital sign

See merge request Cloud_Solution/diplomatic-quarter!26
5 years ago
Mohammad Aljammal 5619b8c06f fix issues in feedback 5 years ago
Mohammad Aljammal 2b0e35a907 fix issues in base app client 5 years ago
Mohammad Aljammal d4c9352fd9 Merge branch 'Haroon' into 'master'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!25
5 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
5 years ago
haroon amjad b9d913e6a5 Merge fixes & updates 5 years ago
Sultan Khan 03b34115c4 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 3b2f9251dc search 5 years ago
Mohammad Aljammal 915de5a871 Merge branch 'vital_sign' into 'master'
Vital sign

See merge request Cloud_Solution/diplomatic-quarter!22
5 years ago
Mohammad Aljammal a5e63817f2 done vital sign 5 years ago
Sultan Khan 4c1a8dc38f new changes 5 years ago
Sultan Khan 9afeecf9fa new 5 years ago
Mohammad Aljammal 32e2732c43 feedback service 5 years ago
haroon amjad 3b881f1ab3 appointment details scenarios handled 5 years ago
Amjad Amireh 97dbe62f93 done report service 5 years ago
haroon amjad 7972d01dff Insurance Approval implemented 5 years ago
haroon amjad fde47a5c2c Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	lib/core/service/client/base_app_client.dart
5 years ago
haroon amjad 206f9a4371 fixes 5 years ago
haroon amjad 750746aabe updates & fixes 5 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
5 years ago
Mohammad Aljammal b6c90b869b add pods file 5 years ago
Mohammad Aljammal 01f8b4e004 Merge branch 'ions_app' into 'master'
add ions

See merge request Cloud_Solution/diplomatic-quarter!21
5 years ago
Mohammad Aljammal f229958e1c add ions 5 years ago
Mohammad Aljammal 5a17411961 Merge branch 'Haroon' into 'master'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!20
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
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
5 years ago
Mohammad Aljammal cd09d802bf Merge branch 'sultan' into 'master'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!19
5 years ago
Sultan Khan 3f0c60aea5 sessionID 5 years ago
Mohammad Aljammal a1fa2c0727 done vital sign 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
Mohammad Aljammal edd850490e Merge branch 'insurance' into 'master'
insurance translation

See merge request Cloud_Solution/diplomatic-quarter!18
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 0c5784fe48 Merge branch 'insurance' into 'master'
insurance card and insurance update  and insurance approval

See merge request Cloud_Solution/diplomatic-quarter!15
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
Mohammad Aljammal a090339351 Merge branch 'sultan' into 'master'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!16
5 years ago
Sultan Khan d1871bb71f Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago