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 |
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
|
32af329915
|
Merge branch 'medical_profile' into 'master'
Medical profile
See merge request Cloud_Solution/diplomatic-quarter!14
|
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
|
b0dc479afa
|
Merge branch 'sultan' into 'master'
registration done.
See merge request Cloud_Solution/diplomatic-quarter!13
|
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
|
4d28209b07
|
add permission android
|
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
|
1ab34df4f7
|
Merge branch 'medical_profile' into 'master'
Medical profile
See merge request Cloud_Solution/diplomatic-quarter!12
|
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
|
1c3e088515
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
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 |
Mohammad Aljammal
|
dc4c7ef067
|
Merge branch 'sultan' into 'master'
login changes
See merge request Cloud_Solution/diplomatic-quarter!11
|
5 years ago |
Sultan Khan
|
ecfa1756d3
|
login changes
|
5 years ago |