Commit Graph

585 Commits (e35fe9ac0522d15ccb7dba60fbe7178e7d3749aa)
 

Author SHA1 Message Date
haroon amjad d3a8d545b2 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/my_family/widget/family_cards.dart
9 months ago
haroon amjad 8dcc8dfbe3 updates 9 months ago
Haroon6138 5aef8d67de Merge pull request 'Fixed App CustomChip' (#90) from faiz_dev into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/90
9 months ago
faizatflutter f96f3e563c Fixed App CustomChip 9 months ago
haroon amjad 8976f4db9d Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
#	lib/presentation/medical_file/medical_file_page.dart
9 months ago
haroon amjad 2160f87c59 updates 9 months ago
Haroon6138 d0513b7ec6 Merge pull request 'Design Updates (faiz_dev)' (#89) from faiz_dev into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/89
9 months ago
faizatflutter b698b74eb5 Design Updates 9 months ago
Haroon Amjad 2e16622cc3 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/utils/size_utils.dart
#	lib/presentation/home/widgets/large_service_card.dart
10 months ago
faizatflutter dc5eba7d12 refactored code 10 months ago
faizatflutter 28f8aec60f resolved fSize issue 10 months ago
faizatflutter c1971ef287 Merge branch 'refs/heads/master' into faiz_dev 10 months ago
faizatflutter e8c71e96d9 Updated README.md 10 months ago
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
10 months ago
faizatflutter 290dc5c4bb Updated README.md 10 months ago
faizatflutter 495eb13153 Updated README.md 10 months ago
faizatflutter 8c956fc052 Design changes 10 months ago
haroon amjad 487b29fec3 Merge branch 'master' into haroon_dev 10 months ago
Haroon6138 ceb0f1ebb6 Merge pull request 'ambulance_ui' (#87) from ambulance_ui into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/87
10 months ago
tahaalam 57056e67f3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/widgets/buttons/custom_button.dart
10 months ago
tahaalam 90128a812b call ambulance module design added. 10 months ago
faizatflutter f508d441e2 Merge branch 'master' into faiz_dev 10 months ago
faizatflutter 3e61df218b Some Minor design updated 10 months ago
haroon amjad 65220270c2 Size utils & fixes 10 months ago
haroon amjad 3c81cffa75 Merge branch 'master' into haroon_dev 10 months ago
haroon amjad 8a6f94cc1d updates 10 months ago
Haroon6138 83eb57ed9f Merge pull request 'Design Updates (Faiz_Dev)' (#86) from faiz_dev into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/86
10 months ago
faizatflutter 72d765e508 Design Updates 10 months ago
faizatflutter 21be3a2d06 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/book_appointment/laser/widgets/body_part_listing.dart
#	lib/widgets/buttons/custom_button.dart
#	lib/widgets/common_bottom_sheet.dart
#	lib/widgets/input_widget.dart
10 months ago
faizatflutter 462f4eba14 Design Updates 10 months ago
Haroon6138 c36e32470e Merge pull request 'haroon_dev' (#85) from haroon_dev into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/85
10 months ago
haroon amjad 4b52862ba0 updates 10 months ago
faizatflutter eabfaf8182 Design Updates 10 months ago
haroon amjad 1c3ed8f2e1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/features/emergency_services/emergency_services_repo.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/presentation/emergency_services/emergency_services_page.dart
10 months ago
haroon amjad 1f7a941aa0 RRT Services implementation contd. 10 months ago
Haroon6138 916ebf2880 Merge pull request 'nearest er module added' (#84) from nearest_er into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/84
10 months ago
tahaalam d480798053 location dennied forever handled and error builder added to the image network 10 months ago
tahaalam 47d158c1e2 Merge remote-tracking branch 'origin/master' 10 months ago
tahaalam c146747e5e nearest er clinic repo viewmodel and view added 10 months ago
Haroon6138 5505f549fc Merge pull request 'dental routing fixed and laser exception removed' (#82) from laser_appointment into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/82
10 months ago
tahaalam d9796154dc Merge remote-tracking branch 'origin/master' into laser_appointment
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
10 months ago
Haroon6138 97959f7f28 Merge pull request 'haroon_dev' (#83) from haroon_dev into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/83
10 months ago
haroon amjad d755eb0df8 contd. 10 months ago
haroon amjad 0441d072fa Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
#	lib/presentation/lab/lab_result_via_clinic/LabResultByClinic.dart
10 months ago
haroon amjad d693850ef4 ER services implementation contd. 10 months ago
Haroon6138 080b2327ef Merge pull request 'files and packages renamed' (#81) from feature/lab_result into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/81
10 months ago
tahaalam baf7cf0ea0 dental routing fixed and laser exception removed 10 months ago
tahaalam a7bd5f61cb Merge remote-tracking branch 'origin/master' into feature/lab_result 10 months ago
tahaalam 9e3035f02b units added to lab result and it graph and unwanted values removed from graph 10 months ago
haroon amjad 7a35f0ded6 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
10 months ago