aamir-csol
|
e5f4da4e16
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
|
1 month ago |
|
aamir-csol
|
1125437a56
|
family screen & widgets
|
1 month ago |
 haroon amjad
|
97038f1a25
|
advance payment implementation done for self & other file number
|
1 month ago |
|
haroon amjad
|
3e95999bf3
|
Merge branch 'master' into haroon_dev
|
1 month ago |
|
aamir-csol
|
f9bfc131a8
|
family screen & widgets
|
1 month ago |
|
haroon amjad
|
6048b3b5f1
|
Advance payment module implementation contd.
|
1 month ago |
|
aamir-csol
|
a79dcad221
|
family screen & widgets
|
1 month ago |
Sultan khan
|
4d52987c83
|
Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/core/api_consts.dart
# lib/presentation/medical_file/medical_file_page.dart
|
1 month ago |
|
Sultan khan
|
5ce7548656
|
family file work-in-progress
|
1 month ago |
|
aamir-csol
|
8240d3e78d
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/authentication/register_step2.dart
|
1 month ago |
|
Haroon6138
|
25f0b9d415
|
Merge pull request 'haroon_dev' (#49) from haroon_dev into master
Reviewed-on: #49
|
1 month ago |
Haroon Amjad
|
bdde6c224d
|
Merge branch 'master' into haroon_dev
|
1 month ago |
|
Haroon6138
|
5e82e02323
|
Merge pull request 'Location functionality' (#48) from functionality/location into master
Reviewed-on: #48
|
1 month ago |
|
Haroon Amjad
|
c9206f1ab8
|
Radiology report implemented
|
1 month ago |
|
haroon amjad
|
3b5d2d27a4
|
Updates
|
2 months ago |
|
Sultan khan
|
0a653a61f2
|
family file bottomsheet added
|
2 months ago |
taha.alam
|
3fdd17ccaa
|
code added to get the location for gms hms and iphone. fallback added if the last known location is null.
|
2 months ago |
|
aamir-csol
|
17c47d093c
|
otp screen & register Uae & resend Activation Code.
|
2 months ago |
|
Sultan khan
|
030c2a1b8a
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
|
2 months ago |
|
Sultan khan
|
eafb52ab86
|
family file work in-progress
|
2 months ago |
|
Haroon6138
|
bfdc9752ae
|
Merge pull request 'dev_aamir' (#45) from dev_aamir into master
Reviewed-on: #45
|
2 months ago |
|
Haroon6138
|
05500e4cd1
|
Merge pull request 'drilled the lat and lng parameter form viewmodel to the mapper' (#44) from feature/search_by_region into master
Reviewed-on: #44
|
2 months ago |
|
aamir-csol
|
2b7656d83a
|
otp screen & register Uae & resend Activation Code.
|
2 months ago |
|
taha.alam
|
265d979b48
|
drilled the lat and lng parameter form viewmodel to the mapper
|
2 months ago |
|
aamir-csol
|
3ddd7781cd
|
Merge branch 'master' into dev_aamir
|
2 months ago |
|
haroon amjad
|
c191fd0be1
|
updates
|
2 months ago |
|
taha.alam
|
55c51f5742
|
Merge remote-tracking branch 'origin/master' into feature/search_by_region
|
2 months ago |
|
taha.alam
|
033ae12499
|
api handling for clinic and doctor parameters and state management
|
2 months ago |
|
aamir-csol
|
3b1b51ef6f
|
otp screen & register Uae & resend Activation Code.
|
2 months ago |
|
Sultan khan
|
cd5da116f9
|
Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
# lib/features/authentication/widgets/otp_verification_screen.dart
|
2 months ago |
|
Sultan khan
|
fe36c2a1c1
|
auto sms
|
2 months ago |
|
aamir-csol
|
28a95959e0
|
Merge branch 'master' into dev_aamir
|
2 months ago |
|
aamir-csol
|
5de8314f3f
|
otp screen & register Uae & resend Activation Code.
|
2 months ago |
|
haroon amjad
|
3ab2546d10
|
merge fixes
|
2 months ago |
|
haroon amjad
|
05cf451181
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New
# Conflicts:
# lib/features/my_appointments/my_appointments_view_model.dart
|
2 months ago |
|
haroon amjad
|
5de5fc8be9
|
updates
|
2 months ago |
|
Haroon6138
|
2ced674311
|
Merge pull request 'data from MyAppointmentViewmodel and MyAppointmentRepo migrated to bookappointment viewmodel and repo' (#40) from feature/search_by_region into master
Reviewed-on: #40
|
2 months ago |
|
taha.alam
|
de6e0e3704
|
data from MyAppointmentViewmodel and MyAppointmentRepo migrated to bookappointment viewmodel and repo
|
2 months ago |
|
aamir-csol
|
b9b0dfd1fa
|
Merge branch 'master' into dev_aamir
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
|
2 months ago |
|
aamir-csol
|
15c07cb4e2
|
otp screen & register Uae & resend Activation Code.
|
2 months ago |
|
haroon amjad
|
71a07eed8e
|
Merge branch 'master' into haroon_dev
|
2 months ago |
|
taha.alam
|
ea2d2bf40f
|
retaining the old data.
|
2 months ago |
|
taha.alam
|
788887a7f1
|
Merge remote-tracking branch 'origin/master' into feature/search_by_region
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/core/app_assets.dart
# lib/generated/locale_keys.g.dart
# lib/presentation/book_appointment/book_appointment_page.dart
# lib/presentation/home/navigation_screen.dart
|
2 months ago |
|
taha.alam
|
2174e0e292
|
viewmodel and repo updated for the appointment by region selection.
|
2 months ago |
|
taha.alam
|
9c2dd721b4
|
bottom sheets added of region facitlity and hospital.
|
2 months ago |
|
haroon amjad
|
f9e7c8988a
|
updates
|
2 months ago |
|
Sultan khan
|
6b766e558d
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/core/app_assets.dart
# lib/generated/locale_keys.g.dart
# lib/presentation/home/landing_page.dart
# lib/presentation/home/navigation_screen.dart
|
2 months ago |
|
Sultan khan
|
286dfaa376
|
no message
|
2 months ago |
|
aamir-csol
|
fbd6ef0cf8
|
Merge branch 'master' into dev_aamir
# Conflicts:
# assets/langs/en-US.json
# lib/features/authentication/widgets/otp_verification_screen.dart
# lib/widgets/input_widget.dart
|
2 months ago |
|
aamir-csol
|
4e17ff9c82
|
otp screen & register Uae & resend Activation Code.
|
2 months ago |