summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert Date in mobile_api.xmlfeature/add_media_service_data_imageJackLivio2019-06-071-1/+1
|
* Get full media image pathJackLivio2019-06-046-0/+32
|
* Merge remote-tracking branch 'origin/develop' into ↵JackLivio2019-06-0429-234/+1401
|\ | | | | | | feature/add_media_service_data_image
| * Merge pull request #2907 from smartdevicelink/tests/icon_urlJacob Keeler2019-05-313-2/+100
| |\ | | | | | | Add unit tests for icon_url
| | * Update unit testtests/icon_urlJackLivio2019-05-301-1/+10
| | |
| | * ADd unit tests for icon_urlJackLivio2019-05-074-7/+96
| | |
| * | Merge remote-tracking branch 'origin/master' into developjacobkeeler2019-05-3026-232/+1301
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_command_factory.cc # src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc # src/components/transport_manager/src/cloud/cloud_websocket_transport_adapter.cc # src/components/transport_manager/test/include/transport_manager/cloud/sample_websocket_server.h # src/components/transport_manager/test/sample_websocket_server.cc # src/components/transport_manager/test/transport_adapter_test.cc # src/components/transport_manager/test/websocket_connection_test.cc
| | * \ Merge pull request #2934 from smartdevicelink/release/5.1.25.1.2Shobhit Adlakha2019-05-3027-207/+1995
| | |\ \ | | | | | | | | | | Release 5.1.2
| | | * \ Merge pull request #2931 from smartdevicelink/hotfix/service_data_image_pathsrelease/5.1.2Jacob Keeler2019-05-298-22/+352
| | | |\ \ | | | | | | | | | | | | Send full image paths to HMI in AppServiceData
| | | | * | Fix incorrect call in SendNotificationToConsumershotfix/service_data_image_pathsjacobkeeler2019-05-292-2/+2
| | | | | |
| | | | * | Send full image paths to HMI in AppServiceDatajacobkeeler2019-05-286-20/+350
| | | | | |
| | | * | | Merge pull request #2786 from XevoInc/fix/buffer_overrun_bson_parsingJacob Keeler2019-05-291-41/+71
| | | |\ \ \ | | | | | | | | | | | | | | Avoid out-of-bound access while reading corrupted BSON field
| | | | * | | fix: avoid out-of-bound access while reading corrupted BSON fieldSho Amano2018-12-131-41/+71
| | | | | | |
| | | * | | | Merge pull request #2908 from smartdevicelink/fix/check_bson_versionJacob Keeler2019-05-292-35/+8
| | | |\ \ \ \ | | | | | | | | | | | | | | | | Add version check for BSON library
| | | | * | | | Add version check for BSON libraryfix/check_bson_versionjacobkeeler2019-05-292-35/+8
| | | | | |/ / | | | | |/| |
| | | * | | | Merge pull request #2933 from ↵Jacob Keeler2019-05-291-4/+7
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | smartdevicelink/hotfix/publish_app_service_construction Fix creation of PublishAppService command
| | | | * | | Fix creation of PublishAppService commandhotfix/publish_app_service_constructionjacobkeeler2019-05-291-4/+7
| | | |/ / /
| | | * | | Merge pull request #2930 from ↵Shobhit Adlakha2019-05-289-33/+1331
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | smartdevicelink/hotfix/cloud_app_endpoint_with_path Connection to cloud app endpoints with a target parameter
| | | | * | | Implemented fix and unit tests for regex endpoint parsing and websocket ↵hotfix/cloud_app_endpoint_with_pathShobhit Adlakha2019-05-249-33/+1331
| | | | | | | | | | | | | | | | | | | | | | | | | | | | connections
| | | * | | | Merge pull request #2924 from ↵Jacob Keeler2019-05-247-73/+226
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | smartdevicelink/hotfix/mobile_notification_broadcasting Check message source before constructing commands
| | | | * | | Address review commentshotfix/mobile_notification_broadcastingjacobkeeler2019-05-233-17/+17
| | | | | | |
| | | | * | | Add missing check in App Service Command Factoryjacobkeeler2019-05-221-3/+6
| | | | | | |
| | | | * | | Check message source before constructing commandsjacobkeeler2019-05-226-67/+217
| | | |/ / / | | |/| | |
| | | * | | Merge pull request #2928 from smartdevicelink/fix/travis_build_failuresJacob Keeler2019-05-241-3/+4
| | | |\ \ \ | | |/ / / / | | | | | | Fix Travis build failures
| | | * | | Fix Travis build failuresfix/travis_build_failuresjacobkeeler2019-05-231-3/+4
| | |/ / /
* | | | | Add media image to apisJackLivio2019-05-232-1/+16
|/ / / /
* | | | Merge pull request #2912 from smartdevicelink/tests/rpc_passing_handlerShobhit Adlakha2019-05-153-0/+482
|\ \ \ \ | | | | | | | | | | RPC Passing Handler unit tests
| * | | | Addressed review commentstests/rpc_passing_handlerShobhit Adlakha2019-05-151-6/+17
| | | | |
| * | | | Removed unnecessary expectations from testsShobhit Adlakha2019-05-151-21/+8
| | | | |
| * | | | Addressed review commentsShobhit Adlakha2019-05-151-97/+92
| | | | |
| * | | | Added connection key constants and PasstrhoughParams structShobhit Adlakha2019-05-131-94/+112
| | | | |
| * | | | Added RPC Passthrough request timeoutShobhit Adlakha2019-05-131-1/+52
| | | | |
| * | | | Implemented test for UNSUPPORTED_REQUEST response(forwarded to mobile)Shobhit Adlakha2019-05-101-28/+32
| | | | |
| * | | | Implemented test for UNSUPPORTED_REQUEST response(forwarded to core)Shobhit Adlakha2019-05-101-21/+44
| | | | |
| * | | | Fixed typo and implemented mock_rpc_handlerShobhit Adlakha2019-05-102-5/+49
| | | | |
| * | | | Implemeted unit tests for the rpc_passing_handler classShobhit Adlakha2019-05-103-5/+354
| | |_|/ | |/| |
* | | | Merge pull request #2913 from smartdevicelink/fix/menu_icon_nullJacob Keeler2019-05-151-1/+3
|\ \ \ \ | | | | | | | | | | Add check for missing option parameter `menu_icon`
| * | | | Add check for missing option parameter `menu_icon`fix/menu_icon_nulljacobkeeler2019-05-141-1/+3
|/ / / /
* | | | Merge pull request #2906 from smartdevicelink/feature/websocket_connection_testsShobhit Adlakha2019-05-135-5/+719
|\ \ \ \ | |/ / / |/| | | WS/WSS Connection unit tests
| * | | Implemented ASSERT expectations for client connection pointer checkfeature/websocket_connection_testsShobhit Adlakha2019-05-131-2/+2
| | | |
| * | | Addressed review commentsShobhit Adlakha2019-05-133-35/+30
| | | |
| * | | Separated interface and implementation for sample_websocket_serverShobhit Adlakha2019-05-084-204/+242
| | | |
| * | | Added WebsocketClient structShobhit Adlakha2019-05-061-52/+43
| | | |
| * | | Added CA certificate and fixed style for sample_websocket_serverShobhit Adlakha2019-05-062-243/+172
| | | |
| * | | WSS Connection test and sample WSS ServerShobhit Adlakha2019-05-062-6/+399
| | | |
| * | | WS Connection test and sample WS ServerShobhit Adlakha2019-05-034-5/+373
|/ / /
* | | Merge pull request #2901 from smartdevicelink/feature/update_style_scriptJacob Keeler2019-05-011464-6697/+6962
|\ \ \ | | | | | | | | Update style script
| * \ \ Merge remote-tracking branch 'origin/release/5.1.1' into ↵feature/update_style_scriptjacobkeeler2019-04-3013-10/+68
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/update_style_script # Conflicts: # src/components/transport_manager/src/transport_manager_impl.cc
| * | | | Fix build failures from rearranged includesjacobkeeler2019-04-307-7/+16
| | | | |
| * | | | Run updated style scriptjacobkeeler2019-04-291457-6685/+6940
| | | | |