Commit Graph

1166 Commits (fbb758e227008be548d8ef153a0dc656da5e0928)
 

Author SHA1 Message Date
haroon amjad fbb758e227 Merge branch 'master' into haroon_dev 24 hours ago
Haroon6138 76006dcb73 Merge pull request 'dev_sultan' (#219) from dev_sultan into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/219
24 hours ago
Sultan khan 6d647d75be 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
  radiology ai lab analysis & lab ai analysis api end points updates.
  Updates
  updates
  updates

# Conflicts:
#	lib/presentation/symptoms_checker/widgets/selected_organs_section.dart
1 day ago
haroon amjad 5a402b45b7 color update 1 day ago
Sultan khan a5f7bd80b2 updates 1 day ago
Haroon6138 5c9221da66 Merge pull request 'haroon_dev' (#218) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/218
1 day ago
haroon amjad 75473e26bd Merge branch 'master' into haroon_dev 1 day ago
haroon amjad 708cbb138d Updates
# Conflicts:
#	lib/presentation/radiology/radiology_result_page.dart
1 day ago
Haroon6138 1acd088581 Merge pull request 'haroon_dev' (#216) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/216
1 day ago
Haroon6138 126423d6a1 Merge branch 'master' into haroon_dev 1 day ago
Haroon6138 909bbab48b Merge pull request 'lang id to lab ai analysis & radiology ai analysis' (#217) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/217
1 day ago
aamir-csol 5900657b52 Merge branch 'master' into dev_aamir 1 day ago
aamir-csol 2d7aa5d80d radiology ai lab analysis & lab ai analysis api end points updates. 1 day ago
Sultan khan acff5d220c 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:
  radiology ai lab analysis & lab ai analysis api end points updates.
1 day ago
haroon amjad a2de3f1b14 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/symptoms_checker/widgets/selected_organs_section.dart
1 day ago
Haroon6138 65b7b9e2ec Merge pull request 'radiology ai lab analysis & lab ai analysis api end points updates.' (#215) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/215
1 day ago
Sultan khan cc9ac07923 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:
  family switch parent child and child 2 ,
1 day ago
Sultan khan 712e835176 ui fixes 1 day ago
haroon amjad fe1e0fdb40 Updates 1 day ago
aamir-csol 10fa8c46cf radiology ai lab analysis & lab ai analysis api end points updates. 1 day ago
haroon amjad 572c37785b updates 1 day ago
haroon amjad 6939630ce0 Merge branch 'master' into haroon_dev 1 day ago
Haroon6138 a5c661b35f Merge pull request 'family switch parent child and child and child ...' (#214) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/214
1 day ago
haroon amjad 5318437941 updates 1 day ago
Sultan khan 18331f077e 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: (41 commits)
  pull down to refresh in appointment queue implemented
  Pull to refresh implemented
  Updates & fixes
  updates
  Updates
  Updates
  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.
  Updates
  Font changes, Updates & fixes
  map type is added to the maps already present
  family switch parent child and child 2
  translation service changes
  Updates
  updates
  print statement removed
  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.
  family switch parent child and child 2
  updates
  remote localization files added
  Updates
  ...

# Conflicts:
#	android/app/build.gradle.kts
#	lib/presentation/rate_appointment/rate_appointment_doctor.dart
1 day ago
Sultan khan 287dcf3482 updates 1 day ago
aamir-csol 7fcee6a988 family switch parent child and child 2 , 1 day ago
Haroon6138 6e2d87d172 Merge pull request 'haroon_dev' (#213) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/213
2 days ago
haroon amjad 185f505ed9 pull down to refresh in appointment queue implemented 2 days ago
haroon amjad 991f9c7a9b Pull to refresh implemented 2 days ago
haroon amjad 71030c0fe9 Updates & fixes 2 days ago
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
2 days ago
haroon amjad 13a4c9e0f8 updates 2 days ago
haroon amjad e3f5bb69ac Updates 2 days 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
2 days 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
2 days ago
haroon amjad a9f46a39cc Updates 2 days ago
haroon amjad 92101d2b05 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/my_family/widget/family_cards.dart
2 days ago
Sultan khan b3fa4c9bdf Merge remote-tracking branch 'origin/master' into maptype 2 days 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.
2 days 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
2 days ago
haroon amjad 89a1da4407 Updates 2 days ago
haroon amjad 56f5151c0c Font changes, Updates & fixes 2 days ago
tahaalam c716490b0e map type is added to the maps already present 2 days ago
aamir-csol 351026e42c Merge branch 'master' into dev_aamir 2 days ago
aamir-csol be6d33e51b family switch parent child and child 2 2 days ago
haroon amjad fed6cf6784 translation service changes 3 days ago
haroon amjad 453cfc07e1 Updates 3 days ago
haroon amjad 9c51f53a4d Merge branch 'master' into haroon_dev 3 days ago
haroon amjad 1fa03fff5e updates 3 days ago