summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Haptic manager test updatesfeature/haptic_integrationJoel Fischer2017-09-291-1/+9
* Update streaming media configuration with the window propertyJoel Fischer2017-09-281-44/+31
* Fixed existing testsJoel Fischer2017-09-283-50/+56
* Integration for haptic manager into the SMMJoel Fischer2017-09-2814-121/+193
* Merge pull request #751 from ChrisB-Elektrobit/feature/haptic_manager_rebaseJoel Fischer2017-09-278-0/+636
|\
| * Fixed review comments. Modified implementation to handle UIButtons. Added mor...harisheb2017-09-275-24/+173
| * Fixing haptic unit test failuresharisheb2017-09-261-0/+6
| * Merge branch 'feature/haptic_manager_rebase' of https://github.com/ChrisB-Ele...harisheb2017-09-26120-284/+3934
| |\
| | * Merge branch 'release/5.0.0' into feature/haptic_manager_rebaseChrisB-Elektrobit2017-09-26120-284/+3934
| | |\ | |_|/ |/| |
* | | Merge pull request #744 from smartdevicelink/bugfix/issue_679_remove_deprecat...Joel Fischer2017-09-2621-250/+49
|\ \ \
| * \ \ Merge branch 'release/5.0.0' into bugfix/issue_679_remove_deprecationsbugfix/issue_679_remove_deprecationsJoel Fischer2017-09-2542-478/+1295
| |\ \ \
| * | | | Update streaming config with correct assertsJoel Fischer2017-09-251-2/+4
| * | | | Fix old protocol methods still in useJoel Fischer2017-09-252-15/+16
| * | | | Remove deprecated codeJoel Fischer2017-09-2022-254/+51
| * | | | Merge branch 'release/5.0.0' into bugfix/issue_679_remove_deprecationsJoel Fischer2017-09-1525-75/+120
| |\ \ \ \
* | \ \ \ \ Merge pull request #692 from jamescs/feature/rc_rpcsJoel Fischer2017-09-2590-16/+3853
|\ \ \ \ \ \
| * | | | | | updates for review commentsMarkos Rapitis2017-09-253-9/+4
| * | | | | | Adding test cases for custom initializer.piyushkhosla2017-09-259-0/+103
| * | | | | | updated rpc unit tests with custom initializersMarkos Rapitis2017-09-223-4/+38
| * | | | | | added warning tag for readonly propertiesMarkos Rapitis2017-09-222-8/+14
| * | | | | | updates targeting review commentsMarkos Rapitis2017-09-212-6/+2
| * | | | | | updates for review commentsMarkos Rapitis2017-09-2113-43/+47
| * | | | | | Merge branch 'release/5.0.0' into feature/rc_rpcsMarkos Rapitis2017-09-2143-479/+1286
| |\ \ \ \ \ \
| * | | | | | | Minor changes around docs.Markos Rapitis2017-09-213-4/+8
| * | | | | | | Adding missing documentation and targeted review comments.Markos Rapitis2017-09-217-3/+76
| * | | | | | | Merge branch 'release/5.0.0' into feature/rc_rpcsMarkos Rapitis2017-09-2025-75/+120
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | minor changes for review commentsMarkos Rapitis2017-09-202-4/+4
| * | | | | | | Formatting cleanup.Markos Rapitis2017-09-191-2/+2
| * | | | | | | Removing Unwanted spaces and other review comments.piyushkhosla2017-09-186-5/+4
| * | | | | | | Updating init method for buttonpresspiyushkhosla2017-09-152-15/+4
| * | | | | | | Implementing code review comments.piyushkhosla2017-09-1544-377/+246
| * | | | | | | Changes for adding missed files in compile sources under Build Phases.piyushkhosla2017-09-141-0/+6
| * | | | | | | Updated unit testsMarkos Rapitis2017-09-134-9/+9
| * | | | | | | Updated getter methodsMarkos Rapitis2017-09-138-16/+15
| * | | | | | | Updated podspec files.Markos Rapitis2017-09-132-0/+43
| * | | | | | | Merge branch 'release/5.0.0' into feature/rc_rpcsMarkos Rapitis2017-09-13178-2082/+7860
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Modified return method.Ryan Conroy2017-09-131-2/+2
| * | | | | | | Added missing files.Ryan Conroy2017-09-082-0/+30
| * | | | | | | changes to convenience inits, changes based on commentsOscar Villavicencio2017-08-2823-306/+43
| * | | | | | | Added convenience initializers for RC RPCsOscar Villavicencio2017-08-1820-3/+492
| * | | | | | | Merged public release/5.0.0 branch, resolved merge conflictsJames Sokoll2017-08-1653-182/+2129
| |\ \ \ \ \ \ \
| * | | | | | | | Fixed merge errorJames Sokoll2017-08-1613-271/+591
| * | | | | | | | Added remote control RPCs and unit testsjames2017-08-1486-93/+3283
* | | | | | | | | Merge pull request #747 from smartdevicelink/bugfix/issue_742_fix_tests_xcode9Joel Fischer2017-09-257-12/+15
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Fix lifecycle manager testsbugfix/issue_742_fix_tests_xcode9Joel Fischer2017-09-203-11/+14
| * | | | | | | | Fix streaming test failureJoel Fischer2017-09-201-2/+2
| * | | | | | | | Update images and re-enable most lifecycle spec testsJoel Fischer2017-09-196-3/+3
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #750 from smartdevicelink/bugfix/issue_717_custom_framerat...Joel Fischer2017-09-253-6/+17
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Make the backgrounding frames use the custom framerate if necessarybugfix/issue_717_custom_framerate_encoding_without_custom_timestampJoel Fischer2017-09-211-3/+8
| * | | | | | | Add the default frame rate of 30 to the default video settingsJoel Fischer2017-09-211-1/+2