haroon amjad
e3f5bb69ac
Updates
23 hours ago
haroon amjad
081dfce480
Merge branch 'master' into haroon_dev
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/extensions/string_extensions.dart
# lib/generated/locale_keys.g.dart
# lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
# lib/presentation/emergency_services/widgets/location_input_bottom_sheet.dart
# lib/widgets/input_widget.dart
1 day ago
haroon amjad
92101d2b05
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/presentation/my_family/widget/family_cards.dart
1 day ago
Sultan khan
b3fa4c9bdf
Merge remote-tracking branch 'origin/master' into maptype
1 day ago
Sultan khan
0d4563542a
WD:map issues resolved:
...
1. map type added to the screen along with the translation
2. null shown for the arabic name of the fixed to show the actual name.
3. if the user opens the locationBottomsheet and close it without input of the area the screen freezes with no action on the location.
4. Gms And Hms Maps handled.
5. theme handled inside the maps screen.
1 day ago
haroon amjad
89a1da4407
Updates
1 day ago
haroon amjad
56f5151c0c
Font changes, Updates & fixes
1 day ago
aamir-csol
351026e42c
Merge branch 'master' into dev_aamir
1 day ago
aamir-csol
be6d33e51b
family switch parent child and child 2
1 day ago
haroon amjad
fed6cf6784
translation service changes
2 days ago
haroon amjad
453cfc07e1
Updates
2 days ago
haroon amjad
9c51f53a4d
Merge branch 'master' into haroon_dev
2 days ago
tahaalam
07bf971575
print statement removed
2 days ago
tahaalam
2ae9ab9fac
graph reference low nd high value address.
...
* if the referenncehigh is 0 then it will be neglected
* if the referencelow is 0 then it will be neglected.
2 days ago
aamir-csol
e9ec23f506
family switch parent child and child 2
2 days ago
haroon amjad
0eb9ec11d3
remote localization files added
2 days ago
haroon amjad
f929bd9017
Updates
2 days ago
haroon amjad
400e5daac0
Dr Search fixed
2 days ago
aamir-csol
aa17688de6
Merge branch 'master' into dev_aamir
2 days ago
haroon amjad
3d39190c62
updates & fixes
3 days ago
haroon amjad
830086a5b9
Merge branch 'master' into haroon_dev
3 days ago
haroon amjad
4959392f74
Updates
3 days ago
tahaalam
a2fa661db4
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
3 days ago
tahaalam
bdeec6a412
hardcoded id removed that was added for uat
3 days ago
tahaalam
8a11cc03cb
pickup direction bottom sheet added and previous radio bottom sheet removed
3 days ago
haroon amjad
f7446d0d41
updates
3 days ago
aamir-csol
2a8f67bba1
family file switch back multi
3 days ago
haroon amjad
3703afe8bd
updates
4 days ago
haroon amjad
edeae70aa0
Updates
4 days ago
haroon amjad
1f290c5bfe
updates
4 days ago
haroon amjad
deca29b423
updates & fixes
5 days ago
haroon amjad
93af246700
updates
5 days ago
haroon amjad
ac8189fa17
Updates
6 days ago
haroon amjad
7e73741d08
Bookmark icons added
6 days ago
Sultan khan
c970a3f697
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
...
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New :
updates
family file switch back issue fixed
Vital sign updates
updates
Updates
Added location option in region selection bottom sheet
Updates
Profile settings update
6 days ago
Sultan khan
6178062ed0
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
...
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New : (33 commits)
reminder start time added to the prescription
Invoices Filter
Updates
updates
Revert "graph values fix and comparision with the pdf"
graph values fix and comparision with the pdf
graph values fix and comparision with the pdf
Updates
Updates
updates
Updates
Updates
Updates
Updates
Habib Wallet updates
Changes for AI Lab analysis
App update page updates
updates
Updates
warning dialog displayed to user if the watch intented is not currently implemented
...
# Conflicts:
# lib/features/authentication/authentication_view_model.dart
6 days ago
haroon amjad
6108a629a2
Merge branch 'master' into haroon_dev
1 week ago
Haroon6138
c324007e61
Merge pull request 'family file switch back issue fixed' ( #203 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/203
1 week ago
aamir-csol
38471a773c
family file switch back issue fixed
1 week ago
Sultan khan
d3dfb2e2a5
doctor favorite in progress.
1 week ago
haroon amjad
fbb2570d8e
Vital sign updates
1 week ago
haroon amjad
db89408185
Merge branch 'master' into haroon_dev
...
# Conflicts:
# lib/generated/locale_keys.g.dart
1 week ago
haroon amjad
78a6d55b35
Merge branch 'master' into watch_integration
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
1 week ago
haroon amjad
078b236b67
Merge branch 'master' into haroon_dev
...
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
1 week ago
tahaalam
a8138ba231
Merge remote-tracking branch 'origin/master' into reminer
1 week ago
tahaalam
8b829b9101
reminder start time added to the prescription
1 week ago
haroon amjad
a45980162d
Added location option in region selection bottom sheet
1 week ago
haroon amjad
444e7b562f
Merge branch 'master' into haroon_dev
1 week ago
Haroon6138
88da9af44b
Merge pull request 'Invoices Filter' ( #200 ) from dev_aamir into master
...
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/200
1 week ago
haroon amjad
7611c1d58c
Updates
1 week ago