 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
|
fe8c1120a8
|
assets added
|
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
|
97c30874b2
|
Merge remote-tracking branch 'origin/dev_sultan' into dev_sultan
|
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 |
|
Sultan khan
|
d87402ae00
|
bottom navigation
|
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 |
|
haroon amjad
|
22e9fb738b
|
assets added
|
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 |
|
Haroon6138
|
6c99f63588
|
Merge pull request 'faiz_dev1' (#3) from faiz_dev1 into master
Reviewed-on: #3
|
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 |