Commit Graph

65 Commits (f96f3e563cb144e6f4f231194822950a0c04897a)

Author SHA1 Message Date
Haroon6138 622851a1a0 Merge pull request 'Design Fixes for Responsiveness (faiz_dev)' (#88) from faiz_dev into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/88
8 months ago
faizatflutter 8c956fc052 Design changes 8 months ago
tahaalam 57056e67f3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/widgets/buttons/custom_button.dart
8 months ago
tahaalam 90128a812b call ambulance module design added. 8 months ago
faizatflutter eabfaf8182 Design Updates 8 months ago
haroon amjad fe5b6c35ac insurance approval implementation done 9 months ago
aamir-csol 9e8011c34c family screen & widgets 9 months ago
Haroon6138 938d95cb06 Merge pull request 'feature/search_by_region' (#55) from feature/search_by_region into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/55
9 months ago
taha.alam 27a0632d6d directional padding and alignment 9 months ago
aamir-csol a79dcad221 family screen & widgets 9 months ago
aamir-csol 8240d3e78d Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/authentication/register_step2.dart
9 months ago
haroon amjad 3b5d2d27a4 Updates 9 months ago
aamir-csol 17c47d093c otp screen & register Uae & resend Activation Code. 9 months ago
Sikander Saleem bb0ac4a0fe Merge branch 'refs/heads/master' into dev_sikander 9 months ago
aamir-csol 2b7656d83a otp screen & register Uae & resend Activation Code. 9 months ago
Sikander Saleem f04f3bcd9c Merge branch 'refs/heads/master' into dev_sikander 9 months ago
Sikander Saleem c83754fc4a user profile welcome widget improvement. 9 months ago
Sikander Saleem 8f0e910e4f profile and settings ui completed. 9 months ago
aamir-csol 5de8314f3f otp screen & register Uae & resend Activation Code. 9 months ago
Sikander Saleem e17d207ce5 swiper carousal view added in profile settings 9 months ago
Sikander Saleem 50c3a8e595 collapsing list view added in lab results, search lab results, and shimmer skeleton added for loading 10 months ago
Sikander Saleem 7cc12bd1cf prescription calender reminder added. 10 months ago
Sikander Saleem 60fe32131e Merge branch 'refs/heads/master' into dev_sikander 10 months ago
Sikander Saleem dfe02917fc Merge branch 'refs/heads/master' into dev_sikander 10 months ago
Haroon Amjad f7d62ed2e8 my appointments implementation contd. 10 months ago
Haroon Amjad 003a161b52 custom chips implemented 10 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
10 months ago
Sikander Saleem cb4601050c prescription reminder bottom sheet added. 10 months ago
haroon amjad 542de41a82 updates & fixes 10 months ago
aamir-csol 3db3966c06 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/app_state.dart
10 months ago
aamir-csol 484ab56a8e fixes for signup 10 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
10 months ago
Sultan khan ba2c8327fe login flow inprogress 10 months ago
haroon amjad a0bdc34685 My appointments implementation contd. 10 months ago
faizatflutter 702c504d4e Merge branch 'refs/heads/master' into faiz_dev1
# Conflicts:
#	pubspec.yaml
10 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
10 months ago
haroon amjad 2d5f2b1deb updates 10 months ago
Sikander Saleem d385d0362f merge changes 10 months ago
Sikander Saleem 6473ccecb5 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/core/app_assets.dart
10 months ago
aamir-csol c27d7301d9 calender & signup fixes. 10 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
10 months ago
Sikander Saleem 85bb00a8fc Merge branch 'refs/heads/master' into dev_sikander 10 months ago
Sikander Saleem 38d37fd407 custom tab bar added. 10 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
10 months ago
aamir-csol 85fac13314 changes 10 months ago
Sultan khan 886825a4b9 bottom navigation updated. 10 months ago
faizatflutter 32fadb8ad9 completed login function 10 months ago
aamir-csol 7321da67e3 register step 2 & fixes 10 months ago
aamir-csol ed24365eff Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart
10 months ago
Haroon Amjad f5e655fd35 Lab order API implemented 10 months ago