summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master'release/4.2.0Jacob Keeler2016-10-2410-67/+78
|\
| * Merge pull request #900 from smartdevicelink/hotfix/fix_EXTENDED_MEDIA_MODE4.1.2JackLivio2016-10-243-2/+13
| |\
| | * Fix SEGFAULT in media_manager_impl.cc when EXTENDED_MEDIA_MODE=ONhotfix/fix_EXTENDED_MEDIA_MODEJacob Keeler2016-10-121-2/+8
| | * Fixed build errors when compiling with EXTENDED_MEDIA_MODE=ONJacob Keeler2016-10-122-0/+5
| * | Merge pull request #909 from BrandonHe/hotfix/resolve_ATF_AddSubMenu_KnownIssuesJacob Keeler2016-10-242-47/+55
| |\ \
| | * | Rename functions to have clearer meaningJacob Keeler2016-10-202-16/+14
| | * | Remove SmartObject changesJacob Keeler2016-10-201-4/+0
| | * | change timer::kSingleShot to trueBrandonHe2016-10-201-1/+1
| | * | change code styleBrandonHe2016-10-201-26/+26
| | * | remove NULL check before deletingBrandonHe2016-10-201-16/+8
| | * | add space after for, add additional information about requestBrandonHe2016-10-201-2/+10
| | * | change private member from stop_flag to timer_stop_flagBrandonHe2016-10-202-4/+4
| | * | adjust code formatBrandonHe2016-10-202-19/+19
| | * | Fix ATF_AddSubMenu test failsBrandonHe2016-10-193-43/+57
| * | | Merge pull request #865 from madhuy/bugfix/636_1JackLivio2016-10-193-10/+2
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch 'bugfix/636_1' of https://github.com/madhuy/sdl_core into bugfix...Madhu Yaduguri2016-10-101-10/+0
| | |\ \
| | | * | Remove stray newlineJacob Keeler2016-10-051-1/+0
| | | * | fixing travis error . removed commented codeMadhu Yaduguri2016-10-051-10/+1
| | * | | Revert "rebasing from master"Madhu Yaduguri2016-10-101-0/+0
| | |/ /
| | * | issue-636 - Fixing Continiously updating policy in case of EXTENDED_POLICY en...Madhu Yaduguri2016-10-032-3/+5
| | * | rebasing from masterMadhu Yaduguri2016-10-031-7/+0
| | * | rebasing from masterMadhu Yaduguri2016-10-031-0/+0
| | * | rebasing from masterMadhu Yaduguri2016-10-031-11/+2
| | * | rebasing from masterMadhu Yaduguri2016-10-032005-73194/+138294
| | |\ \
| | * | | Sending button press event based on conditions(recommended by Justin) a. If n...Madhu Yaduguri2016-06-061-18/+22
| * | | | Merge pull request #837 from smartdevicelink/hotfix/api_double_to_floatJacob Keeler2016-10-172-8/+8
| |\ \ \ \
| | * | | | Change Double type parameters in spec to Float typehotfix/api_double_to_floatJacob Keeler2016-09-222-8/+8
* | | | | | Merge pull request #904 from LevchenkoS/fix/Fix_that_start_stream_request_may...Andriy Byzhynar (GitHub)2016-10-192-17/+14
|\ \ \ \ \ \
| * | | | | | Fix that StartStreamRequest may hang forever in case of app absenceLevchenkoS2016-10-192-17/+14
* | | | | | | Merge commit '5bf2c5500309d36b60987e74bdd4ed1610ecffde' into release/4.2.0Alexander Kutsan2016-10-1524-2339/+2446
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #884 from smartdevicelink/hotfix/generic_display_type_enumJackLivio2016-10-144-1/+5
| |\ \ \ \ \ \
| | * | | | | | Added Enum to other fileshotfix/generic_display_type_enumJackLivio2016-10-132-1/+3
| | * | | | | | Add “SDL_GENERIC” Display Type EnumJackLivio2016-10-072-0/+2
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge pull request #840 from BTPankow/hotfix/resume_activate_hmi_level_2JackLivio2016-10-121-1/+1
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Reorder register app response to mobile and hmiBrad Pankow2016-09-221-1/+1
| | | |_|/ / | | |/| | |
| * | | | | Removed an unused variable that was causing the build to fail. Also f… (#880)jgrix2016-10-102-3/+6
| | |/ / / | |/| | |
| * | | | Add dependencies when ENABLE_LOG is 0Brad Pankow2016-08-112-0/+2
| * | | | Fix logger macros when ENABLE_LOG is 0Brad Pankow2016-08-111-2/+4
| * | | | Remove log-specific variables for ENABLE_LOG = 0Brad Pankow2016-08-112-6/+5
| * | | | Fix for content length typohotfix/content_length_typoJackLivio2016-09-091-1/+1
| |/ / /
| * | | Make code appropriate to Google coding styleAlexander Kutsan2016-08-297-49/+52
| * | | Merge branch 'release/4.1.0'Alexander Kutsan2016-08-262004-72119/+136049
| |\ \ \
| | * | | Update logger properties to log to file onlyOrhan Mehmedov2016-08-221-2/+2
| * | | | Conditions to transfer on button press on button event (#775)Oleh Herasym (GitHub)2016-08-253-37/+39
| * | | | Fix WARNINGS response from RegisterAppInterface on valid AppHMIType received ...Sergey Levchenko (GitHub)2016-08-181-1/+1
| * | | | Merge pull request #702 from smartdevicelink/hotfix/apphmitype_warningArtem Nosach (GitHub)2016-08-041-6/+30
| |\ \ \ \
| | * | | | Fixed improper variable namehotfix/apphmitype_warningJacob Keeler2016-08-021-4/+4
| | * | | | Simplified returnJacob Keeler2016-08-021-5/+2
| | * | | | Fixed style issuesJacob Keeler2016-07-281-6/+8
| | * | | | Fix Travis build errorJacob Keeler2016-07-271-1/+2
View Lorry Controller Status