delta/smartdevicelink/sdl_ios.git/SmartDeviceLink-iOS.xcodeproj, branch bug/podspec_fix

Merge branch 'release/5.0.0' into feature/streaming_media_manager

2017-08-16T15:01:19+00:00

# Conflicts:
#	SmartDeviceLink-iOS.xcodeproj/project.pbxproj

Merge branch 'feature/616_constructed_payloads' into release/5.0.0

2017-08-15T20:02:14+00:00

# Conflicts:
#	SmartDeviceLink-iOS.xcodeproj/project.pbxproj
#	SmartDeviceLink/SDLDebugTool.m
#	SmartDeviceLink/SDLGlobals.h
#	SmartDeviceLink/SDLGlobals.m
#	SmartDeviceLink/SDLIAPTransport.m
#	SmartDeviceLink/SDLNames.h
#	SmartDeviceLink/SDLProtocol.m
#	SmartDeviceLink/SDLProtocolMessage.h
#	SmartDeviceLink/SDLProtocolMessage.m
#	SmartDeviceLink/SDLProtocolReceivedMessageRouter.m
#	SmartDeviceLink/SDLProxy.m
#	SmartDeviceLink/SDLStreamingMediaManager.m
#	SmartDeviceLink/SDLSystemCapability.h
#	SmartDeviceLink/SDLSystemCapability.m
#	SmartDeviceLink/SDLSystemCapabilityType.h
#	SmartDeviceLink/SDLSystemCapabilityType.m
#	SmartDeviceLink/SDLUploadFileOperation.m
#	SmartDeviceLink/SDLVideoStreamingCapability.h
#	SmartDeviceLink/SDLVideoStreamingCapability.m
#	SmartDeviceLink/SDLVideoStreamingCodec.h
#	SmartDeviceLink/SDLVideoStreamingCodec.m
#	SmartDeviceLink/SDLVideoStreamingFormat.h
#	SmartDeviceLink/SDLVideoStreamingFormat.m
#	SmartDeviceLink/SDLVideoStreamingProtocol.h
#	SmartDeviceLink/SDLVideoStreamingProtocol.m
#	SmartDeviceLinkTests/DevAPISpecs/SDLUploadFileOperationSpec.m
#	SmartDeviceLinkTests/ProtocolSpecs/HeaderSpecs/SDLProtocolHeaderSpec.m
#	SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolMessageSpec.m
#	SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolSpec.m
#	SmartDeviceLinkTests/ProtocolSpecs/SDLProtocolMessageDisassemblerSpec.m
#	SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSystemCapabilityTypeSpec.m
#	SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVideoStreamingCodecSpec.m
#	SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVideoStreamingProtocolSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMICapabilitiesSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSystemCapabilitySpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVideoStreamingCapabilitySpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVideoStreamingFormatSpec.m
#	SmartDeviceLink_Example/Classes/ProxyManager.m

* **Did not merge SMM changes due to upcoming overhaul**

Add StreamingMediaConfiguration tests

2017-08-15T17:24:36+00:00

* Fix tests

Added missing files to SmartDeviceLink.h

2017-08-14T15:35:41+00:00

Signed-off-by: NicoleYarroch

Add tests for video start service payloads

2017-08-09T13:38:03+00:00

* Fix a bug in video start service ack payload
* Remove unused hash id parameter in audio start service ack payload spec

Merge pull request #604 from smartdevicelink/feature/issue_536_input_stream_file_manager

2017-08-03T20:23:05+00:00

Implement SDL 0025 - Stream file manager uploads from disk

Merge branch 'release/5.0.0' into feature/streaming_media_manager

2017-08-03T19:47:12+00:00

# Conflicts:
#	SmartDeviceLink-iOS.xcodeproj/project.pbxproj

Merge branch 'develop' into feature/616_constructed_payloads

2017-08-03T19:45:47+00:00

In progress updates to how configurations are set for streaming media

2017-08-02T19:54:36+00:00

A number of minor changes and updates to video stream manager

2017-08-01T21:52:10+00:00