Commit Graph

426 Commits (5227fa6b583c7e02e896236704ea25d40f6b4e54)
 

Author SHA1 Message Date
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
1 month ago
taha.alam 2174e0e292 viewmodel and repo updated for the appointment by region selection. 1 month ago
taha.alam 9c2dd721b4 bottom sheets added of region facitlity and hospital. 1 month ago
haroon amjad f9e7c8988a updates 2 months ago
Haroon6138 9d852aa281 Merge pull request 'no message' (#37) from dev_sultan into master
Reviewed-on: #37
2 months ago
Sultan khan b78c78ed8b no message 2 months ago
Haroon6138 a2f60aead1 Merge pull request 'dev_sultan' (#36) from dev_sultan into master
Reviewed-on: #36
2 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
2 months ago
Sultan khan 286dfaa376 no message 2 months ago
Haroon6138 2cc331c1c8 Merge pull request 'dev_aamir' (#35) from dev_aamir into master
Reviewed-on: #35
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
Haroon6138 62b103e233 Merge pull request 'haroon_dev' (#34) from haroon_dev into master
Reviewed-on: #34
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
aamir-csol 87830e17ab otp screen 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
haroon amjad 7476c8e55a book appo implementation contd. 2 months ago
Haroon6138 e5b3704863 Merge pull request 'dev_sikander' (#31) from dev_sikander into master
Reviewed-on: #31
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
Haroon6138 cc6a48c52b Merge pull request 'haroon_dev' (#30) from haroon_dev into master
Reviewed-on: #30
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 1c39b26fcc Merge branch 'master' into haroon_dev 2 months ago
Haroon6138 ac80634155 Merge pull request 'dev_aamir' (#29) from dev_aamir into master
Reviewed-on: #29
2 months ago
haroon amjad 151351c0bf medical file updates 2 months ago
aamir-csol 7c8d7b67a9 signup finalize 2 months ago
aamir-csol b7e19a0af8 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
2 months ago
aamir-csol 0c58c22ea5 sign 2 months ago
Haroon6138 9aadb37a2b Merge pull request 'haroon_dev' (#28) from haroon_dev into master
Reviewed-on: #28
2 months ago
Haroon Amjad 5620cc4442 medical file implementation contd. 2 months ago
haroon amjad d87562caf5 updates 2 months ago
haroon amjad 3a649bca35 Merge branch 'master' into haroon_dev 2 months ago
Haroon6138 335d51a04a Merge pull request 'dev_aamir' (#27) from dev_aamir into master
Reviewed-on: #27
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 70810fa14c signup completed 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