delta/smartdevicelink/sdl_ios.git - github.com: smartdevicelink/sdl

	Commit message (Collapse)	Author	Age	Files	Lines
*	comments reviewbugfix/issue-1827-Example-app-reset-template-when-HMI-level-changes	Frank Elias	2020-11-20	2	-8/+8
\|
*	Keep the same template on HMI level changes	Frank Elias	2020-11-19	2	-2/+6
\|
*	Fix example apps resetting the soft buttons unnecessarilybugfix/issue-1782-example-app-soft-button-reset	Joel Fischer	2020-10-19	2	-4/+4
\|
*	Deprecate SetDisplayLayout	Joel Fischer	2020-10-15	4	-17/+11
\|
*	Merge branch 'develop' into feature/0312_update_min_required_iOS_version_to_10	NicoleYarroch	2020-09-04	3	-27/+30
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: NicoleYarroch <nicole@livio.io> # Conflicts: # SmartDeviceLinkTests/DevAPISpecs/SDLLockScreenManagerSpec.m
\| *	Added a 1024x1024 app store iconbugfix/issue_1772_fix_warnings_in_obj_c_ex_app	NicoleYarroch	2020-09-04	2	-27/+28
\| \| \| \| \| \| \| \|	Signed-off-by: NicoleYarroch <nicole@livio.io>
\| *	Added missing protocol delegate method	NicoleYarroch	2020-09-04	1	-0/+2
\| \| \| \| \| \| \| \|	Signed-off-by: NicoleYarroch <nicole@livio.io>
* \|	Apply suggestions from code review	NicoleYarroch	2020-09-04	1	-1/+1
\| \| \| \| \| \|	Co-authored-by: Joel Fischer <joeljfischer@gmail.com>
* \|	Updated deprecated API in example apps	NicoleYarroch	2020-09-03	2	-22/+7
\| \| \| \| \| \| \| \|	Signed-off-by: NicoleYarroch <nicole@livio.io>
* \|	Merge branch 'develop' into feature/0312_update_min_required_iOS_version_to_10	NicoleYarroch	2020-09-03	4	-1/+144
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \|	Signed-off-by: NicoleYarroch <nicole@livio.io> # Conflicts: # SmartDeviceLinkTests/SDLSystemCapabilityManagerSpec.m
\| *	Merge branch 'feature/0253_vehicle_data_StabilityControlsStatus' into develop	Joel Fischer	2020-09-03	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # SmartDeviceLink-iOS.podspec # SmartDeviceLink-iOS.xcodeproj/project.pbxproj # SmartDeviceLink.podspec
\| \| *	sdl-0253 "New vehicle data StabilityControlsStatus": Merge branch 'develop' ↵	leonid lokhmatov, Luxoft	2020-09-01	15	-186/+312
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into this, conflicts resolved. # Conflicts: # Example Apps/Example ObjC/VehicleDataManager.m # SmartDeviceLink-iOS.xcodeproj/project.pbxproj # SmartDeviceLink/SDLGetVehicleData.h # SmartDeviceLink/SDLGetVehicleData.m # SmartDeviceLink/SDLGetVehicleDataResponse.h # SmartDeviceLink/SDLGetVehicleDataResponse.m # SmartDeviceLink/SDLOnVehicleData.h # SmartDeviceLink/SDLOnVehicleData.m # SmartDeviceLink/SDLRPCParameterNames.h # SmartDeviceLink/SDLRPCParameterNames.m # SmartDeviceLink/SDLSubscribeVehicleData.h # SmartDeviceLink/SDLSubscribeVehicleData.m # SmartDeviceLink/SDLSubscribeVehicleDataResponse.h # SmartDeviceLink/SDLSubscribeVehicleDataResponse.m # SmartDeviceLink/SDLUnsubscribeVehicleData.h # SmartDeviceLink/SDLUnsubscribeVehicleData.m # SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h # SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m # SmartDeviceLink/SDLVehicleDataType.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m # SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m # SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m # SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m # SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m
\| \| * \	Merge branch 'develop' into 0253_vehicle_data_StabilityControlsStatus, all ↵	leonid lokhmatov, Luxoft	2020-08-15	5	-133/+127
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	conflicts resolved (merged) # Conflicts: # SmartDeviceLink-iOS.xcodeproj/project.pbxproj # SmartDeviceLink/SDLGetVehicleData.h # SmartDeviceLink/SDLGetVehicleData.m # SmartDeviceLink/SDLGetVehicleDataResponse.h # SmartDeviceLink/SDLGetVehicleDataResponse.m # SmartDeviceLink/SDLOnVehicleData.h # SmartDeviceLink/SDLOnVehicleData.m # SmartDeviceLink/SDLSubscribeVehicleData.h # SmartDeviceLink/SDLSubscribeVehicleData.m # SmartDeviceLink/SDLSubscribeVehicleDataResponse.h # SmartDeviceLink/SDLSubscribeVehicleDataResponse.m # SmartDeviceLink/SDLUnsubscribeVehicleData.h # SmartDeviceLink/SDLUnsubscribeVehicleData.m # SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h # SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m # SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m # SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m # SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m # SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m
\| * \| \| \|	Move files from wrong folderbugfix/issue-1765-sdl-example-files	Joel Fischer	2020-09-02	3	-0/+143
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'develop' into feature/0312_update_min_required_iOS_version_to_10	NicoleYarroch	2020-09-03	1	-1/+2
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: NicoleYarroch <nicole@livio.io> # Conflicts: # SmartDeviceLink-iOS.podspec # SmartDeviceLink-iOS.xcodeproj/project.pbxproj # SmartDeviceLink.podspec # SmartDeviceLink/public/SDLSyncMsgVersion.h # SmartDeviceLink/public/SDLSyncMsgVersion.m
\| * \| \|	0261 'New vehicle data WindowStatus': Merge branch 'develop' into this ↵	leonid lokhmatov, Luxoft	2020-08-27	15	-183/+301
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[0261], conflicts resolved # Conflicts: # SmartDeviceLink/SDLGetVehicleDataResponse.h # SmartDeviceLink/SDLVehicleDataType.m # SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m # SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m # SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m # SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m
\| * \ \ \	0261 'New vehicle data WindowStatus': Merge branch 'develop' into this ↵	leonid lokhmatov, Luxoft	2020-08-13	9	-135/+137
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[0261], conflicts resolved # Conflicts: # SmartDeviceLink-iOS.xcodeproj/project.pbxproj # SmartDeviceLink/SDLGetVehicleData.h # SmartDeviceLink/SDLGetVehicleData.m # SmartDeviceLink/SDLGetVehicleDataResponse.h # SmartDeviceLink/SDLGetVehicleDataResponse.m # SmartDeviceLink/SDLOnVehicleData.h # SmartDeviceLink/SDLOnVehicleData.m # SmartDeviceLink/SDLSubscribeVehicleData.h # SmartDeviceLink/SDLSubscribeVehicleData.m # SmartDeviceLink/SDLSubscribeVehicleDataResponse.h # SmartDeviceLink/SDLSubscribeVehicleDataResponse.m # SmartDeviceLink/SDLUnsubscribeVehicleData.h # SmartDeviceLink/SDLUnsubscribeVehicleData.m # SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h # SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m # SmartDeviceLink/SDLVehicleDataType.m # SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m # SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m # SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m # SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m # SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m # SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m
* \| \| \| \|	Removed available checkes from Swift Ex. App	NicoleYarroch	2020-09-01	2	-13/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: NicoleYarroch <nicole@livio.io>
* \| \| \| \|	Merge branch 'develop' into feature/0312_update_min_required_iOS_version_to_10	NicoleYarroch	2020-08-27	15	-186/+311
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	Merge pull request #1690 from yoooriii/feature/0266_vehicle_data_GearStatus	NicoleYarroch	2020-08-25	5	-3/+10
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|	[SDL-0266] New vehicle data GearStatus
\| \| * \| \|	Merge branch 'feature/0266_vehicle_data_GearStatus' into develop, resolve ↵	leonid lokhmatov, Luxoft	2020-08-12	5	-3/+10
\| \| \|\ \ \ \| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \|	conflicts.
\| \| \| * \|	0266 "New vehicle data GearStatus": code review 4, fix obj-c example app.	leonid lokhmatov, Luxoft	2020-08-11	5	-3/+10
\| \| \| \| \|
\| \| \| * \|	0266 "New vehicle data GearStatus": code review 4, update obj-c example app ↵	leonid lokhmatov, Luxoft	2020-08-10	1	-1/+1
\| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	to use .gearStatus.actualGear instead of .prndl on Vehicle Data object.
\| * \| \|	Merge pull request #1735 from smartdevicelink/feature/0242_subtle_alert_style	Joel Fischer	2020-08-20	15	-183/+301
\| \|\ \ \ \| \| \|/ / \| \|/\| \|	SDL 0242 subtle alert style
\| \| * \|	Refactored permission checks in Swift ex. appfeature/0242_subtle_alert_style	NicoleYarroch	2020-08-20	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: NicoleYarroch <nicole@livio.io>
\| \| * \|	Change fileprivate to private	NicoleYarroch	2020-08-17	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: NicoleYarroch <nicole@livio.io>
\| \| * \|	Fixed images and soft button states	NicoleYarroch	2020-08-13	2	-9/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: NicoleYarroch <nicole@livio.io>
\| \| * \|	Added/updated ex. app constants	NicoleYarroch	2020-08-13	2	-4/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: NicoleYarroch <nicole@livio.io>
\| \| * \|	Added permissions checks for alerts	NicoleYarroch	2020-08-13	4	-19/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: NicoleYarroch <nicole@livio.io>
\| \| * \|	Updated ex. apps alert manager classes	NicoleYarroch	2020-08-13	11	-108/+115
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: NicoleYarroch <nicole@livio.io>
\| \| * \|	Apply suggestions from code review	NicoleYarroch	2020-08-12	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Co-authored-by: Joel Fischer <joeljfischer@gmail.com>
\| \| * \|	Removed unused app constant	NicoleYarroch	2020-08-11	2	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: NicoleYarroch <nicole@livio.io>
\| \| * \|	Fixed guard statemnt for soft button	NicoleYarroch	2020-08-11	1	-4/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: NicoleYarroch <nicole@livio.io>
\| \| * \|	Removed extra pragma	NicoleYarroch	2020-08-11	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: NicoleYarroch <nicole@livio.io>
\| \| * \|	Fixed capitalization	NicoleYarroch	2020-08-11	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: NicoleYarroch <nicole@livio.io>
\| \| * \|	Moved image uploads for alerts to Alert Manager	NicoleYarroch	2020-08-11	5	-63/+105
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: NicoleYarroch <nicole@livio.io>
\| \| * \|	Added subtle alert to ex. apps	NicoleYarroch	2020-08-10	9	-113/+138
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: NicoleYarroch <nicole@livio.io>
* \| \| \|	Removed deprecated permission mngr helpers	NicoleYarroch	2020-08-24	1	-1/+1
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed test cases Signed-off-by: NicoleYarroch <nicole@livio.io>
* \| \|	0256 'Refactor Fuel Information Related Vehicle Data', fix obj-c example app.	leonid lokhmatov, Luxoft	2020-08-11	1	-7/+11
\| \| \|
* \| \|	SDL-0256 ' Fuel Information Related Vehicle Data'	Vladyslav Mustafin	2020-08-10	1	-2/+6
\|/ /
* \|	Fix lifecycle manager bug when multiple managers are presentbugfix/issue-1710-sdlmanager-crash-restart	Joel Fischer	2020-07-14	1	-12/+7
\| \| \| \| \| \| \| \| \| \|	* Lifecycle manager should only listen to its own notification dispatcher * Make swift example app work like Obj-C and run even if the transport type is changed
* \|	Merge pull request #1695 from ↵	Joel Fischer	2020-07-09	2	-42/+55
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	smartdevicelink/bugfix/issue-1682-tracking-parameter-permissions Align with Java Suite Permission Manager Parameter Permissions
\| * \	Merge branch 'bugfix/issue-1682-tracking-parameter-permissions' of ↵	Joel Fischer	2020-07-09	2	-2/+2
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/smartdevicelink/sdl_ios into bugfix/issue-1682-tracking-parameter-permissions # Conflicts: # Example Apps/Example Swift/RPCPermissionsManager.swift # SmartDeviceLink/SDLPermissionConstants.h
\| \| * \|	Apply suggestions from code review	Joel Fischer	2020-07-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Co-authored-by: NicoleYarroch <nicole@livio.io>
\| \| * \|	Apply suggestions from code review	Joel Fischer	2020-07-09	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Co-authored-by: NicoleYarroch <nicole@livio.io>
\| * \| \|	Changes based on code review	Joel Fischer	2020-07-09	2	-4/+7
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Make sure new public methods are public via SmartDeviceLink.h and podspecs * Make SDLRPCPermissionNames not public again * Update a bunch of documentation * Remove `SDLSubscribedPermissionChangedHandler` since it's new but unused * Fix `SDLPermissionElement.parameterPermissions` not being `nullable` * Fix missing NS_ASSUME_NONNULL tags in some .m files
\| * \|	Fix swift app not compilingbugfix/issue-1682-tracking-parameter-permissions	Joel Fischer	2020-07-08	1	-17/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Add additional documentation to the permission element parameterPermissions param * Fix some internal methods receiving mutable dictionaries when they should be receiving immutable dictionaries * Fix public SDLRPCPermissionStatus method using a private SDLRPCParameterName enum * Fix SDLRPCPermissionStatus initializer implementation not matching the declaration * Update SDLRPCPermissionStatus description
\| * \|	addressed PR comments	lapinskijw	2020-07-07	1	-8/+8
\| \| \|
\| * \|	Apply suggestions from code review	James Lapinski	2020-07-07	1	-2/+2
\| \| \| \| \| \| \| \| \|	Co-authored-by: Joel Fischer <joeljfischer@gmail.com>
\| * \|	updated method names and tests	lapinskijw	2020-07-06	1	-1/+1
\| \| \|