 Haroon6138
|
25f0b9d415
|
Merge pull request 'haroon_dev' (#49) from haroon_dev into master
Reviewed-on: #49
|
1 month ago |
|
haroon amjad
|
3b5d2d27a4
|
Updates
|
1 month ago |
 Sikander Saleem
|
99e1036043
|
ui improvement.
|
1 month ago |
|
haroon amjad
|
4f4bef9d6f
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/home/landing_page.dart
|
1 month ago |
|
haroon amjad
|
5e81ba1ed8
|
updates
|
1 month ago |
|
Sikander Saleem
|
57827549b8
|
language switch added in drawer, and ui improvements
|
1 month ago |
|
haroon amjad
|
c191fd0be1
|
updates
|
1 month ago |
|
Sikander Saleem
|
c00e69ef0c
|
profile wallet linked with view model.
|
1 month ago |
|
Sikander Saleem
|
c83754fc4a
|
user profile welcome widget improvement.
|
1 month 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 |
|
haroon amjad
|
9f95150a94
|
book appointment implementation completed.
|
2 months ago |
|
Sultan khan
|
fdd5d4cf6d
|
fixes
|
2 months ago |
|
haroon amjad
|
3066bc8ea3
|
Book appointment implementation contd.
|
2 months ago |
Haroon Amjad
|
b240293064
|
medical file implementation contd.
|
2 months ago |
|
Haroon Amjad
|
5620cc4442
|
medical file implementation contd.
|
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
|
299c0b0e29
|
login flow complete
|
2 months ago |
|
haroon amjad
|
ccd29f0cf9
|
updates
|
2 months ago |
|
Sultan khan
|
58d33e2dae
|
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
# lib/presentation/home/landing_page.dart
|
2 months ago |
|
Sultan khan
|
1466b6b71a
|
no message
|
2 months ago |
|
Haroon Amjad
|
6b2ec5aa2c
|
updates, fixes & service privileges
|
2 months ago |
|
Sultan khan
|
2a081e30b5
|
saved login done.
|
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 |
|
haroon amjad
|
f8be788a60
|
updates & fixes
|
2 months ago |
|
haroon amjad
|
542de41a82
|
updates & fixes
|
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 |
|
Sultan khan
|
ba2c8327fe
|
login flow inprogress
|
2 months ago |
|
haroon amjad
|
a0bdc34685
|
My appointments implementation contd.
|
2 months ago |
|
Haroon Amjad
|
43fa08b8b6
|
insurance update update
|
2 months ago |
|
haroon amjad
|
d794787459
|
updates
|
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 |
|
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 |
|
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 |
|
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 |
|
faizatflutter
|
6e05ca15cf
|
adding the login function
|
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 |
|
faizatflutter
|
32fadb8ad9
|
completed login function
|
2 months ago |
|
Sultan khan
|
0de09dd72c
|
no message
|
2 months ago |
|
aamir-csol
|
7321da67e3
|
register step 2 & fixes
|
2 months ago |
|
aamir-csol
|
ed24365eff
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/home/landing_page.dart
# lib/theme/colors.dart
|
2 months ago |