 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
|
3 weeks ago |
|
haroon amjad
|
1f7a941aa0
|
RRT Services implementation contd.
|
3 weeks ago |
 tahaalam
|
c146747e5e
|
nearest er clinic repo viewmodel and view added
|
3 weeks ago |
|
haroon amjad
|
d693850ef4
|
ER services implementation contd.
|
3 weeks ago |
|
tahaalam
|
ea92a0c75c
|
laser appointment screen added
|
3 weeks ago |
aamir-csol
|
aaa8222b1a
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/core/api/api_client.dart
# lib/core/app_assets.dart
# lib/features/medical_file/medical_file_repo.dart
# lib/features/medical_file/medical_file_view_model.dart
# lib/presentation/home/landing_page.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/presentation/profile_settings/profile_settings.dart
# lib/widgets/chip/app_custom_chip_widget.dart
|
4 weeks ago |
|
aamir-csol
|
d918b6e464
|
family screen & widgets
|
4 weeks ago |
|
tahaalam
|
483a1571d9
|
Merge remote-tracking branch 'origin/master' into appointment_filter
# Conflicts:
# assets/langs/ar-SA.json
# lib/generated/locale_keys.g.dart
# lib/presentation/lab/lab_orders_page.dart
# lib/presentation/lab/lab_results/lab_result_details.dart
|
4 weeks ago |
|
tahaalam
|
6cf08c04d2
|
appointment filters added.
|
4 weeks ago |
|
tahaalam
|
641df8b51b
|
logs removed
|
4 weeks ago |
|
tahaalam
|
36bf229787
|
Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/core/api/api_client.dart
# lib/generated/locale_keys.g.dart
# lib/presentation/lab/lab_results/lab_result_details.dart
|
4 weeks ago |
|
haroon amjad
|
8166369f85
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/app_assets.dart
# lib/widgets/input_widget.dart
|
4 weeks ago |
|
haroon amjad
|
8a7f46441c
|
updates
|
4 weeks ago |
|
tahaalam
|
6ef9ae813d
|
doctors search filter added
|
4 weeks ago |
|
haroon amjad
|
3418480122
|
Immediate LiveCare implementation completed
|
4 weeks ago |
|
haroon amjad
|
10b77206f6
|
Immediate LiveCare consultation implementation contd.
|
1 month ago |
|
tahaalam
|
da89c41925
|
lab result by hospital and translations are added
|
1 month ago |
|
haroon amjad
|
2f4d6f5553
|
immediate livecare consultation implementation contd.
|
1 month ago |
|
aamir-csol
|
e5488299b8
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/extensions/string_extensions.dart
# lib/presentation/my_family/widget/family_cards.dart
# lib/widgets/chip/app_custom_chip_widget.dart
# lib/widgets/common_bottom_sheet.dart
|
1 month ago |
|
aamir-csol
|
1335d3a7c8
|
family screen & widgets
|
1 month ago |
|
aamir-csol
|
060e7a8d68
|
Merge branch 'master' into dev_aamir
|
1 month ago |
|
aamir-csol
|
288a0018ce
|
family screen & widgets
|
1 month ago |
|
haroon amjad
|
5f43063f2d
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/app_assets.dart
|
1 month ago |
|
tahaalam
|
512628fb8b
|
Lab result view along with the listing of items is added
|
1 month ago |
Haroon Amjad
|
62e82a7a31
|
Empty data state implementation contd.
|
1 month ago |
|
haroon amjad
|
a07369165d
|
Updates
|
1 month ago |
|
haroon amjad
|
f7e26da6f4
|
Merge branch 'master' into haroon_dev
|
1 month ago |
|
haroon amjad
|
344ecaba18
|
LiveCare Schedule implementation done
|
1 month ago |
 Sikander Saleem
|
604e503e52
|
flow improvement & translation added.
|
1 month ago |
|
Sikander Saleem
|
c553876c8a
|
Merge branch 'refs/heads/master' into dev_sikander
|
1 month ago |
|
Haroon6138
|
938d95cb06
|
Merge pull request 'feature/search_by_region' (#55) from feature/search_by_region into master
Reviewed-on: #55
|
1 month ago |
Sultan khan
|
6d85227f11
|
lab order by test
|
1 month ago |
taha.alam
|
7093a26cb8
|
selection region arabic handling
|
1 month ago |
|
Sikander Saleem
|
005157fe5e
|
Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
# lib/presentation/habib_wallet/recharge_wallet_page.dart
# lib/presentation/lab/lab_orders_page.dart
# lib/splashPage.dart
|
1 month ago |
|
Sikander Saleem
|
12cef74f16
|
splash animation added.
|
1 month ago |
|
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
|
3e95999bf3
|
Merge branch 'master' into haroon_dev
|
1 month ago |
|
haroon amjad
|
6048b3b5f1
|
Advance payment module implementation contd.
|
1 month ago |
|
aamir-csol
|
a79dcad221
|
family screen & widgets
|
1 month ago |
|
aamir-csol
|
8240d3e78d
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/authentication/register_step2.dart
|
1 month ago |
|
Haroon Amjad
|
c9206f1ab8
|
Radiology report implemented
|
1 month ago |
|
aamir-csol
|
17c47d093c
|
otp screen & register Uae & resend Activation Code.
|
1 month ago |
|
Sikander Saleem
|
bb0ac4a0fe
|
Merge branch 'refs/heads/master' into dev_sikander
|
1 month ago |
|
aamir-csol
|
2b7656d83a
|
otp screen & register Uae & resend Activation Code.
|
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 |
|
aamir-csol
|
5de8314f3f
|
otp screen & register Uae & resend Activation Code.
|
1 month 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
|
1 month ago |
|
aamir-csol
|
15c07cb4e2
|
otp screen & register Uae & resend Activation Code.
|
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 |