summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update preloaded PT and fix merge issuesfeature/base_app_services_implementationjacobkeeler2019-03-073-22/+54
* Merge branch 'feature/cloud_app_transport' into feature/base_app_services_imp...Jacob Keeler2019-03-07105-330/+1958
|\
| * Merge pull request #2834 from smartdevicelink/feature/cloud_app_properties_re...feature/cloud_app_transportJacob Keeler2019-03-0722-31/+125
| |\
| | * Implement cloud app properties revisionfeature/cloud_app_properties_revisionsjacobkeeler2019-03-0622-86/+77
| | * Revert "Remove setAppName"jacobkeeler2019-03-0617-0/+103
| * | Merge pull request #2833 from smartdevicelink/feature/cloud_app_hybrid_prefer...Jacob Keeler2019-03-077-31/+128
| |\ \ | | |/ | |/|
| | * Address review commentsfeature/cloud_app_hybrid_preferencejacobkeeler2019-03-072-12/+19
| | * Fix stylejacobkeeler2019-03-051-1/+0
| | * Handle hybrid app preferencejacobkeeler2019-03-057-25/+116
| * | Remove todos and fix typosjacobkeeler2019-03-054-7/+4
| * | Merge pull request #2781 from smartdevicelink/feature/secure_websocket_connec...Jacob Keeler2019-03-0514-46/+219
| |\ \
| | * | Fix issues after mergefeature/secure_websocket_connectionjacobkeeler2019-03-054-31/+38
| | * | Merge branch 'feature/cloud_app_transport' into feature/secure_websocket_conn...Jacob Keeler2019-03-05101-251/+1560
| | |\ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'origin/develop' into feature/cloud_app_transportjacobkeeler2019-03-0516-83/+208
| |\ \ \ | | |_|/ | |/| |
| | * | Merge pull request #2684 from LuxoftAKutsan/fix/default_light_capabilities_co...Jacob Keeler2019-03-045-0/+41
| | |\ \
| | | * | Fix the Light Name conversion from string to enum value in default capabilitiesIryna Lytvynenko2018-10-165-0/+41
| | * | | Merge pull request #2804 from smartdevicelink/feature/update_travis_distroJacob Keeler2019-02-271-1/+1
| | |\ \ \
| | | * | | Update Travis Distrofeature/update_travis_distrojacobkeeler2019-01-241-1/+1
| | * | | | fix: remove shared pointer of Application from HmiState (#2225)Sho Amano2019-02-265-67/+125
| | * | | | Merge pull request #2813 from smartdevicelink/fix/unhandled_smarttype_uintShobhit Adlakha2019-02-141-0/+3
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Added case for handling SmartType UInteger in SmartObject::duplicate functionfix/unhandled_smarttype_uintShobhit Adlakha2019-02-141-0/+3
| | |/ / /
| * | | | Merge pull request #2819 from smartdevicelink/feature/cloud_app_transport_reg...Jacob Keeler2019-03-041-2/+2
| |\ \ \ \
| | * | | | Fix stylefeature/cloud_app_transport_regex_fixjacobkeeler2019-03-041-1/+2
| | * | | | Merge branch 'feature/cloud_app_transport' of github.com:smartdevicelink/sdl_...JackLivio2019-03-0175-136/+1204
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | GetCloudAppProperties (#2824)JackLivio2019-03-0139-81/+480
| * | | | | Get Icon URL Request (#2823)JackLivio2019-03-0144-32/+449
| * | | | | Close Cloud Connection (#2825)JackLivio2019-02-287-2/+51
| * | | | | Increase stack size to fix segaultJackLivio2019-02-271-1/+1
| * | | | | Merge pull request #2822 from smartdevicelink/feature/auth_token_protocol_pay...Jacob Keeler2019-02-2722-25/+229
| |\ \ \ \ \
| | * | | | | Increase auth_token size according to specfeature/auth_token_protocol_payloadjacobkeeler2019-02-261-2/+3
| | * | | | | Add auth_token to StartServiceACK for cloud appsjacobkeeler2019-02-2621-19/+216
| | * | | | | Revert "Update based on comments"jacobkeeler2019-02-245-6/+12
| |/ / / / /
| | * | | | update regexJackLivio2019-03-011-1/+1
| | * | | | Fix regex command for reading paths post port numberJackLivio2019-02-211-1/+1
| |/ / / /
| * | | | Merge pull request #2782 from smartdevicelink/feature/cloud_app_connection_st...JackLivio2019-01-2315-33/+149
| |\ \ \ \
| | * | | | Add pending device map locksfeature/cloud_app_connection_status_disconnectJackLivio2019-01-231-0/+4
| | * | | | Merge branch 'feature/cloud_app_transport' into feature/cloud_app_connection_...Jacob Keeler2019-01-2311-19/+12
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #2749 from smartdevicelink/feature/cloud_app_connection_st...Jacob Keeler2019-01-2260-308/+1104
| |\ \ \ \ \
| | | * \ \ \ Merge branch 'feature/cloud_app_connection_status' into feature/cloud_app_con...Jacob Keeler2019-01-161-15/+22
| | | |\ \ \ \
| | | * | | | | Address CommentsJackLivio2019-01-164-21/+20
| | | * | | | | Fix reconnect flow after modified disconnect flowjacobkeeler2019-01-154-11/+16
| | | * | | | | Merge remote-tracking branch 'origin/feature/cloud_app_connection_status' int...jacobkeeler2019-01-1420-101/+149
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge remote-tracking branch 'origin/feature/cloud_app_connection_status' int...JackLivio2018-12-1040-238/+336
| | | |\ \ \ \ \ \
| | | * | | | | | | Set HMI None on disconnect. Add reconnection after disconnect.JackLivio2018-11-3015-55/+163
| | | * | | | | | | Include mock connection handlerJackLivio2018-11-301-0/+1
| | | | | | | | | * Fix merge conflict typoJacob Keeler2019-02-081-1/+1
| | | | | | | | | * Address review commentsShobhit Adlakha2019-02-082-5/+3
| | | | | | | | | * Merge branch 'feature/cloud_app_connection_status' into feature/secure_websoc...Jacob Keeler2019-02-078-24/+32
| | | | | | | | | |\ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Merge branch 'feature/cloud_app_transport' into feature/cloud_app_connection_...feature/cloud_app_connection_statusJacob Keeler2019-01-229-16/+11
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #2742 from smartdevicelink/feature/cloud_app_connection_flowJackLivio2019-01-2252-16/+1647
| |\ \ \ \ \ \ \ \ \
View Lorry Controller Status