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 |
aamir-csol
|
4e17ff9c82
|
otp screen & register Uae & resend Activation Code.
|
2 months ago |
haroon amjad
|
9f95150a94
|
book appointment implementation completed.
|
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
|
2aa84e0334
|
book appointment implementation contd.
|
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 |
Haroon6138
|
f15018b0e8
|
Merge pull request 'validations & otp widget & focus & auto fill' (#32) from dev_aamir into master
Reviewed-on: #32
|
2 months ago |
aamir-csol
|
6a09c2ec07
|
validations & otp widget & focus & auto fill
|
2 months ago |
Sikander Saleem
|
a25f42a43d
|
Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
# pubspec.yaml
|
2 months ago |
Sikander Saleem
|
e17d207ce5
|
swiper carousal view added in profile settings
|
2 months ago |
haroon amjad
|
3066bc8ea3
|
Book appointment implementation contd.
|
2 months ago |
Haroon Amjad
|
7b94199d58
|
Medical report implementation done, Book Appointment implementation contd.
|
2 months ago |
Haroon Amjad
|
14725616c6
|
medical report implementation contd.
|
2 months ago |
Haroon Amjad
|
de717edfe8
|
Sickleave implementation done.
|
2 months ago |
Haroon Amjad
|
b240293064
|
medical file implementation contd.
|
2 months ago |
haroon amjad
|
151351c0bf
|
medical file updates
|
2 months ago |
Haroon Amjad
|
5620cc4442
|
medical file implementation contd.
|
2 months ago |
haroon amjad
|
3a649bca35
|
Merge branch 'master' into haroon_dev
|
2 months ago |
aamir-csol
|
6f011880bd
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/core/api_consts.dart
# lib/features/authentication/authentication_view_model.dart
|
2 months ago |
haroon amjad
|
9fbb8c3418
|
updates
|
2 months ago |
aamir-csol
|
2b18e08e64
|
signup completed
|
2 months ago |
aamir-csol
|
8c55064158
|
signup completed
|
2 months ago |
haroon amjad
|
41ca0e27d9
|
updates
|
2 months ago |
haroon amjad
|
1de551e799
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/app_assets.dart
# lib/features/authentication/authentication_view_model.dart
|
2 months ago |
haroon amjad
|
28da6e0a2c
|
updates
|
2 months ago |
Sikander Saleem
|
c6a5b49af8
|
Merge branch 'refs/heads/master' into dev_sikander
|
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 |
haroon amjad
|
4269e99be9
|
updates
|
2 months ago |
Haroon6138
|
4cdcf495ea
|
Merge pull request 'dev_sultan' (#24) from dev_sultan into master
Reviewed-on: #24
|
2 months ago |
Sikander Saleem
|
f9859036ef
|
ui improvements.
|
2 months ago |
Sikander Saleem
|
118c6717b1
|
report and logout actions button added.
|
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
|
01b6ab0e4b
|
habib wallet implementation contd.
|
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 |
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 |
aamir-csol
|
7dcc827721
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
|
2 months ago |
aamir-csol
|
cd48d83c07
|
signup
|
2 months ago |
Haroon Amjad
|
6b2ec5aa2c
|
updates, fixes & service privileges
|
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 |