Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'feature/616_constructed_payloads' into release/5.0.0 | Joel Fischer | 2017-08-15 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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** | ||||
| * | First pass at start service control message | Joel Fischer | 2017-07-19 | 1 | -1/+1 |
| | | |||||
* | | Updated protocol enums to match spec.hotfix/issue_275_protocol_spec_enums | Muller, Alexander (A.) | 2017-01-18 | 1 | -3/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | Muller, Alexander (A.) | 2017-01-11 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (30 commits) Remove a test focus Fixed test cases Fix podspec not updated with latest version number Update for v4.5.0 Follow style guide for boolean check Updated formatting of README.md Added steps for using the lock screen manager from SDL's bundle to the readme. Added check when trying to upload an appIcon for a head unit that does not support graphics. Update for v4.5.0 Fixed issue with trying to upload a file that is nil will cause an infinite loop. Fixed an issue with initializer causing infinite loop. Improved readability for nil-checks. Fixed issue relating to SDLLocationDetails' searchAddress using the wrong key for object store. Fixed formatting for some interfaces. Fixed issue with LocationDetails' properties not properly becoming initialized. Fixed issue with waypoints not being correctly initialized as SDLLocationDetails Adding in nil checks for completion handlers of Streaming Media Manager. Updated description to return correct control data name. Update changelog for v4.5.0-beta.1 Update for v4.5.0-beta.1 release ... # Conflicts: # SmartDeviceLink/SDLDiagnosticMessage.m # SmartDeviceLink/SDLGetWaypointsResponse.m # SmartDeviceLink/SDLKeyboardProperties.h # SmartDeviceLink/SDLLocationDetails.m # SmartDeviceLink/SDLNames.h # SmartDeviceLink/SDLOnWaypointChange.m # SmartDeviceLink/SDLPerformInteraction.h # SmartDeviceLink/SDLPerformInteraction.m # SmartDeviceLink/SDLProxy.m # SmartDeviceLink/SDLPutFile.h # SmartDeviceLink/SDLReadDID.m # SmartDeviceLink/SDLSetGlobalProperties.h # SmartDeviceLink/SDLSetMediaClockTimer.h # SmartDeviceLink/SDLSoftButton.h # SmartDeviceLink/SDLUnsubscribeWaypoints.m # SmartDeviceLink/SDLUpdateTurnList.m # SmartDeviceLink/SDLV2ProtocolHeader.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetWaypointsSpec.m # SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLocationDetailsSpec.m | ||||
| * | Updated description to return correct control data name.feature/issue_479 | Muller, Alexander (A.) | 2016-12-06 | 1 | -1/+1 |
| | | |||||
* | | Updated to include generics for all collection objects. | Muller, Alexander (A.) | 2016-09-19 | 1 | -2/+2 |
|/ | |||||
* | Update clang-format settings and re-run | Joel Fischer | 2016-08-30 | 1 | -2/+2 |
| | |||||
* | Merge branch 'develop' into feature/external_security_support | Joel Fischer | 2016-05-27 | 1 | -5/+5 |
| | |||||
* | Shift files into root directory | Joel Fischer | 2016-05-25 | 1 | -0/+124 |