Sultan khan
|
32c7608c83
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
|
1 month ago |
taha.alam
|
8621a525a2
|
Merge remote-tracking branch 'origin/master' into feature/search_by_region
|
1 month ago |
|
taha.alam
|
27a0632d6d
|
directional padding and alignment
|
1 month ago |
|
taha.alam
|
92c3033087
|
Merge remote-tracking branch 'origin/master' into functionality/graph
|
1 month ago |
|
taha.alam
|
5151997c7f
|
custom linear added with parameters to customize the properties of graph
|
1 month ago |
aamir-csol
|
e5f4da4e16
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
|
1 month ago |
 Sikander Saleem
|
005157fe5e
|
Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
# lib/presentation/habib_wallet/recharge_wallet_page.dart
# lib/presentation/lab/lab_orders_page.dart
# lib/splashPage.dart
|
1 month ago |
|
aamir-csol
|
1125437a56
|
family screen & widgets
|
1 month ago |
|
Sultan khan
|
3d1d78ba48
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
|
1 month ago |
|
Sultan khan
|
8f8c4c7f65
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
|
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
|
1c2564a1e2
|
updates
|
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 |
|
Sultan khan
|
467f10e952
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
|
1 month ago |
|
Sultan khan
|
0a653a61f2
|
family file bottomsheet added
|
1 month ago |
|
aamir-csol
|
17c47d093c
|
otp screen & register Uae & resend Activation Code.
|
1 month ago |
|
Sikander Saleem
|
2584e6cc6e
|
route animation improvement.
|
1 month ago |
|
Sikander Saleem
|
bb0ac4a0fe
|
Merge branch 'refs/heads/master' into dev_sikander
|
1 month ago |
|
Sikander Saleem
|
c96081d07c
|
reverse animation time changed to 500ms.
|
1 month ago |
|
Sultan khan
|
030c2a1b8a
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
|
1 month ago |
|
Sultan khan
|
eafb52ab86
|
family file work in-progress
|
1 month ago |
|
Sikander Saleem
|
57827549b8
|
language switch added in drawer, and ui improvements
|
1 month ago |
|
aamir-csol
|
2b7656d83a
|
otp screen & register Uae & resend Activation Code.
|
1 month ago |
|
aamir-csol
|
3ddd7781cd
|
Merge branch 'master' into dev_aamir
|
1 month ago |
|
Sikander Saleem
|
f04f3bcd9c
|
Merge branch 'refs/heads/master' into dev_sikander
|
2 months ago |
|
Sikander Saleem
|
c00e69ef0c
|
profile wallet linked with view model.
|
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 |
|
Sikander Saleem
|
8f0e910e4f
|
profile and settings ui completed.
|
2 months ago |
|
aamir-csol
|
5de8314f3f
|
otp screen & register Uae & resend Activation Code.
|
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 |
|
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 |
|
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 |
|
Sultan khan
|
009fa1859e
|
Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
|
2 months ago |
|
Sultan khan
|
fdd5d4cf6d
|
fixes
|
2 months ago |
|
aamir-csol
|
21a9cc8c89
|
otp screen & register Uae & resend Activation Code.
|
2 months ago |
|
haroon amjad
|
6f745f3666
|
calendar implementation contd.
|
2 months ago |
|
haroon amjad
|
73f8baa77e
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/dependencies.dart
# lib/extensions/string_extensions.dart
# lib/widgets/input_widget.dart
|
2 months ago |
|
aamir-csol
|
6a09c2ec07
|
validations & otp widget & focus & auto fill
|
2 months ago |
|
haroon amjad
|
3066bc8ea3
|
Book appointment implementation contd.
|
2 months ago |
|
aamir-csol
|
b7e19a0af8
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
|
2 months ago |
|
aamir-csol
|
0c58c22ea5
|
sign
|
2 months ago |
|
haroon amjad
|
f812dac059
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
# lib/presentation/home/landing_page.dart
# lib/presentation/lab/lab_orders_page.dart
|
2 months ago |
|
Sultan khan
|
138862b115
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
|
2 months ago |
|
Sultan khan
|
299c0b0e29
|
login flow complete
|
2 months ago |
|
haroon amjad
|
8df38ea6d1
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/extensions/widget_extensions.dart
|
2 months ago |
|
haroon amjad
|
ccd29f0cf9
|
updates
|
2 months ago |
|
Sikander Saleem
|
09e92b8649
|
Merge branch 'refs/heads/master' into dev_sikander
|
2 months ago |
|
Sikander Saleem
|
50c3a8e595
|
collapsing list view added in lab results, search lab results, and shimmer skeleton added for loading
|
2 months ago |
|
Haroon Amjad
|
255b3c1565
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
|
2 months ago |
|
Haroon6138
|
0e76e95636
|
Merge pull request 'dev_sultan' (#20) from dev_sultan into master
Reviewed-on: #20
|
2 months ago |
|
Sultan khan
|
2a081e30b5
|
saved login done.
|
2 months ago |
|
haroon amjad
|
b10523dac3
|
Online CheckIn implementation contd.
|
2 months ago |
|
Sultan khan
|
b4667f5c94
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
|
2 months ago |
|
Sultan khan
|
075578602e
|
Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/features/authentication/authentication_repo.dart
# lib/features/authentication/authentication_view_model.dart
|
2 months ago |
|
Sultan khan
|
a199ca040b
|
quick login inprogress
|
2 months ago |
|
aamir-csol
|
9b063ba764
|
fixes for signup
|
2 months ago |
|
Sikander Saleem
|
60fe32131e
|
Merge branch 'refs/heads/master' into dev_sikander
|
2 months ago |
|
Sikander Saleem
|
dfe02917fc
|
Merge branch 'refs/heads/master' into dev_sikander
|
2 months ago |
|
Haroon Amjad
|
f7d62ed2e8
|
my appointments implementation contd.
|
2 months ago |
|
Haroon Amjad
|
003a161b52
|
custom chips implemented
|
2 months ago |
|
haroon amjad
|
f8be788a60
|
updates & fixes
|
2 months ago |
|
Sikander Saleem
|
0ce43fde5f
|
Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
# assets/images/svg/bell.svg
# lib/widgets/common_bottom_sheet.dart
|
2 months ago |
|
Sikander Saleem
|
cb4601050c
|
prescription reminder bottom sheet added.
|
2 months ago |
|
haroon amjad
|
542de41a82
|
updates & fixes
|
2 months ago |
|
aamir-csol
|
3db3966c06
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/core/app_state.dart
|
2 months ago |
|
aamir-csol
|
484ab56a8e
|
fixes for signup
|
2 months ago |
|
Sultan khan
|
7d5b941df3
|
merged conflict
|
2 months ago |
|
Sultan khan
|
384ac814f8
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/core/app_assets.dart
# lib/core/dependencies.dart
# lib/presentation/lab/lab_orders_page.dart
# lib/widgets/common_bottom_sheet.dart
|
2 months ago |
|
haroon amjad
|
2c45356b07
|
Payment module implementation contd.
|
2 months ago |
|
haroon amjad
|
a0bdc34685
|
My appointments implementation contd.
|
2 months ago |
|
Sultan khan
|
7919d40f65
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/presentation/insurance/insurance_home_page.dart
|
2 months ago |
|
Sultan khan
|
ac17202b7a
|
search lab order updated.
|
2 months ago |
faizatflutter
|
b15ddd1713
|
completed till otp receiving
|
2 months ago |
|
faizatflutter
|
702c504d4e
|
Merge branch 'refs/heads/master' into faiz_dev1
# Conflicts:
# pubspec.yaml
|
2 months ago |
|
faizatflutter
|
db50bd8f23
|
Merge branch 'master' into faiz_dev1
# Conflicts:
# lib/core/api_consts.dart
# lib/core/app_state.dart
# lib/features/authentication/authentication_view_model.dart
# lib/presentation/authentication/login.dart
# lib/presentation/authentication/register.dart
# lib/widgets/bottomsheet/generic_bottom_sheet.dart
# lib/widgets/input_widget.dart
|
2 months ago |
|
faizatflutter
|
84804a59a7
|
completed till otp receiving
|
2 months ago |
|
Sikander Saleem
|
6473ccecb5
|
Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
# lib/core/app_assets.dart
|
2 months ago |
|
Haroon6138
|
24b98626d2
|
Merge pull request 'dev_aamir' (#8) from dev_aamir into master
Reviewed-on: #8
|
2 months ago |
|
haroon amjad
|
2f9fbaef7a
|
insurance update implementation contd.
|
2 months ago |
|
aamir-csol
|
da035650c0
|
Merge branch 'master' into dev_aamir
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/extensions/string_extensions.dart
# lib/generated/locale_keys.g.dart
|
2 months ago |
|
aamir-csol
|
3855ba276f
|
calender & signup fixes.
|
2 months ago |
|
haroon amjad
|
333b813f90
|
bottom sheet fixes
|
2 months ago |
|
Sultan khan
|
2f2a8f3f8f
|
search lab result screen added
|
2 months ago |
|
Sikander Saleem
|
ac0b7bec44
|
custom tab bar added in medical file section.
|
2 months ago |
|
Sikander Saleem
|
85bb00a8fc
|
Merge branch 'refs/heads/master' into dev_sikander
|
2 months ago |
|
Sikander Saleem
|
38d37fd407
|
custom tab bar added.
|
2 months ago |
|
aamir-csol
|
e41ffd583d
|
changes
|
2 months ago |
|
faizatflutter
|
3e50a3c89d
|
Merge branch 'dev_aamir' into faiz_dev1
# Conflicts:
# lib/core/enums.dart
# lib/features/authentication/authentication_view_model.dart
# lib/presentation/authentication/register.dart
# lib/presentation/home/landing_page.dart
|
2 months ago |
|
aamir-csol
|
0309299f44
|
changes
|
2 months ago |
|
aamir-csol
|
cf1908b44a
|
Merge branch 'master' into dev_aamir
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
# lib/theme/colors.dart
|
2 months ago |
|
aamir-csol
|
85fac13314
|
changes
|
2 months ago |
|
Sultan khan
|
886825a4b9
|
bottom navigation updated.
|
2 months ago |