faizatflutter
|
34f4cd4f91
|
Merge branch 'refs/heads/master' into faiz_dev
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
# lib/presentation/home/landing_page.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/routes/app_routes.dart
# lib/widgets/appbar/collapsing_list_view.dart
|
1 month ago |
aamir-csol
|
0f17a655ed
|
Merge branch 'master' into dev_aamir
# Conflicts:
# ios/Runner/AppDelegate.swift
# lib/core/dependencies.dart
# lib/core/utils/utils.dart
# lib/features/emergency_services/emergency_services_view_model.dart
# lib/presentation/authentication/quick_login.dart
# lib/presentation/emergency_services/RRT/rrt_request_type_select.dart
# lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
# lib/presentation/emergency_services/call_ambulance/requesting_services_page.dart
# lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
# lib/presentation/emergency_services/emergency_services_page.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/presentation/my_family/widget/family_cards.dart
# lib/widgets/appbar/collapsing_list_view.dart
# lib/widgets/common_bottom_sheet.dart
|
1 month ago |
faizatflutter
|
757ace2ba1
|
Added Organ Selector
|
2 months ago |
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
|
2 months ago |
haroon amjad
|
8dcc8dfbe3
|
updates
|
2 months ago |
faizatflutter
|
f96f3e563c
|
Fixed App CustomChip
|
2 months ago |
haroon amjad
|
2160f87c59
|
updates
|
2 months ago |
aamir-csol
|
e113c4c1ee
|
updates & fixes & RRT Flow
|
3 months ago |
aamir-csol
|
987fe73128
|
family screen add fixes & remove & switch & widgets
|
3 months ago |
aamir-csol
|
02ae79c458
|
Merge branch 'refs/heads/master' into dev_aamir
|
3 months ago |
faizatflutter
|
72d765e508
|
Design Updates
|
3 months ago |
aamir-csol
|
cd81372fc6
|
family screen add fixes & remove & switch & widgets
|
3 months ago |
aamir-csol
|
bf8f98ffb1
|
family screen add fixes & remove & switch & widgets
|
3 months 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 months ago |
aamir-csol
|
24362f67cb
|
family screen & widgets
|
3 months ago |
aamir-csol
|
d918b6e464
|
family screen & widgets
|
3 months 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
|
4 months ago |
aamir-csol
|
1335d3a7c8
|
family screen & widgets
|
4 months ago |
aamir-csol
|
288a0018ce
|
family screen & widgets
|
4 months ago |
aamir-csol
|
36193d349c
|
Merge remote-tracking branch 'origin/dev_sultan' into dev_aamir
# Conflicts:
# lib/features/authentication/authentication_repo.dart
# lib/features/authentication/authentication_view_model.dart
# lib/features/medical_file/medical_file_view_model.dart
|
4 months ago |
aamir-csol
|
02433e1bef
|
family screen & widgets
|
4 months ago |
faizatflutter
|
94313b8870
|
Improved Error Handling
|
4 months ago |
Sultan khan
|
3acd549de7
|
no message
|
4 months ago |
aamir-csol
|
192d617350
|
family screen & widgets
|
4 months ago |
aamir-csol
|
1125437a56
|
family screen & widgets
|
4 months ago |
aamir-csol
|
f9bfc131a8
|
family screen & widgets
|
4 months ago |
aamir-csol
|
a79dcad221
|
family screen & widgets
|
4 months ago |