 Sikander Saleem
|
dfe02917fc
|
Merge branch 'refs/heads/master' into dev_sikander
|
2 months ago |
|
Sikander Saleem
|
d464721733
|
merge conflict fixed.
|
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 |
|
haroon amjad
|
2d0fc11f05
|
updates
|
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 |
|
Sultan khan
|
ba2c8327fe
|
login flow inprogress
|
2 months ago |
|
haroon amjad
|
2c45356b07
|
Payment module implementation contd.
|
2 months ago |
|
Haroon Amjad
|
c27ba6ef09
|
my appointments implementation contd.
|
2 months ago |
|
haroon amjad
|
a0bdc34685
|
My appointments implementation contd.
|
2 months ago |
|
Sultan khan
|
61d10068ca
|
Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
|
2 months ago |
|
aamir-csol
|
4e1912048d
|
login flow completion
|
2 months ago |
|
aamir-csol
|
52fddc5323
|
login flow completion
|
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 |
|
Haroon Amjad
|
43fa08b8b6
|
insurance update update
|
2 months ago |
|
haroon amjad
|
d794787459
|
updates
|
2 months ago |
faizatflutter
|
b15ddd1713
|
completed till otp receiving
|
2 months ago |
|
faizatflutter
|
36c41d40f8
|
Merge branch 'master' into faiz_dev
|
2 months ago |
|
haroon amjad
|
bafeb68950
|
medical file changes
|
2 months ago |
|
faizatflutter
|
26f0ffda2c
|
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 |
|
haroon amjad
|
2d5f2b1deb
|
updates
|
2 months ago |
|
Sikander Saleem
|
0db18c789c
|
Merge branch 'refs/heads/master' into dev_sikander
|
2 months ago |
|
Sikander Saleem
|
d385d0362f
|
merge changes
|
2 months ago |
|
faizatflutter
|
923f7d7781
|
completed till otp receiving
|
2 months ago |
|
faizatflutter
|
84804a59a7
|
completed till otp receiving
|
2 months ago |
|
Sultan khan
|
3cafc16d50
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
|
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 |
|
aamir-csol
|
c27d7301d9
|
calender & signup fixes.
|
2 months ago |
|
Sultan khan
|
29aae34726
|
lab search added
|
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 |
|
haroon amjad
|
cce7c7166d
|
Merge branch 'dev_sultan'
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
|
2 months ago |
|
haroon amjad
|
e8cc6407b6
|
Insurance update implementation contd.
|
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 |
|
haroon amjad
|
efb22aec4e
|
prescription details page implemented
|
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 |
|
faizatflutter
|
6e05ca15cf
|
adding the login function
|
2 months ago |
|
Haroon Amjad
|
e8f8f6074c
|
prescription details updates
|
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 |
|
Haroon Amjad
|
cd61d08d49
|
Merge branch 'dev_sultan'
|
2 months ago |
|
haroon amjad
|
712e11c69a
|
prescription details page implementation contd.
|
2 months ago |
|
Sultan khan
|
886825a4b9
|
bottom navigation updated.
|
2 months ago |
|
faizatflutter
|
32fadb8ad9
|
completed login function
|
2 months ago |
|
haroon amjad
|
8bc49929d4
|
prescription orders list page implemented
|
2 months ago |
|
haroon amjad
|
6f07bc7c2c
|
Radiology Orders implemented
|
2 months ago |
|
haroon amjad
|
4c241b0dac
|
Lab orders implemented
|
2 months ago |
|
Sultan khan
|
0de09dd72c
|
no message
|
2 months ago |
|
Sultan khan
|
39c284d036
|
Merge remote-tracking branch 'origin/master' into dev_sultan
# Conflicts:
# lib/presentation/home/landing_page.dart
|
2 months ago |
|
Sultan khan
|
f55d82ddb3
|
bottom navigation
|
2 months ago |
|
Haroon Amjad
|
36c6f0d541
|
Landing page updates
|
2 months ago |
|
Haroon Amjad
|
2b22e17743
|
android fixes
|
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 |
|
Haroon Amjad
|
f5e655fd35
|
Lab order API implemented
|
2 months ago |
|
Haroon Amjad
|
a77fc49c68
|
lab result changes
|
2 months ago |
|
haroon amjad
|
e044fc8c5e
|
lab implementation contd.
|
2 months ago |
|
haroon amjad
|
89456bc2aa
|
Medical File Insurance tab content done
|
2 months ago |
|
faizatflutter
|
488636a13f
|
Merge branch 'dev_aamir' into faiz_dev1
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
|
2 months ago |
|
faizatflutter
|
a0e5aeda05
|
Merge branch 'master' into faiz_dev1
|
2 months ago |
|
faizatflutter
|
572fcef0f1
|
checkUserAuth
|
2 months ago |
|
aamir-csol
|
d1e1154bdb
|
changes
|
2 months ago |
|
aamir-csol
|
23a4035117
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/main.dart
# lib/presentation/home/landing_page.dart
# lib/theme/colors.dart
# lib/widgets/buttons/custom_button.dart
|
2 months ago |
|
aamir-csol
|
67e580447e
|
changes
|
2 months ago |
|
haroon amjad
|
9b1c3fe920
|
medical file updates
|
2 months ago |
|
faizatflutter
|
c6a95fe7d7
|
latest push after master merged
|
2 months ago |
|
faizatflutter
|
1af571705a
|
Merge branch 'master' into faiz_dev1
# Conflicts:
# lib/core/utils/utils.dart
# lib/presentation/home/landing_page.dart
|
2 months ago |
|
faizatflutter
|
9509d4a192
|
completed the deviceapi with new architecture
|
2 months ago |
|
haroon amjad
|
4ecbcb9332
|
Homepage & medical implementation contd.
|
2 months ago |
|
faizatflutter
|
6bc7af00bc
|
completed the deviceapi with new architecture
|
2 months ago |
|
aamir-csol
|
8f1e4500cc
|
register & Exception bottom sheet, country dropdown.
|
2 months ago |
|
aamir-csol
|
5e292544d7
|
Merge remote-tracking branch 'origin/faiz_dev1' into dev_aamir
# Conflicts:
# lib/main.dart
# lib/presentation/authentication/register.dart
# lib/providers/authentication_view_model.dart
|
2 months ago |
|
faizatflutter
|
89e9323d9e
|
merged master and updated structure
|
2 months ago |
|
faizatflutter
|
e2b0930dd1
|
Merge branch 'master' into faiz_dev1
# Conflicts:
# ios/Podfile.lock
# lib/core/app_state.dart
# lib/main.dart
# lib/presentation/authentication/login.dart
# lib/presentation/home/landing_page.dart
# pubspec.yaml
|
2 months ago |
|
faizatflutter
|
c1221e4970
|
pushed device api
|
2 months ago |
|
aamir-csol
|
6f98690929
|
register & changes
|
2 months ago |
|
Sultan khan
|
4e010bb2cf
|
initial commit
|
2 months ago |
|
aamir-csol
|
9c52a6122f
|
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
# lib/presentation/authantication/login.dart
|
2 months ago |
|
aamir-csol
|
a4da9db6c3
|
register & changes
|
2 months ago |
|
Haroon Amjad
|
0a39a00df5
|
Landing page updates
|
2 months ago |
|
Sultan khan
|
d3aff9f93d
|
updating structure
|
2 months ago |
|
aamir-csol
|
8ed8637108
|
Merge branch 'refs/heads/master' into dev_aamir
# Conflicts:
# lib/presentation/authantication/login.dart
|
2 months ago |