Mohammad Aljammal
|
20f9f6f06c
|
ER
|
4 years ago |
haroon amjad
|
cbf19f0cd1
|
Merge branch 'master' into 'Haroon'
# Conflicts:
# lib/core/service/client/base_app_client.dart
|
4 years ago |
Mohammad Aljammal
|
b0f0b87345
|
fix merge issues
|
4 years ago |
haroon amjad
|
c5794e5c70
|
Dental flow in my appointments
|
4 years ago |
Mohammad Aljammal
|
68466c8d03
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
Conflicts:
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/models/Appointments/DoctorListResponse.dart
lib/pages/BookAppointment/widgets/DoctorView.dart
lib/pages/MyAppointments/MyAppointments.dart
lib/uitl/translations_delegate_base.dart
pubspec.yaml
|
4 years ago |
Mohammad Aljammal
|
fe66ee5993
|
fix lab result issues
|
4 years ago |
Mohammad Aljammal
|
db79f299b6
|
ER
|
4 years ago |
Mohammad Aljammal
|
e254261ef9
|
ER
|
4 years ago |
Mohammad Aljammal
|
02ce04a397
|
medical_profile_page.dart
|
4 years ago |
Mohammad Aljammal
|
e909c16b80
|
ER
|
4 years ago |
haroon amjad
|
3e5ef26b29
|
my appointment sorting implemented
|
4 years ago |
haroon amjad
|
ce9903fd13
|
nearest appointment flow implemented
|
4 years ago |
haroon amjad
|
51078227ab
|
Dental appointment flow implemented
|
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 |
Mohammad Aljammal
|
1b3a780a29
|
add ar lan for medical profile
|
4 years ago |
hussam al-habibeh
|
3a79ddb488
|
vaccine service
|
4 years ago |
haroon amjad
|
1886f3a763
|
implementing Dental Appointment flow
|
4 years ago |
Mohammad Aljammal
|
4ffbb80f3d
|
ER
|
4 years ago |
Mohammad Aljammal
|
5ec3935c68
|
ER
|
4 years ago |
Mohammad Aljammal
|
ef4a57223c
|
fix DoctorView.dart UI issues
|
4 years ago |
haroon amjad
|
a7f5dfab5c
|
fixes
|
4 years ago |
haroon amjad
|
35cd02494c
|
implemented search by doctor list
|
4 years ago |
haroon amjad
|
13adb46319
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/config/shared_pref_kay.dart
|
4 years ago |
haroon amjad
|
e29c6a892e
|
updates
|
4 years ago |
haroon amjad
|
f669adcb9d
|
Location service implemented
|
4 years ago |
Mohammad Aljammal
|
91e5a20fd0
|
fix merge issues
|
4 years ago |
Mohammad Aljammal
|
54b766de81
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/config/shared_pref_kay.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
Mohammad Aljammal
|
d16ea676cf
|
done parking service ,fix design issues in home page and add new icon
|
4 years ago |
Mohammad Aljammal
|
01a011a03d
|
done dashboard page
|
4 years ago |
haroon amjad
|
84e92cb040
|
updates & fixes
|
4 years ago |
haroon amjad
|
96b7d00b4b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
4 years ago |
haroon amjad
|
823eda0d5c
|
updates
|
4 years ago |
Mohammad Aljammal
|
4bc806671a
|
Merge branch 'amjad_amireh' into 'master'
filter doctor by department
See merge request Cloud_Solution/diplomatic-quarter!33
|
4 years ago |
Mohammad Aljammal
|
9e47dc19f9
|
filter doctor by department
|
4 years ago |
Sultan Khan
|
130fb53a65
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
3247378c02
|
search
|
4 years ago |
haroon amjad
|
30e08b4417
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/pages/login/login.dart
|
4 years ago |
haroon amjad
|
7a8392a97e
|
updates
|
4 years ago |
Mohammad Aljammal
|
c0c6376f55
|
filter doctor by department
|
4 years ago |
Mohammad Aljammal
|
dc9b9e21ad
|
filter doctor by department
|
4 years ago |
Mohammad Aljammal
|
895c09efa4
|
parking service
|
4 years ago |
Sultan Khan
|
1974e51602
|
merge
|
4 years ago |
Sultan Khan
|
5d112b5464
|
merge
|
4 years ago |
Sultan Khan
|
8516f7de1b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
9b55309d53
|
text to speech
|
4 years ago |
Mohammad Aljammal
|
4adc2916b4
|
fix merge issues
|
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 |
haroon amjad
|
61dba06236
|
Twilio implemented in LiveCare
|
4 years ago |
Sultan Khan
|
2f9885ecf8
|
family file changes
|
4 years ago |
Sultan Khan
|
8887ba85fe
|
family file
|
4 years ago |
haroon amjad
|
732ab90b2f
|
Book Appointment check login
|
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 |
haroon amjad
|
5f1413a2ac
|
implementing Twilio in LiveCare
|
4 years ago |
Mohammad Aljammal
|
9cf5c80aae
|
add time line and appointment rate
|
4 years ago |
Mohammad Aljammal
|
f5b16734c6
|
add time line
|
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 |
Mohammad Aljammal
|
75fdf28036
|
fix lab Result
|
4 years ago |
Mohammad Aljammal
|
8495260c5a
|
fix issues in feedback
|
4 years ago |
haroon amjad
|
db30fbdfd2
|
implementing livecare
|
4 years ago |
haroon amjad
|
59c279998c
|
working on vital signs integration
|
4 years ago |
Sultan Khan
|
47c42808fd
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
913729fc58
|
speech search
|
4 years ago |
Mohammad Aljammal
|
5619b8c06f
|
fix issues in feedback
|
4 years ago |
Mohammad Aljammal
|
2b0e35a907
|
fix issues in base app client
|
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 |
haroon amjad
|
b9d913e6a5
|
Merge fixes & updates
|
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 |
Mohammad Aljammal
|
a5e63817f2
|
done vital sign
|
4 years ago |
Sultan Khan
|
4c1a8dc38f
|
new changes
|
4 years ago |
Sultan Khan
|
9afeecf9fa
|
new
|
4 years ago |
Mohammad Aljammal
|
32e2732c43
|
feedback service
|
4 years ago |
haroon amjad
|
3b881f1ab3
|
appointment details scenarios handled
|
4 years ago |
Amjad Amireh
|
97dbe62f93
|
done report service
|
4 years ago |
haroon amjad
|
7972d01dff
|
Insurance Approval implemented
|
4 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
|
4 years ago |
haroon amjad
|
206f9a4371
|
fixes
|
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
|
f229958e1c
|
add ions
|
4 years ago |
Mohammad Aljammal
|
22de043892
|
fix merge issues
|
4 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
|
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 |
Sultan Khan
|
3f0c60aea5
|
sessionID
|
4 years ago |
Mohammad Aljammal
|
a1fa2c0727
|
done vital sign
|
4 years ago |
Sultan Khan
|
da6f238c89
|
family files changes
|
4 years ago |
haroon amjad
|
c50530734d
|
added my appointments in medical file page
|
4 years ago |
Sultan Khan
|
adbdd2dd0d
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
621870eca1
|
family file changes
|
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
|
716482bc4d
|
Merge branch 'sultan' into 'master'
login changes
See merge request Cloud_Solution/diplomatic-quarter!17
|
4 years ago |