Commit Graph

1135 Commits (7abee6bb5e0a14c9f4e5b40cba11d424d107a16d)
 

Author SHA1 Message Date
Haroon6138 7abee6bb5e Merge pull request 'haroon_dev' (#212) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/212
1 day ago
haroon amjad 13a4c9e0f8 updates 1 day ago
haroon amjad e3f5bb69ac Updates 1 day 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
Haroon6138 59fc109454 Merge pull request 'Callambulance page text and map changes' (#211) from maptype into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/211
1 day ago
haroon amjad a9f46a39cc Updates 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
Haroon6138 bd85c9368d Merge pull request 'family file changes to multi level switch' (#210) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/210
1 day ago
haroon amjad 89a1da4407 Updates 1 day ago
haroon amjad 56f5151c0c Font changes, Updates & fixes 1 day ago
tahaalam c716490b0e map type is added to the maps already present 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
haroon amjad 1fa03fff5e updates 2 days ago
Haroon6138 973fdc3692 Merge pull request 'graph value changed' (#209) from lab-graph into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/209
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 21477f34dc updates 2 days ago
haroon amjad 0eb9ec11d3 remote localization files added 2 days ago
haroon amjad f929bd9017 Updates 3 days ago
haroon amjad 400e5daac0 Dr Search fixed 3 days ago
aamir-csol aa17688de6 Merge branch 'master' into dev_aamir 3 days ago
Haroon6138 6def7b5263 Merge pull request 'haroon_dev' (#208) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/208
3 days ago
haroon amjad 3d39190c62 updates & fixes 3 days ago
haroon amjad 04cbb3db40 no message 3 days ago
haroon amjad 830086a5b9 Merge branch 'master' into haroon_dev 3 days ago
Haroon6138 0c6ff3efe8 Merge pull request 'ambulance pick and drop selection changed' (#207) from ambulance_selection_change into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/207
3 days ago
haroon amjad a8620c1f72 updates 3 days ago
haroon amjad 75531c2254 Merge branch 'master' into haroon_dev 3 days ago
haroon amjad 4959392f74 Updates 3 days ago
tahaalam 7135800552 should flip value changed 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
aamir-csol 5be4f66718 doctor ratings. 3 days ago
haroon amjad f7446d0d41 updates 3 days ago
aamir-csol 2a8f67bba1 family file switch back multi 4 days ago
Haroon6138 8112f9bb0a Merge pull request 'haroon_dev' (#206) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/206
4 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 c18bf9f2c1 Layout fix for appointment details page 5 days ago