summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix choiceSet default timeoutbugfix/issue_1630_fix_choice_set_default_timeoutJulian Kast2021-03-111-3/+3
* Fix timeout for AlertViewJulian Kast2021-03-111-3/+2
* Align the getters/setters for defaultTimeout to iOS for AlertView and ChoiceSetJulian Kast2021-03-112-15/+11
* Fix unit testJulian Kast2021-03-111-0/+2
* Moved timeout test to different methodJulian Kast2021-03-111-15/+15
* Add more unit test for ChoiceSet timeoutsJulian Kast2021-03-111-1/+16
* Add default timeout to ChoiceSet and refactor timeout. Added unit testJulian Kast2021-03-112-14/+36
* Merge pull request #1434 from LuxoftSDL/feature/0296_possibility_to_update_vi...Robert Henigan2021-03-0926-46/+1330
|\
| * [0296]kboskin2021-03-091-2/+2
| * [0293]kboskin2021-03-081-2/+2
| * Merge branch 'develop' into feature/0296_possibility_to_update_video_streamin...kboskin2021-03-0841-186/+3226
| |\ | |/ |/|
* | Add CRC to PutFile (#1625)Robert Henigan2021-03-051-2/+4
* | Add check for empty string in menu manager (#1624)Robert Henigan2021-03-051-4/+4
* | Screen manager alert manager (#1555)Julian Kast2021-03-0530-114/+2802
* | Feature/issue 811 broaden choiceset uniqueness (#1599)Robert Henigan2021-03-0411-54/+395
* | Merge pull request #1620 from smartdevicelink/bugfix/sec_lib_selection_fixRobert Henigan2021-03-041-12/+21
|\ \
| * | Refactor security lib selection methodbugfix/sec_lib_selection_fixJoey Grover2021-02-261-12/+21
|/ /
| * [0296]kboskin2021-03-082-8/+54
| * [0296]kboskin2021-03-053-5/+79
| * [0296]kboskin2021-03-042-10/+36
| * [0296]kboskin2021-03-032-6/+5
| * [0296]kboskin2021-02-273-72/+86
| * [0296]kboskin2021-02-251-4/+6
| * Merge branch 'develop' into feature/0296_possibility_to_update_video_streamin...kboskin2021-02-2575-58/+2405
| |\ | |/ |/|
* | Merge pull request #1587 from LuxoftSDL/feature/0298_keyboard_enchancementsBilal Alsharifi2021-02-2520-12/+860
|\ \
| * | [0238]kboskin2021-02-181-4/+1
| * | [0238]kboskin2021-02-181-1/+5
| * | [0238]kboskin2021-02-181-1/+115
| * | [0238]kboskin2021-02-181-1/+5
| * | [0238]kboskin2021-02-181-1/+1
| * | Merge remote-tracking branch 'origin/feature/0298_keyboard_enchancements' int...kboskin2021-02-181-10/+9
| |\ \
| | * | Update base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.javaKostiantyn Boskin2021-02-181-10/+9
| | * | Update base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseC...Kostiantyn Boskin2021-02-181-1/+5
| * | | [0238]kboskin2021-02-181-80/+42
| |/ /
| * | [0238]kboskin2021-02-171-0/+1
| * | [0238]kboskin2021-02-171-2/+3
| * | [0238]kboskin2021-02-171-45/+56
| * | [0238]kboskin2021-02-151-1/+2
| * | [0238]kboskin2021-02-151-9/+62
| * | [0238]kboskin2021-02-156-365/+295
| * | Merge branch 'develop' into feature/0298_keyboard_enchancementskboskin2021-02-1149-45/+1936
| |\ \
| * \ \ Merge remote-tracking branch 'origin/develop' into feature/0298_keyboard_ench...Andrii Kalinich2021-02-0679-1304/+6118
| |\ \ \
| * | | | Make changes according to revisionAndrii Kalinich2021-02-068-606/+419
| * | | | [0298]kboskin2020-12-293-5/+5
| * | | | [0298]kboskin2020-12-219-125/+45
| * | | | [0238]kboskin2020-12-171-4/+0
| * | | | [0238]kboskin2020-12-174-1/+22
| * | | | [0238]kboskin2020-12-131-1/+100
| * | | | [0238]kboskin2020-12-1316-126/+951
* | | | | Merge pull request #1565 from smartdevicelink/feature/issue_1246Robert Henigan2021-02-1916-10/+516
|\ \ \ \ \ | |_|_|/ / |/| | | |