summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into feature/boost_websocket_hmi_message_adapterfeature/boost_websocket_hmi_message_adapterJackLivio2018-02-02578-267025/+14777
|\
| * Merge pull request #2004 from smartdevicelink/hotfix/dynamically_link_librariesJackLivio2018-02-02541-266702/+13969
| |\
| | * Merge branch 'develop' into hotfix/dynamically_link_librarieshotfix/dynamically_link_librariesJackLivio2018-02-021052-51109/+10071
| | |\ | | |/ | |/|
| * | Merge pull request #1525 from smartdevicelink/feature/invalid_data_infoJacob Keeler2018-02-0236-322/+806
| |\ \
| | * | Update PR to use new DEPRECATED macrofeature/invalid_data_infojacobkeeler2018-01-1911-14/+3
| | * | Merge remote-tracking branch 'origin/develop' into feature/invalid_data_infojacobkeeler2018-01-19201-1750/+2569
| | |\ \
| | * | | Use ValidationReport objects for reporting rather than stringsjacobkeeler2017-11-3047-735/+653
| | * | | Deprecate old validate methodsjacobkeeler2017-09-2919-7/+187
| | * | | Fix build errors from merge and remove quotes from error messagesjacobkeeler2017-09-298-39/+33
| | * | | Merge remote-tracking branch 'origin/release/4.4.0' into feature/invalid_data...jacobkeeler2017-09-28486-33919/+43966
| | |\ \ \
| | * | | | Invalid data responses now return useful error messages in `info` fieldJacob Keeler2017-05-0443-364/+761
| * | | | | Merge pull request #950 from smartdevicelink/hotfix/remove_ford_specific_poli...JackLivio2018-02-021-2/+2
| |\ \ \ \ \
| | * | | | | Change endpoints to localhosthotfix/remove_ford_specific_policy_endpointJackLivio2018-02-021-2/+2
| | * | | | | Replace 0x04 endpoint with dummy urlJackLivio2018-02-021-1/+1
| | * | | | | Remove Ford specific policy endpointJackLivio2016-11-041-1/+1
| | | | | | * Review CommentsJackLivio2018-02-022-2/+1
| | | | | | * Fix DBus Buildjacobkeeler2018-01-3016-50/+135
| | | | | | * Remove Dbus and Iap librariesJackLivio2018-01-21459-241371/+6
| | | | | | * Get dbus to compileJackLivio2018-01-2013-111/+13831
| | | | | | * Dynamically link libusb-1.0JackLivio2018-01-2061-25177/+7
* | | | | | | Review CommentsJackLivio2018-02-022-43/+36
* | | | | | | Fixes for PR commentJackLivio2018-02-0214-1009/+932
* | | | | | | Fix shutdown after hmi reconnectionJackLivio2018-02-024-17/+23
* | | | | | | Add Boost Websocket HMI AdapterJackLivio2018-02-0249-6504/+1239
|/ / / / / /
* | | | | | Merge pull request #2001 from smartdevicelink/fix/style_issues_developJacob Keeler2018-02-017-29/+30
|\ \ \ \ \ \
| * | | | | | Fix style issues in projectfix/style_issues_developjacobkeeler2018-02-017-29/+30
|/ / / / / /
* | | | | | Merge pull request #2000 from smartdevicelink/fix/deprecated_warningsJacob Keeler2018-02-015-15/+18
|\ \ \ \ \ \
| * | | | | | Fix deprecated warnings in application_impl and connection_handler_implfix/deprecated_warningsjacobkeeler2018-02-015-15/+18
|/ / / / / /
* | | | | | Merge pull request #1998 from smartdevicelink/feature/remove_qt_hmiJacob Keeler2018-02-01744-47688/+12
|\ \ \ \ \ \
| * | | | | | Remove references to QT HMIfeature/remove_qt_hmijacobkeeler2018-02-014-60/+12
| * | | | | | Delete QT HMIjacobkeeler2018-02-01740-47628/+0
|/ / / / / /
* | | | | | Merge pull request #1999 from smartdevicelink/fix/unused_iteratorJacob Keeler2018-02-011-1/+1
|\ \ \ \ \ \
| * | | | | | Remove unused iteratorfix/unused_iteratorJacob Keeler2018-02-011-1/+1
* | | | | | | Merge pull request #1971 from AKalinich-Luxoft/fix/fix_security_issuesJacob Keeler2018-01-3130-771/+1463
|\ \ \ \ \ \ \
| * | | | | | | Answer review commentsAKalinich-Luxoft2018-01-302-3/+6
| * | | | | | | Fix failed RC test after rebaseAKalinich-Luxoft2018-01-291-1/+0
| * | | | | | | Fixed mocks and related unit testsAKalinich-Luxoft2018-01-2910-448/+580
| * | | | | | | Minor refactoring in protocol and security managerAKalinich-Luxoft2018-01-2918-37/+50
| * | | | | | | Fixed certificate chain reading from PEM fileAKalinich-Luxoft2018-01-291-0/+12
| * | | | | | | Updates in connection and handlerAKalinich-Luxoft2018-01-295-0/+87
| * | | | | | | Added overriden functions for SecurityManager listenersAKalinich-Luxoft2018-01-295-1/+86
| * | | | | | | ProtocolHandlerImpl was extended with PolicyHandlerObserverAKalinich-Luxoft2018-01-293-6/+114
| * | | | | | | Fixes in Crypto/Security managersAKalinich-Luxoft2018-01-294-9/+65
| * | | | | | | Refactoring in connection/protocol handlersAKalinich-Luxoft2018-01-296-134/+113
| * | | | | | | Old StartSessionHandler class moved to a separate unitAKalinich-Luxoft2018-01-294-135/+343
| * | | | | | | ServiceStartedContext were moved to session observerAKalinich-Luxoft2018-01-293-49/+58
* | | | | | | | Merge branch 'fix/gcc6_build' into developJacob Keeler2018-01-302-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix build errors with GCC6+fix/gcc6_buildjacobkeeler2018-01-172-1/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge remote-tracking branch 'origin/master' into developjacobkeeler2018-01-291-1/+0
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #1994 from smartdevicelink/fix/rc_unit_test_failurefeature/SDL_must_transfer_RPC’s_with_invalid_imageJacob Keeler2018-01-291-1/+0
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |