summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* update licensebugfix/issue-1541-update-license-2020theresalech2020-02-031-1/+1
* Merge branch 'develop'6.5.0Joel Fischer2020-01-09230-6898/+4758
|\
| * Update changelog for v6.5.0Joel Fischer2020-01-091-1/+5
| * Merge pull request #1518 from smartdevicelink/bugfix/issue-1517-OCMock-test-f...Joel Fischer2020-01-082-29/+83
| |\
| | * Remove focus from testJoel Fischer2020-01-081-1/+1
| | * Fix issues shown by OCMock 3.5bugfix/issue-1517-OCMock-test-failuresJoel Fischer2020-01-082-30/+84
| |/
| * Update testing frameworks6.5.0-rc.1Joel Fischer2020-01-071-2/+2
| * Updates for v6.5.0 releaseJoel Fischer2020-01-07204-6456/+4095
| * Merge pull request #1482 from smartdevicelink/bugfix/issue-1476-SecurityManag...Joel Fischer2020-01-072-15/+81
| |\
| | * pr fixbugfix/issue-1476-SecurityManager-Set-For-SecondaryProtocolJustin Gluck2019-12-121-1/+2
| | * no messageJustin Gluck2019-12-111-1/+1
| | * reverting fileJustin Gluck2019-12-111-0/+1
| | * Merge branch 'bugfix/issue-1476-SecurityManager-Set-For-SecondaryProtocol' of...Justin Gluck2019-12-111-1/+0
| | |\
| | | * Update SmartDeviceLink/SDLProxy.mjustingluck932019-12-111-1/+0
| | * | adding check for is appReady so we don't configure until we are, also made su...Justin Gluck2019-12-112-28/+22
| | |/
| | * Fixing unit tests making them have better namesJustin Gluck2019-12-112-47/+51
| | * Adding test casesJustin Gluck2019-12-101-11/+60
| | * PR fix whitespaceJustin Gluck2019-12-101-0/+1
| | * Pr fixJustin Gluck2019-12-101-2/+1
| | * Apply suggestions from code reviewjustingluck932019-12-101-1/+1
| | * removing extra white spaceJustin Gluck2019-12-091-1/+0
| | * no messageJustin Gluck2019-12-091-0/+1
| | * undoing changesJustin Gluck2019-12-091-1/+0
| | * no messageJustin Gluck2019-12-094-9/+1
| | * making sure app is in ready state before connecting so security managers can ...Justin Gluck2019-12-092-4/+16
| | * adding a notification that the security manager has been set and to properly ...Justin Gluck2019-12-094-1/+15
| | * removing setting security manager since it was moved else whereJustin Gluck2019-12-061-2/+0
| | * setting security manager after an updateJustin Gluck2019-12-061-0/+1
| | * PR issuesJustin Gluck2019-12-021-6/+2
| | * setting secondary transport security manager when the 2nd transport is startedJustin Gluck2019-12-021-0/+6
| * | Merge pull request #1509 from smartdevicelink/bugfix/issues_1480_1492_1496_15...Joel Fischer2020-01-0314-380/+306
| |\ \
| | * | Fixed lockscreen status tablebugfix/issues_1480_1492_1496_1501_lockscreen_fixesNicoleYarroch2020-01-031-10/+10
| | * | Added documentationNicoleYarroch2020-01-022-1/+13
| | * | Fixed broken testsNicoleYarroch2020-01-022-18/+18
| | * | Renamed vars and added documentationNicoleYarroch2020-01-023-31/+46
| | * | Merge branch 'develop' into bugfix/issues_1480_1492_1496_1501_lockscreen_fixesNicoleYarroch2020-01-021-1/+1
| | |\ \
| | * | | Added more documentationNicoleYarroch2019-12-181-0/+3
| | * | | Renamed methods and varsNicoleYarroch2019-12-184-29/+31
| | * | | Fixed test caseNicoleYarroch2019-12-181-1/+1
| | * | | Merge branch 'bugfix/issues_1480_1492_1496_1501_lockscreen_fixes' of https://...NicoleYarroch2019-12-181-1/+1
| | |\ \ \
| | | * | | Apply suggestions from code reviewNicoleYarroch2019-12-181-1/+1
| | * | | | Removed spaces and commented out codeNicoleYarroch2019-12-181-4/+3
| | |/ / /
| | * | | Fixed lockscreen not showing when app foregroundedNicoleYarroch2019-12-182-4/+3
| | * | | Fixed doc grammarNicoleYarroch2019-12-181-1/+1
| | * | | Removed attributeNicoleYarroch2019-12-181-1/+1
| | * | | Removing spaces and importsNicoleYarroch2019-12-182-3/+0
| | * | | Reverted swift app globalLogLevelNicoleYarroch2019-12-181-1/+1
| | * | | Fixed broken test casesNicoleYarroch2019-12-184-98/+42
| | * | | Fixed notification being sent at wrong placeNicoleYarroch2019-12-181-4/+4
| | * | | RefactoredNicoleYarroch2019-12-183-97/+54