aamir-csol
|
3e5c3a3a27
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/medical_file/medical_file_page.dart
|
1 week ago |
 Haroon6138
|
622851a1a0
|
Merge pull request 'Design Fixes for Responsiveness (faiz_dev)' (#88) from faiz_dev into master
Reviewed-on: #88
|
1 week ago |
faizatflutter
|
8c956fc052
|
Design changes
|
1 week ago |
|
aamir-csol
|
8123981092
|
Merge branch 'master' into dev_aamir
|
2 weeks ago |
|
aamir-csol
|
987fe73128
|
family screen add fixes & remove & switch & widgets
|
2 weeks ago |
|
aamir-csol
|
6f01f92dd0
|
Merge remote-tracking branch 'origin/faiz_dev' into dev_aamir
|
2 weeks ago |
|
aamir-csol
|
02ae79c458
|
Merge branch 'refs/heads/master' into dev_aamir
|
2 weeks ago |
 tahaalam
|
57056e67f3
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# lib/extensions/string_extensions.dart
# lib/widgets/buttons/custom_button.dart
|
2 weeks ago |
|
tahaalam
|
90128a812b
|
call ambulance module design added.
|
2 weeks ago |
|
faizatflutter
|
3e61df218b
|
Some Minor design updated
|
2 weeks ago |
|
faizatflutter
|
72d765e508
|
Design Updates
|
3 weeks 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
|
3 weeks ago |
|
faizatflutter
|
462f4eba14
|
Design Updates
|
3 weeks ago |
|
faizatflutter
|
eabfaf8182
|
Design Updates
|
3 weeks 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
|
3 weeks ago |
|
haroon amjad
|
1f7a941aa0
|
RRT Services implementation contd.
|
3 weeks ago |
|
tahaalam
|
47d158c1e2
|
Merge remote-tracking branch 'origin/master'
|
3 weeks ago |
|
tahaalam
|
c146747e5e
|
nearest er clinic repo viewmodel and view added
|
3 weeks ago |
|
tahaalam
|
d9796154dc
|
Merge remote-tracking branch 'origin/master' into laser_appointment
# Conflicts:
# lib/presentation/book_appointment/select_clinic_page.dart
|
3 weeks ago |
|
haroon amjad
|
d755eb0df8
|
contd.
|
3 weeks 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
|
3 weeks ago |
|
haroon amjad
|
d693850ef4
|
ER services implementation contd.
|
3 weeks ago |
|
tahaalam
|
baf7cf0ea0
|
dental routing fixed and laser exception removed
|
3 weeks ago |
|
tahaalam
|
a7bd5f61cb
|
Merge remote-tracking branch 'origin/master' into feature/lab_result
|
3 weeks ago |
|
tahaalam
|
9e3035f02b
|
units added to lab result and it graph and unwanted values removed from graph
|
3 weeks ago |
|
aamir-csol
|
58e65e7a64
|
Merge branch 'master' into dev_aamir
|
3 weeks ago |
|
aamir-csol
|
cd81372fc6
|
family screen add fixes & remove & switch & widgets
|
3 weeks ago |
|
haroon amjad
|
7a35f0ded6
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
|
3 weeks ago |
|
Haroon6138
|
5227fa6b58
|
Merge pull request 'family screen add fixes & remove & switch & widgets' (#79) from dev_aamir into master
Reviewed-on: #79
|
3 weeks ago |
|
haroon amjad
|
5e1a7652be
|
lab report download implemented
|
3 weeks ago |
|
tahaalam
|
773cc9229b
|
Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
|
3 weeks ago |
|
tahaalam
|
cc458b2ec7
|
files and packages renamed
|
3 weeks ago |
|
tahaalam
|
81a6c7d034
|
files and packages renamed
|
3 weeks ago |
|
haroon amjad
|
e1ac77855c
|
Merge branch 'master' into haroon_dev
|
3 weeks ago |
|
Haroon6138
|
51d225e206
|
Merge pull request 'laser appointment screen added' (#78) from laser_appointment into master
Reviewed-on: #78
|
3 weeks ago |
|
Haroon6138
|
084efb7d32
|
Merge pull request 'lab severity values handled and size of lab description fixed' (#80) from feature/lab_result into master
Reviewed-on: #80
|
3 weeks ago |
|
tahaalam
|
ab74a61969
|
lab severity values handled and size of lab description fixed
|
3 weeks ago |
|
haroon amjad
|
1e08394ba1
|
Lab report PDF implementation contd.
|
3 weeks ago |
|
aamir-csol
|
bf8f98ffb1
|
family screen add fixes & remove & switch & widgets
|
3 weeks ago |
|
tahaalam
|
ea92a0c75c
|
laser appointment screen added
|
3 weeks ago |
|
haroon amjad
|
a2310e1447
|
prescription instructions PDF implemented
|
3 weeks ago |
|
haroon amjad
|
663eda0076
|
updates & fixes
|
3 weeks ago |
|
haroon amjad
|
fe5b6c35ac
|
insurance approval implementation done
|
3 weeks ago |
|
haroon amjad
|
b27e3268b1
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/home/landing_page.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/widgets/chip/app_custom_chip_widget.dart
|
3 weeks ago |
|
haroon amjad
|
25fa1acc9e
|
Medical file widgets, Insurance approval implementation contd.
|
3 weeks ago |
|
aamir-csol
|
24362f67cb
|
family screen & widgets
|
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 |
|
haroon amjad
|
9d48a00b21
|
Merge branch 'master' into haroon_dev
|
4 weeks ago |
|
haroon amjad
|
f1a60a9dfb
|
updates
|
4 weeks ago |