summaryrefslogtreecommitdiff
path: root/src/components/application_manager
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/develop' into feature/choice_vr_optionalfeature/choice_vr_optionalJackLivio2018-08-153-12/+46
|\
| * Remove redundant function validateJackLivio2018-08-141-3/+3
| * Address commentsJackLivio2018-08-142-13/+41
| * Address CommentsJackLivio2018-08-131-9/+15
| * Address comments and logic refactorJackLivio2018-08-102-4/+4
* | Merge branch 'feature/mobile_versioning' into feature/choice_vr_optionalJackLivio2018-08-076-25/+17
|\ \ | |/
| * Update based on commentsJackLivio2018-08-076-25/+17
| * Merge remote-tracking branch 'origin/develop' into feature/mobile_versioningJackLivio2018-08-0632-130/+445
| |\
* | \ Merge branch 'feature/mobile_versioning' into feature/choice_vr_optionalConlain Kelly2018-08-068-4/+99
|\ \ \ | |/ /
| * | Check StyleJackLivio2018-08-058-73/+90
| * | Fix existing unit testsJackLivio2018-08-052-0/+13
| * | RAI version negotiationJackLivio2018-08-011-4/+17
| * | Add support for mandatory and removed versioningJackLivio2018-08-016-1/+50
* | | yet another style fixConlain Kelly2018-08-012-7/+8
* | | Cleanup comments, add a test for mixed vr commandsConlain Kelly2018-08-014-9/+45
* | | style fixConlain Kelly2018-07-311-11/+10
* | | Merge branch 'develop' into feature/choice_vr_optionalJacob Keeler2018-07-3119-98/+417
|\ \ \ | | |/ | |/|
| * | Fix defects found after ATF testingAKalinich-Luxoft2018-07-303-30/+31
| * | Answer Livio commentsAKalinich-Luxoft2018-07-306-42/+47
| * | fix styleAshwin Karemore2018-07-265-23/+17
| * | added UT for warningsAshwin Karemore2018-07-265-1/+223
| * | create interaction choice set run method changesAshwin Karemore2018-07-261-19/+16
| * | revert image check and return Warning or invalid dataAshwin Karemore2018-07-2617-70/+262
| * | fix for show RPC UTAshwin Karemore2018-07-261-8/+19
| * | fix build after resolving conflictAshwin Karemore2018-07-261-3/+3
| * | fix for invalid image rpc in create interaction choice set requestAshwin Karemore2018-07-265-59/+46
| * | UT fix after removing image checkAshwin Karemore2018-07-265-31/+93
| * | removed image check in RPCAshwin Karemore2018-07-268-152/+0
* | | add testing support for VR optionalConlain Kelly2018-07-311-1/+60
* | | style fixConlain Kelly2018-07-312-8/+7
* | | more cleanup, add mock implementationsConlain Kelly2018-07-314-45/+62
* | | general cleanup on vr commands checksConlain Kelly2018-07-305-48/+56
* | | style fixConlain Kelly2018-07-245-42/+45
* | | Merge branch 'develop' of https://github.com/smartdevicelink/sdl_core into fe...Conlain Kelly2018-07-2417-63/+56
|\ \ \ | |/ /
| * | Merge pull request #2392 from smartdevicelink/feature/boost_lock_implementationJacob Keeler2018-07-2416-29/+25
| |\ \
| | * | Remove exception-handling code, extra constructorsfeature/boost_lock_implementationConlain Kelly2018-07-241-1/+0
| | * | Merge branch 'develop' into feature/boost_lock_implementationJacob Keeler2018-07-19239-1487/+1356
| | |\ \
| | * | | style fixConlain Kelly2018-07-185-7/+8
| | * | | ayyy it buildsConlain Kelly2018-07-183-7/+7
| | * | | Merge branch 'develop' into feature/boost_lock_implementationConlain Kelly2018-07-181831-95426/+111716
| | |\ \ \
| | * | | | dump current implementation, currently stuck on bigger SDL lock scoping bugConlain Kelly2018-06-052-21/+41
| | * | | | Begin changing locks over, very segfault-y right nowConlain Kelly2018-05-3116-27/+19
| * | | | | Fix stylejacobkeeler2018-07-231-34/+31
| | |_|_|/ | |/| | |
* | | | | Cleanup, remove some typosConlain Kelly2018-07-242-32/+16
* | | | | Fix segfault, add perform interaction checksConlain Kelly2018-07-243-36/+50
* | | | | add perform interaction modificationsConlain Kelly2018-07-241-24/+26
* | | | | Create grammar only onceConlain Kelly2018-07-231-10/+11
* | | | | Merge branch 'develop' of https://github.com/smartdevicelink/sdl_core into fe...Conlain Kelly2018-07-23243-1539/+1404
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2328 from ZhdanovP/fix/remove_commented_codeJackLivio2018-07-204-50/+35
| |\ \ \ \
| | * | | | Uncomment UT'sv-malko42018-07-111-0/+45