summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into feature/cancel_interactionfeature/cancel_interactionJacob Keeler2019-07-3124-7/+815
|\
| * Merge pull request #2967 from smartdevicelink/feature/open_menu_rpcShobhit Adlakha2019-07-3119-0/+724
| |\
| | * Add ShowAppMenu to policy table enumsfeature/open_menu_rpcShobhit Adlakha2019-07-254-0/+24
| | * Fix styleShobhit Adlakha2019-07-225-12/+12
| | * Fixed merge conflicts and updated branchShobhit Adlakha2019-07-221685-7861/+34155
| | |\
| | * \ Merge pull request #2725 from mkorniichuk/feature/show_app_menuMykola Korniichuk (GitHub)2018-12-1215-0/+698
| | |\ \
| | | * | Update for sdl_preloaded_pt.json:Mykola Korniichuk2018-12-041-0/+6
| | | * | discard changes in policy_table/enumsMykola Korniichuk2018-12-044-24/+0
| | | * | fix according to commentsMykola Korniichuk2018-12-048-44/+40
| | | * | Open Menu RPCMykola Korniichuk2018-10-2918-0/+720
| | |/ /
| * | | Merge pull request #2964 from smartdevicelink/feature/template_titlesShobhit Adlakha2019-07-305-6/+41
| |\ \ \
| | * | | Add templateTitle String minlength and increase showStrings array sizefeature/template_titlesShobhitAd2019-07-162-3/+3
| | * | | Implemented templateTitle paramater for Show RPCShobhitAd2019-07-105-4/+39
| * | | | Merge pull request #2965 from smartdevicelink/feature/alert_iconCollin2019-07-266-1/+50
| |\ \ \ \
| | * | | | add imageTypeSupportedfeature/alert_iconCollin2019-07-241-0/+3
| | * | | | add alertIcon imageFieldCollin2019-07-231-4/+7
| | * | | | add menuLayoutsAvailable to hmi_capabilities.jsonCollin2019-07-221-0/+4
| | * | | | implement alert icon parameter to alert rpcCollin2019-07-115-1/+40
| | |/ / /
* | | | | VRPerformInteraction.cancelIDCollin2019-07-311-0/+5
* | | | | add scrollableMessage::cancelIDCollin2019-07-291-0/+5
* | | | | remove unnecessary app registered checkCollin2019-07-261-11/+0
* | | | | Merge branch 'develop' into feature/cancel_interactionJacob Keeler2019-07-2585-2802/+5237
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2959 from smartdevicelink/feature/auto_complete_listJacob Keeler2019-07-257-39/+66
| |\ \ \ \
| | * | | | Update after proposal revisionfeature/auto_complete_listjacobkeeler2019-07-242-3/+9
| | * | | | Add autoCompleteList parameterjacobkeeler2019-06-267-39/+60
| * | | | | Merge pull request #2944 from smartdevicelink/feature/update_and_unpublish_ap...JackLivio2019-07-2423-18/+802
| |\ \ \ \ \
| | * | | | | Fix stylefeature/update_and_unpublish_app_serviceJackLivio2019-07-241-4/+4
| | * | | | | Address commentJackLivio2019-07-231-1/+4
| | * | | | | Update src/components/application_manager/rpc_plugins/app_service_rpc_plugin/...JackLivio2019-07-231-1/+1
| | * | | | | Address commentsJackLivio2019-07-223-11/+13
| | * | | | | Update src/components/application_manager/src/app_service_manager.ccJackLivio2019-07-221-1/+1
| | * | | | | Merge branch 'develop' into feature/update_and_unpublish_app_serviceJacob Keeler2019-07-1956-227/+1501
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Fix check for duplicate nameJackLivio2019-07-171-7/+21
| | * | | | | Apply suggestions from code reviewJackLivio2019-07-173-5/+5
| | * | | | | Address some commentsJackLivio2019-07-173-9/+32
| | * | | | | Fix unit testsJackLivio2019-06-111-0/+8
| | * | | | | Compare service_id to default embedded serviceJackLivio2019-06-108-41/+53
| | * | | | | Add unpublish rpc to preloaded ptJackLivio2019-06-101-0/+8
| | * | | | | Merge branch 'develop' of github.com:smartdevicelink/sdl_core into feature/up...JackLivio2019-06-108-0/+47
| | |\ \ \ \ \
| | * | | | | | Unpublish and Update App ServicesJackLivio2019-06-1021-16/+730
| * | | | | | | Merge pull request #2783 from smartdevicelink/feature/sdl_passenger_modeJacob Keeler2019-07-2444-95/+862
| |\ \ \ \ \ \ \
| | * | | | | | | Fix not saving consumer friendly messages into DBfeature/sdl_passenger_modeigapchuck2019-07-242-2/+22
| | * | | | | | | Unit tests LockScreenDismissalWarningigapchuck2019-07-242-3/+203
| | * | | | | | | Process lock_screen_dismissal_warning logicigapchuck2019-07-249-8/+77
| | * | | | | | | Add lock_screen_dismissal_warning to Policy Interfaceigapchuck2019-07-2420-15/+146
| | * | | | | | | Add lock_screen_dismissal_warning to API and policy.igapchuck2019-07-242-0/+15
| | * | | | | | | Update after rebase on developigapchuck2019-07-241-2/+3
| | * | | | | | | Send OnDriverDistraction notification in case if LockScreenDismissal state wa...Alexander2019-07-249-30/+83
| | * | | | | | | Unit tests for sdl_passanger mode lock screen dismissalAlexander2019-07-242-31/+62
| | * | | | | | | Process lock_screen_dismissal_enabled logicAlexander2019-07-244-4/+27