Commit Graph

46 Commits (c553876c8a0021d2a60bfce530c45adab021e1ee)

Author SHA1 Message Date
Sultan khan 8f8c4c7f65 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
1 month ago
haroon amjad 6048b3b5f1 Advance payment module implementation contd. 1 month ago
aamir-csol a79dcad221 family screen & widgets 1 month ago
Haroon Amjad c9206f1ab8 Radiology report implemented 1 month ago
Sikander Saleem f04f3bcd9c Merge branch 'refs/heads/master' into dev_sikander 1 month ago
Sikander Saleem 8f0e910e4f profile and settings ui completed. 1 month 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
1 month ago
taha.alam 2174e0e292 viewmodel and repo updated for the appointment by region selection. 1 month ago
Sultan khan b78c78ed8b no message 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
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 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 1de551e799 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/features/authentication/authentication_view_model.dart
2 months ago
Sikander Saleem f9859036ef ui improvements. 2 months ago
haroon amjad 01b6ab0e4b habib wallet implementation contd. 2 months ago
haroon amjad 851bd569b4 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/presentation/prescriptions/prescription_detail_page.dart
2 months ago
haroon amjad e37eb78f81 my appointments changes implementation contd. 2 months ago
Sikander Saleem 60fe32131e Merge branch 'refs/heads/master' into dev_sikander 2 months ago
Sikander Saleem d464721733 merge conflict fixed. 2 months ago
Haroon Amjad f7d62ed2e8 my appointments implementation contd. 2 months ago
Sultan khan 8511d0aa65 no message 2 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
2 months ago
Sultan khan ba2c8327fe login flow inprogress 2 months ago
Haroon Amjad c27ba6ef09 my appointments implementation contd. 2 months ago
haroon amjad a0bdc34685 My appointments implementation contd. 2 months ago
Sikander Saleem 6473ccecb5 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/core/app_assets.dart
2 months ago
haroon amjad 2f9fbaef7a insurance update implementation contd. 2 months ago
haroon amjad e8cc6407b6 Insurance update implementation contd. 2 months ago
Sikander Saleem ac0b7bec44 custom tab bar added in medical file section. 2 months ago
haroon amjad efb22aec4e prescription details page implemented 2 months ago
haroon amjad 712e11c69a prescription details page implementation contd. 2 months ago
haroon amjad 8bc49929d4 prescription orders list page implemented 2 months ago
haroon amjad 4c241b0dac Lab orders implemented 2 months ago
Sultan khan fe8c1120a8 assets added 2 months ago
haroon amjad e044fc8c5e lab implementation contd. 2 months ago
haroon amjad 89456bc2aa Medical File Insurance tab content done 2 months ago
haroon amjad 22e9fb738b assets added 2 months ago
haroon amjad 4ecbcb9332 Homepage & medical implementation contd. 2 months ago
Haroon Amjad 0a39a00df5 Landing page updates 2 months ago
aamir-csol 4e3ba99280 widgets & fixes 2 months ago
Haroon Amjad 2293db00ea updates 2 months ago