Commit Graph

59 Commits (2cc331c1c8f7aeb5896793d6c5935acf0b2510f0)

Author SHA1 Message Date
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
9 months ago
aamir-csol 4e17ff9c82 otp screen & register Uae & resend Activation Code. 9 months ago
haroon amjad 9f95150a94 book appointment implementation completed. 9 months ago
aamir-csol 21a9cc8c89 otp screen & register Uae & resend Activation Code. 9 months ago
aamir-csol 6a09c2ec07 validations & otp widget & focus & auto fill 9 months ago
Haroon Amjad 7b94199d58 Medical report implementation done, Book Appointment implementation contd. 9 months ago
Haroon Amjad de717edfe8 Sickleave implementation done. 9 months ago
aamir-csol 7c8d7b67a9 signup finalize 9 months ago
haroon amjad d87562caf5 updates 9 months ago
haroon amjad 3a649bca35 Merge branch 'master' into haroon_dev 9 months ago
aamir-csol 8c55064158 signup completed 9 months ago
haroon amjad ccd29f0cf9 updates 9 months ago
aamir-csol 7dcc827721 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
9 months ago
aamir-csol cd48d83c07 signup 9 months ago
Haroon Amjad 6b2ec5aa2c updates, fixes & service privileges 9 months ago
Haroon Amjad 255b3c1565 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
9 months ago
Haroon6138 0e76e95636 Merge pull request 'dev_sultan' (#20) from dev_sultan into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/20
9 months ago
Sultan khan 2a081e30b5 saved login done. 9 months ago
haroon amjad b10523dac3 Online CheckIn implementation contd. 9 months ago
aamir-csol c129eb2c2f Merge branch 'master' into dev_aamir 9 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
9 months ago
aamir-csol 9b063ba764 fixes for signup 9 months ago
Sikander Saleem 7cc12bd1cf prescription calender reminder added. 9 months ago
Sikander Saleem 60fe32131e Merge branch 'refs/heads/master' into dev_sikander 9 months ago
Sikander Saleem dfe02917fc Merge branch 'refs/heads/master' into dev_sikander 9 months ago
Sikander Saleem d464721733 merge conflict fixed. 9 months ago
Haroon Amjad f7d62ed2e8 my appointments implementation contd. 9 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
9 months ago
Sikander Saleem cb4601050c prescription reminder bottom sheet added. 9 months ago
haroon amjad 542de41a82 updates & fixes 9 months ago
aamir-csol 3db3966c06 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/app_state.dart
9 months ago
aamir-csol 484ab56a8e fixes for signup 9 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
9 months ago
haroon amjad 2c45356b07 Payment module implementation contd. 9 months ago
Haroon Amjad c27ba6ef09 my appointments implementation contd. 9 months ago
haroon amjad a0bdc34685 My appointments implementation contd. 9 months ago
aamir-csol 52fddc5323 login flow completion 9 months ago
haroon amjad d794787459 updates 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
Sikander Saleem d385d0362f merge changes 10 months ago
faizatflutter 84804a59a7 completed till otp receiving 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
haroon amjad cce7c7166d Merge branch 'dev_sultan'
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
10 months ago
Sultan khan 2f2a8f3f8f search lab result screen added 10 months ago
haroon amjad efb22aec4e prescription details page implemented 10 months ago
faizatflutter 6e05ca15cf adding the login function 10 months ago
faizatflutter 32fadb8ad9 completed login function 10 months ago
aamir-csol d1e1154bdb changes 10 months ago
faizatflutter 1af571705a Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/home/landing_page.dart
10 months ago