summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove uses of @importhotfix/issue_595Joel Fischer2017-03-3111-19/+14
* Merge pull request #594 from smartdevicelink/hotfix/issue_593Joel Fischer2017-03-3012-53/+44
|\
| * Update travis for updated testsJoel Fischer2017-03-302-3/+2
| * Update with Xcode 8.3 fixesJoel Fischer2017-03-3010-50/+42
|/
* Merge pull request #586 from smartdevicelink/hotfix/issue_557_2Joel Fischer2017-03-2925-44/+147
|\
| * Add test for NSNullJoel Fischer2017-03-231-1/+18
| * Update array getters to check for NSNull and return an empty arrayJoel Fischer2017-03-2324-43/+129
|/
* Merge pull request #580 from smartdevicelink/hotfix/issue_579_apptype_resetJoel Fischer2017-03-171-0/+1
|\
| * Updated appType to return when setting to nil with default value.hotfix/issue_579_apptype_resetMuller, Alexander (A.)2017-03-161-0/+1
|/
* Merge pull request #576 from smartdevicelink/hotfix/issue_575Joel Fischer2017-03-131-1/+2
|\
| * Update README.mdhotfix/issue_575theresalech2017-03-101-1/+2
|/
* Merge pull request #571 from smartdevicelink/hotfix/issue_570Joel Fischer2017-03-081-2/+2
|\
| * Update LICENSEtheresalech2017-03-081-2/+2
|/
* Update to v4.5.54.5.5Joel Fischer2017-03-075-4/+12
* Merge pull request #565 from davidswi/hotfix/issue_522_hangJoel Fischer2017-03-071-2/+2
|\
| * Tiny style updateJoel Fischer2017-03-071-2/+1
| * Prevent infinite loops in send block while by checking ostream state.david.switzer2017-03-031-2/+3
* | Merge pull request #556 from smartdevicelink/hotfix/issue_555Joel Fischer2017-03-062-4/+4
|\ \
| * | Fixed misspellings and formatting for templatshotfix/issue_555Muller, Alexander (A.)2017-03-012-4/+4
* | | Merge pull request #561 from smartdevicelink/hotfix/issue_560Joel Fischer2017-03-031-1/+1
|\ \ \ | |_|/ |/| |
| * | Fixed issue with incorrectly setting state on manager disconnect.hotfix/issue_560Muller, Alexander (A.)2017-03-021-1/+1
|/ /
* | Merge pull request #548 from smartdevicelink/hotfix/issue_538Joel Fischer2017-03-021-19/+31
|\ \ | |/ |/|
| * Merge remote-tracking branch 'origin/master' into hotfix/issue_538hotfix/issue_538Muller, Alexander (A.)2017-03-0118-23/+71
| |\
| * | SDLLockScreenManager now tracks active state to show lock screen when the app...Joel Fischer2017-02-161-19/+31
* | | Merge pull request #551 from smartdevicelink/hotfix/issue_549Joel Fischer2017-03-011-0/+5
|\ \ \ | |_|/ |/| |
| * | Added check for starting a lifecycle manager that has already been started.Muller, Alexander (A.)2017-03-011-0/+5
|/ /
* | Update to v4.5.44.5.4Joel Fischer2017-02-245-4/+12
* | Merge pull request #542 from smartdevicelink/hotfix/issue_529Joel Fischer2017-02-231-1/+5
|\ \
| * \ Merge remote-tracking branch 'origin/master' into hotfix/issue_529hotfix/issue_529Muller, Alexander (A.)2017-02-2210-14/+43
| |\ \
| * | | Adding in check for nullable properties of video encoder callbackMuller, Alexander (A.)2017-02-141-1/+5
| | |/ | |/|
* | | Merge pull request #544 from smartdevicelink/hotfix/issue_543Joel Fischer2017-02-232-4/+11
|\ \ \ | |_|/ |/| |
| * | Improved state machine throw. Also added in more specific spec to handle this.Muller, Alexander (A.)2017-02-232-5/+10
| * | Added in more descriptive exception throw for debugging.hotfix/issue_543Muller, Alexander (A.)2017-02-221-2/+4
|/ /
* | Merge pull request #541 from smartdevicelink/hotfix/issue_539Joel Fischer2017-02-212-5/+34
|\ \
| * | Fixes #539hotfix/issue_539Joel Fischer2017-02-202-5/+34
|/ /
* | Merge pull request #533 from smartdevicelink/hotfix/xcode_83_fixesJoel Fischer2017-02-208-9/+9
|\ \ | |/ |/|
| * Xcode 8.3 beta 2 fixeshotfix/xcode_83_fixesJoel Fischer2017-02-158-9/+9
|/
* Update for v4.5.34.5.3Joel Fischer2017-02-085-4/+9
* Merge pull request #521 from smartdevicelink/hotfix/issue_520_streaming_objec...Joel Fischer2017-02-071-1/+1
|\
| * Fixed issue with calling streaming media manager if proxy is started, but not...Muller, Alexander (A.)2017-02-071-1/+1
|/
* Merge pull request #517 from smartdevicelink/hotfix/issue_516_hmi_changeJoel Fischer2017-02-071-1/+3
|\
| * Added check for hmi equality and old send delegate if not equal.hotfix/issue_516_hmi_changeMuller, Alexander (A.)2017-02-021-1/+3
* | Merge pull request #519 from smartdevicelink/hotfix/issue_518Joel Fischer2017-02-071-0/+1
|\ \ | |/ |/|
| * Set compressionSession to null so we do not accidentally over-release it.hotfix/issue_518Muller, Alexander (A.)2017-02-061-0/+1
|/
* Set swift-version for cocoapods until we can upgrade testsJoel Fischer2017-01-271-0/+1
* Update to v4.5.24.5.2Joel Fischer2017-01-275-4/+14
* Run clang-formatJoel Fischer2017-01-272-2/+2
* Merge pull request #513 from smartdevicelink/hotfix/issue_512_debug_toolJoel Fischer2017-01-272-4/+12
|\
| * Moved point at which we set the logging to be before we initialize anything w...hotfix/issue_512_debug_toolMuller, Alexander (A.)2017-01-261-3/+3
| * Update logger to initialize on lifecycle initialization, not startJoel Fischer2017-01-261-12/+5