summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add `modified` comment to modified log4cxx filesfix/apache_license_2097jacobkeeler2018-04-182-0/+4
* Merge branch 'master' into developjacobkeeler2018-04-1826-108/+233
|\
| * Merge pull request #2133 from smartdevicelink/release/4.5.14.5.1success,-HMI-show-radio-screenfix/check_transport_manager_initfeature/external_proprietary_policyJackLivio2018-04-1832-45/+290
| |\
| | * Merge pull request #2141 from smartdevicelink/fix/retry_after_failed_pturelease/4.5.1Jacob Keeler2018-04-161-2/+1
| | |\
| | | * Fix infinite PTU when invalid PT, then a valid PT is receivedfix/retry_after_failed_ptujacobkeeler2018-04-161-2/+1
| | |/
| | * Fix style issuesjacobkeeler2018-04-125-11/+10
| | * Merge pull request #2125 from smartdevicelink/fix/update-apache-licensetheresalech2018-04-1214-0/+28
| | |\
| | | * Update Apache Licensefix/update-apache-licenseJackLivio2018-04-1014-0/+28
| | |/ | |/|
| | * Merge pull request #2114 from smartdevicelink/hotfix/invalid_ptu_loopJacob Keeler2018-04-114-7/+17
| | |\
| | | * Don't force a PTU when an invalid PT is receivedhotfix/invalid_ptu_loopjacobkeeler2018-04-094-7/+17
| | |/ | |/|
| | * Merge pull request #2115 from smartdevicelink/hotfix/unregister_during_audio_...Jacob Keeler2018-04-0910-25/+234
| | |\ | |/ /
| | * Fix/unregister while audio pass thru (#1757)hotfix/unregister_during_audio_pass_thruSho Amano2018-04-0510-25/+234
| |/
| * Merge pull request #2005 from smartdevicelink/release/4.5.04.5.0Jacob Keeler2018-04-051641-324627/+24854
| |\
| | * Merge pull request #2113 from smartdevicelink/fix/clearer_default_endpointsrelease/4.5.0Jacob Keeler2018-04-051-2/+2
| | |\
| | | * Update default endpoint urlsfix/clearer_default_endpointsJacob Keeler2018-04-051-2/+2
| | |/
| | * Merge pull request #2110 from smartdevicelink/fix/add_license_to_mb_filesJackLivio2018-04-044-1/+120
| | |\
| | | * Add license to new message broker filesfix/add_license_to_mb_filesJackLivio2018-04-044-1/+120
| | |/
| | * Merge pull request #2081 from smartdevicelink/feature/update_changelog_4.5.0Jacob Keeler2018-04-041-92/+61
| | |\
| | | * Update Changelog for Release 4.5.0feature/update_changelog_4.5.0Jacob Keeler2018-04-041-92/+61
| | * | Merge pull request #2108 from smartdevicelink/fix/load_service_type_as_string...JackLivio2018-04-042-5/+5
| | |\ \
| | | * | Additional fixes for 2072fix/load_service_type_as_string_from_backup_ptJackLivio2018-04-042-5/+5
| | |/ /
* | | | Merge pull request #2144 from vkushnirenko-luxoft/fix/style_fixJacob Keeler2018-04-171-2/+1
|\ \ \ \
| * | | | Fix style after PR #2132vkushnirenko-luxoft2018-04-171-2/+1
|/ / / /
* | | | Merge pull request #2132 from smartdevicelink/fix/remove_ford_references_from...Jacob Keeler2018-04-1352-94/+94
|\ \ \ \
| * | | | Remove Ford references from policy testsfix/remove_ford_references_from_testsjacobkeeler2018-04-1252-94/+94
|/ / / /
* | | | Merge pull request #2097 from smartdevicelink/hotfix/gcc7_buildJacob Keeler2018-04-095-13/+13
|\ \ \ \
| * | | | Fix build failures when using GCC7hotfix/gcc7_buildJacob Keeler2018-03-275-13/+13
| |/ / /
* | | | Merge pull request #2098 from smartdevicelink/fix/documentation_pathsJacob Keeler2018-04-099-36/+36
|\ \ \ \
| * | | | Fix broken links and paths in SDD Documentsfix/documentation_pathsjacobkeeler2018-03-289-36/+36
| |/ / /
* | | | Merge pull request #2118 from vkushnirenko-luxoft/fix/style_fixJacob Keeler2018-04-061-6/+5
|\ \ \ \
| * | | | Fix style after 4.5 mergevkushnirenko-luxoft2018-04-061-6/+5
|/ / / /
* | | | Merge branch 'release/4.5.0' into developjacobkeeler2018-04-0334-155/+190
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #2100 from smartdevicelink/fix/service_endpoint_keys_as_st...JackLivio2018-03-292-6/+2
| |\ \ \
| | * | | External Proprietary Lock Screen URL FixJackLivio2018-03-292-6/+2
| |/ / /
| * | | Merge pull request #2086 from LuxoftAKutsan/fix/on_permission_change_after_ap...JackLivio2018-03-295-35/+24
| |\ \ \
| | * | | Move checking if app revoked in the begining of check PermissionsAlex Kutsan2018-03-291-11/+11
| | * | | Process setting user concent if group permissions are emptyAlex Kutsan2018-03-291-4/+0
| | * | | Avoid adding RC groups in external policy flowAlex Kutsan2018-03-291-12/+1
| | * | | Add apropriate logging in policy flowAlex Kutsan2018-03-285-8/+12
| |/ / /
| * | | Merge pull request #2096 from smartdevicelink/fix/broken_SAD_linkJacob Keeler2018-03-271-1/+1
| |\ \ \
| | * | | Update link to software architecture documentfix/broken_SAD_linkJacob Keeler2018-03-271-1/+1
| |/ / /
| * | | Merge pull request #2085 from LuxoftAKutsan/fix/activation_app_external_propr...JackLivio2018-03-2611-19/+26
| |\ \ \
| | * | | Fix styleAlex Kutsan2018-03-231-3/+2
| | * | | Avoid integer overflowAlex Kutsan2018-03-2311-19/+26
| | | |/ | | |/|
| * | | Merge pull request #2076 from smartdevicelink/fix/security_off_buildJacob Keeler2018-03-2218-96/+136
| |\ \ \ | | |/ / | |/| |
| | * | Fix build issues and test failures when building with ENABLE_SECURITY=OFFfix/security_off_buildjacobkeeler2018-03-2118-96/+136
| * | | Merge pull request #2078 from smartdevicelink/feature/4.5.0_README_updatesJacob Keeler2018-03-211-0/+2
| |\ \ \ | | |/ / | |/| |
| | * | Update README with new dependenciesfeature/4.5.0_README_updatesJacob Keeler2018-03-211-0/+2
| |/ /
| * | Merge pull request #2055 from smartdevicelink/fix/update_lock_screen_iconJacob Keeler2018-03-071-1/+1
| |\ \
| | * | Update Lock Screen Icon URLfix/update_lock_screen_iconJacob Keeler2018-03-071-1/+1
| |/ /