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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix bug in lock screen manager testsbugfix/issue-568-shift-project-files-to-public-private-folders	Joel Fischer	2020-09-02	1	-1/+1
\|
*	Fix test warnings about meta methods	Joel Fischer	2020-09-02	8	-70/+79
\|
*	Fix audio stream manager get queue does not happen on the correct queue	Joel Fischer	2020-09-02	1	-1/+6
\|
*	Merge branch 'develop' into ↵	Joel Fischer	2020-09-02	16	-1166/+1745
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	bugfix/issue-568-shift-project-files-to-public-private-folders # Conflicts: # SmartDeviceLink-iOS.xcodeproj/project.pbxproj
\| *	Merge branch 'master' into develop	Joel Fischer	2020-09-02	1	-3/+1
\| \|\
\| \| *	Update PULL_REQUEST_TEMPLATE.mddeveop	Joel Fischer	2020-09-02	1	-3/+1
\| \| \|
\| * \|	Merge pull request #1739 from ↵	Joel Fischer	2020-09-02	6	-17/+31
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	smartdevicelink/feature/issue-1684-protocol-nak-reason Add support for protocol nak reason parameter
\| \| * \	Merge branch 'develop' into feature/issue-1684-protocol-nak-reasonfeature/issue-1684-protocol-nak-reason	Joel Fischer	2020-08-31	150	-2154/+7656
\| \| \|\ \
\| \| * \| \|	Add support for protocol nak reason parameter	Joel Fischer	2020-07-30	6	-17/+31
\| \| \| \| \|
\| * \| \| \|	Merge pull request #1753 from ↵	Joel Fischer	2020-09-01	10	-1147/+1718
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	smartdevicelink/bugfix/issue-1749-refactor-t-g-manager-queues Refactor Text & Graphic Manager to use queues
\| \| * \| \|	Fix checking before sending secondary graphicbugfix/issue-1749-refactor-t-g-manager-queues	Joel Fischer	2020-08-31	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Merge branch 'develop' into bugfix/issue-1749-refactor-t-g-manager-queues	Joel Fischer	2020-08-31	109	-1660/+5050
\| \| \|\ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # SmartDeviceLink-iOS.xcodeproj/project.pbxproj
\| \| * \| \|	Fixes for spec test names	Joel Fischer	2020-08-28	1	-15/+15
\| \| \| \| \|
\| \| * \| \|	Fix missing nullable annotations	Joel Fischer	2020-08-28	2	-13/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Fixes for secondary graphic on < 5.0
\| \| * \| \|	Fixes for T&G manager updates when display or hmi level update	Joel Fischer	2020-08-28	1	-8/+2
\| \| \| \| \|
\| \| * \| \|	Fix tests	Joel Fischer	2020-08-24	3	-6/+20
\| \| \| \| \|
\| \| * \| \|	Fix bugs in text and graphic operation	Joel Fischer	2020-08-24	3	-5/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Fix update handler not being sent if the handler was cancelled before starting * Fix update not being queued if an update is already queued * Fix a focus on a test
\| \| * \| \|	Add new file to module map	Joel Fischer	2020-08-21	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Fixes to text and graphic manager	Joel Fischer	2020-08-21	3	-706/+156
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Fixes to T&G spec
\| \| * \| \|	Fix not sending alignment	Joel Fischer	2020-08-20	1	-0/+1
\| \| \| \| \|
\| \| * \| \|	Add another handler to pass back updated screen data	Joel Fischer	2020-08-20	2	-25/+56
\| \| \| \| \|
\| \| * \| \|	Update text and graphic to update pending transactions with new screen data	Joel Fischer	2020-08-20	3	-21/+21
\| \| \| \| \|
\| \| * \| \|	Text and graphic operation spec updates	Joel Fischer	2020-08-20	2	-4/+127
\| \| \| \| \|
\| \| * \| \|	Fixes for updating / outputting currentScreenData	Joel Fischer	2020-08-20	5	-12/+739
\| \| \| \| \|
\| \| * \| \|	Updates to the operation	Joel Fischer	2020-08-18	3	-94/+106
\| \| \| \| \|
\| \| * \| \|	Merge branch 'develop' into bugfix/issue-1749-refactor-t-g-manager-queues	Joel Fischer	2020-08-18	1	-7/+55
\| \| \|\ \ \
\| \| * \| \| \|	VERY In-progress updates	Joel Fischer	2020-08-13	6	-382/+594
\| \| \| \| \| \|
* \| \| \| \| \|	Move permission manager to correct location	Joel Fischer	2020-09-01	3	-8/+8
\| \| \| \| \| \|
* \| \| \| \| \|	Fix some ordering	Joel Fischer	2020-08-28	1	-7/+7
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'develop' into ↵	Joel Fischer	2020-08-28	35	-167/+756
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bugfix/issue-568-shift-project-files-to-public-private-folders # Conflicts: # SmartDeviceLink-iOS.podspec # SmartDeviceLink-iOS.xcodeproj/project.pbxproj # SmartDeviceLink.podspec
\| * \| \| \| \|	Merge pull request #1694 from yoooriii/feature/0261_vehicle_data_WindowStatus	NicoleYarroch	2020-08-28	37	-167/+768
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[SDL-0261] New vehicle data WindowStatus
\| \| * \| \| \| \|	0261 'New vehicle data WindowStatus': code review, update window status ↵	leonid lokhmatov, Luxoft	2020-08-28	10	-10/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	comments in headers (document style), remove unused val-name from names.
\| \| * \| \| \| \|	0261 'New vehicle data WindowStatus': Merge branch 'develop' into this ↵	leonid lokhmatov, Luxoft	2020-08-27	91	-370/+2449
\| \| \|\ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[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	264	-7598/+12425
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[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
\| \| * \| \| \| \| \|	0261 'New vehicle data WindowStatus': code review 5, minor fixes, mostly in ↵	leonid lokhmatov, Luxoft	2020-08-12	10	-1104/+1157
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tests, alpha order, etc.
\| \| * \| \| \| \| \|	0261 'New vehicle data WindowStatus': code review 4, fix test.	leonid lokhmatov, Luxoft	2020-08-10	1	-2/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'feature/0261_vehicle_data_WindowStatus' of ↵	leonid lokhmatov, Luxoft	2020-08-10	0	-0/+0
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	yri:yoooriii/sdl_ios into feature/0261_vehicle_data_WindowStatus
\| \| \| * \| \| \| \| \|	0261 'New vehicle data WindowStatus': code review 4, put vehicle data ↵	leonid lokhmatov, Luxoft	2020-08-10	26	-2436/+1452
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	structs in order, revert extra changes, etc
\| \| * \| \| \| \| \| \|	0261 'New vehicle data WindowStatus': code review 4, reorder new struct ↵	leonid lokhmatov, Luxoft	2020-08-10	27	-2438/+1454
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tests in alpha order in their virtual folders
\| \| * \| \| \| \| \|	0261 'New vehicle data WindowStatus': code review 4, reorder files in xcode ↵	leonid lokhmatov, Luxoft	2020-08-09	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	proj, umbrella header, etc.
\| \| * \| \| \| \| \|	0261 'New vehicle data WindowStatus': code review, fix Subscribe/Unsubscribe ↵	leonid lokhmatov, Luxoft	2020-08-04	12	-361/+476
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Vehicle Data, fix proper unit tests.
\| \| * \| \| \| \| \|	0261 'New vehicle data WindowStatus': code review, fix GetVehicleData, ↵	leonid lokhmatov, Luxoft	2020-08-04	9	-253/+317
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	OnVehicleData structs as well as unit tests, update inits, reorder properties alphabetically
\| \| * \| \| \| \| \|	0261 'New vehicle data WindowStatus': code review, fix podspec files.	leonid lokhmatov, Luxoft	2020-08-04	2	-97/+97
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	0261 'New vehicle data WindowStatus': code review, update Window State & ↵	leonid lokhmatov, Luxoft	2020-08-04	5	-34/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Status structs and tests.
\| \| * \| \| \| \| \|	0261 'New vehicle data WindowStatus': order properties alphabetically	leonid lokhmatov, Luxoft	2020-07-24	7	-248/+249
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	0261 'New vehicle data WindowStatus': apply review comments. (sort headers, ↵	leonid lokhmatov, Luxoft	2020-07-24	30	-712/+1100
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	classes, properties alphabetically, fix & add script generated initializers)
\| \| * \| \| \| \| \|	0261 'New vehicle data WindowStatus': fix nullable specifier	leonid lokhmatov, Luxoft	2020-07-07	1	-4/+4
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	0261 'New vehicle data WindowStatus': apply review comments: reorder headers ↵	leonid lokhmatov, Luxoft	2020-07-06	8	-152/+152
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	import alphabetically, fix extra space in comments
\| \| * \| \| \| \| \|	0261 'New vehicle data WindowStatus': apply review comments use [[x alloc] ↵	leonid lokhmatov, Luxoft	2020-07-06	20	-594/+903
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	init] instead of [x new]; replace (nullable, strong, nonatomic) with (strong, nonatomic, nullable); replace .to(beFalse()); with .to(equal(@NO)); in tests replace .to(beTrue()); with .to(equal(@YES)); in tests reorder header imports alphabetically
\| \| * \| \| \| \| \|	0261 'New vehicle data WindowStatus' fix tests and classes in question	leonid l lokhmatov	2020-06-23	10	-233/+381
\| \| \| \| \| \| \| \|