Commit Graph

133 Commits (5de8314f3fd8293849e55b5514451facc05d253b)

Author SHA1 Message Date
aamir-csol 5de8314f3f otp screen & register Uae & resend Activation Code. 9 months ago
aamir-csol b9b0dfd1fa Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
9 months ago
aamir-csol 15c07cb4e2 otp screen & register Uae & resend Activation Code. 9 months ago
haroon amjad 71a07eed8e Merge branch 'master' into haroon_dev 9 months ago
taha.alam 788887a7f1 Merge remote-tracking branch 'origin/master' into feature/search_by_region
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/app_assets.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/book_appointment/book_appointment_page.dart
#	lib/presentation/home/navigation_screen.dart
9 months ago
taha.alam 2174e0e292 viewmodel and repo updated for the appointment by region selection. 9 months ago
haroon amjad f9e7c8988a updates 9 months ago
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
9 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
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
Sultan khan 009fa1859e Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 9 months ago
Sultan khan fdd5d4cf6d fixes 9 months ago
aamir-csol 21a9cc8c89 otp screen & register Uae & resend Activation Code. 9 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
9 months ago
Haroon6138 f15018b0e8 Merge pull request 'validations & otp widget & focus & auto fill' (#32) from dev_aamir into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/32
9 months ago
aamir-csol 6a09c2ec07 validations & otp widget & focus & auto fill 9 months ago
Sikander Saleem a25f42a43d Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	pubspec.yaml
9 months ago
Sikander Saleem e17d207ce5 swiper carousal view added in profile settings 9 months ago
haroon amjad 3066bc8ea3 Book appointment implementation contd. 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
Haroon Amjad b240293064 medical file implementation contd. 10 months ago
haroon amjad 1c39b26fcc Merge branch 'master' into haroon_dev 10 months ago
haroon amjad 151351c0bf medical file updates 10 months ago
aamir-csol 7c8d7b67a9 signup finalize 10 months ago
Haroon Amjad 5620cc4442 medical file implementation contd. 10 months ago
haroon amjad d87562caf5 updates 10 months ago
haroon amjad 3a649bca35 Merge branch 'master' into haroon_dev 10 months ago
aamir-csol 6f011880bd Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api_consts.dart
#	lib/features/authentication/authentication_view_model.dart
10 months ago
aamir-csol 8c55064158 signup completed 10 months ago
haroon amjad 1de551e799 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/features/authentication/authentication_view_model.dart
10 months ago
haroon amjad 28da6e0a2c updates 10 months ago
Sikander Saleem c6a5b49af8 Merge branch 'refs/heads/master' into dev_sikander 10 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
10 months ago
Sikander Saleem f9859036ef ui improvements. 10 months ago
Sultan khan 299c0b0e29 login flow complete 10 months ago
haroon amjad 01b6ab0e4b habib wallet implementation contd. 10 months ago
haroon amjad ccd29f0cf9 updates 10 months ago
aamir-csol 7dcc827721 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
10 months ago
aamir-csol cd48d83c07 signup 10 months ago
Haroon Amjad 6b2ec5aa2c updates, fixes & service privileges 10 months ago
Haroon Amjad 255b3c1565 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
10 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
10 months ago
Sultan khan 2a081e30b5 saved login done. 10 months ago
haroon amjad b10523dac3 Online CheckIn implementation contd. 10 months ago
haroon amjad 851bd569b4 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/presentation/prescriptions/prescription_detail_page.dart
10 months ago
haroon amjad e37eb78f81 my appointments changes implementation contd. 10 months ago
aamir-csol c129eb2c2f Merge branch 'master' into dev_aamir 10 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
10 months ago