Commit Graph

630 Commits (303fb876612609545787881f7f7b20d3d35950ef)

Author SHA1 Message Date
tahaalam 303fb87661 Merge remote-tracking branch 'origin/master' into changes 22 hours ago
tahaalam fcf990bc00 hot fixes 22 hours ago
Sultan khan cfea843c4f updates and fixes 22 hours ago
Sultan khan a144f30f42 no message 1 day ago
tahaalam d97ead4e03 Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	lib/core/app_assets.dart
1 day ago
tahaalam fb93aa1092 ambulance call page changes:
1. icon change for the success of ambulance call and rrt.
2. flow changed to first select the appoiintment then hospital.
3. location accorate enabled.
1 day ago
tahaalam ebfefefec0 issue fix for the projects having distance not found if the permission for the application 1 day ago
Sultan khan 3d226c39d0 fixes and updates 2 days ago
Sultan khan 207b84e493 fixes and updates 3 days ago
Sultan khan 7e2c470767 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 & fixes
3 days ago
Sultan khan 5f82f0db2d fixes and updates 3 days ago
haroon amjad 86fa198afc Updates & fixes 3 days ago
Sultan khan 5989dda613 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:
  QLine API changes handled
4 days ago
haroon amjad 0566685e48 QLine API changes handled 4 days ago
Sultan khan 21ae30a8cc profile picture upload 4 days ago
Sultan khan 5f559a44dd profile image upload 4 days ago
haroon amjad 6a687f4ff6 Updates & fixes 4 days ago
haroon amjad a0d9c35d0a Merge branch 'master' into haroon_dev 4 days ago
haroon amjad 5b44329972 updates 4 days ago
aamir-csol 39cbee029a radiology ai lab analysis & lab ai analysis api end points updates. 4 days ago
aamir-csol 7a0caa05c3 Merge branch 'master' into dev_aamir 4 days ago
aamir-csol d1e0ec31e6 radiology ai lab analysis & lab ai analysis api end points updates. 4 days ago
haroon amjad b33a559305 Dental workflow implemented 5 days ago
Sultan khan 3d1c415e2c my invoice updated 5 days 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
5 days ago
Haroon6138 126423d6a1 Merge branch 'master' into haroon_dev 5 days ago
aamir-csol 2d7aa5d80d radiology ai lab analysis & lab ai analysis api end points updates. 5 days 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.
5 days ago
haroon amjad a2de3f1b14 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/symptoms_checker/widgets/selected_organs_section.dart
5 days 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 ,
5 days ago
Sultan khan 712e835176 ui fixes 5 days ago
haroon amjad fe1e0fdb40 Updates 5 days ago
aamir-csol 10fa8c46cf radiology ai lab analysis & lab ai analysis api end points updates. 5 days ago
haroon amjad 572c37785b updates 5 days ago
aamir-csol 7fcee6a988 family switch parent child and child 2 , 5 days ago
haroon amjad 185f505ed9 pull down to refresh in appointment queue implemented 6 days ago
haroon amjad 71030c0fe9 Updates & fixes 6 days ago
haroon amjad e3f5bb69ac Updates 6 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
6 days ago
haroon amjad 92101d2b05 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/my_family/widget/family_cards.dart
6 days ago
Sultan khan b3fa4c9bdf Merge remote-tracking branch 'origin/master' into maptype 6 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.
6 days ago
haroon amjad 89a1da4407 Updates 6 days ago
haroon amjad 56f5151c0c Font changes, Updates & fixes 6 days ago
aamir-csol 351026e42c Merge branch 'master' into dev_aamir 6 days ago
aamir-csol be6d33e51b family switch parent child and child 2 6 days ago
haroon amjad fed6cf6784 translation service changes 7 days ago
haroon amjad 453cfc07e1 Updates 7 days ago
haroon amjad 9c51f53a4d Merge branch 'master' into haroon_dev 7 days ago
tahaalam 07bf971575 print statement removed 7 days ago