summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Review Feedback fixesfeature/issue_811_Unique_ChoiceSetHenigan2021-03-036-15/+0
* Merge branch 'develop' into feature/issue_811_Unique_ChoiceSetHenigan2021-02-2620-12/+860
|\
| * 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
* | | | | iOS Alignment changesHenigan2021-02-262-15/+18
* | | | | Merge branch 'develop' into feature/issue_811_Unique_ChoiceSetHenigan2021-02-23102-348/+6289
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #1565 from smartdevicelink/feature/issue_1246Robert Henigan2021-02-1916-10/+516
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Add fileUploaded checkfeature/issue_1246Henigan2021-02-161-2/+2
| | * | | Remove FileNeedsUpload CheckHenigan2021-02-161-2/+2
| | * | | iOS AlignmentHenigan2021-02-152-8/+29
| | * | | Merge branch 'develop' into feature/issue_1246Henigan2021-02-15121-1447/+8055
| | |\ \ \ | | |/ / / | |/| | |
| * | | | [SDL-0293] OEM Exclusive App Support - Protocol & Manager layers (#1618)Joey Grover2021-02-1117-9/+246
| * | | | Merge pull request #1560 from LuxoftSDL/feature/0269_new_vehicle_data_climate...Bilal Alsharifi2021-02-1024-27/+782
| |\ \ \ \
| | * \ \ \ Merge branch 'develop' into feature/0269_new_vehicle_data_climate_datakboskin2021-02-1029-8/+894
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | SDL-0305 Homogenize TextFieldName (#1585)Julian Kast2021-02-103-1/+15
| * | | | | Merge pull request #1578 from LuxoftSDL/feature/0262_vehicle_data_seat_occupancyBilal Alsharifi2021-02-0926-8/+880
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'develop' into feature/0262_vehicle_data_seat_occupancykboskin2021-02-0939-179/+3644
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | [0262]kboskin2021-01-181-0/+1
| | * | | | | [0293]kboskin2021-01-151-1/+1
| | * | | | | Merge branch 'develop' into feature/0262_vehicle_data_seat_occupancykboskin2021-01-1544-1227/+2490
| | |\ \ \ \ \
| | * | | | | | [0262]kboskin2020-12-292-7/+8
| | * | | | | | [0262]kboskin2020-12-2111-2400/+2400
| | * | | | | | [0262]kboskin2020-12-121-208/+208
| | * | | | | | [0262]kboskin2020-12-123-1931/+1931
| | * | | | | | [0262]kboskin2020-12-121-780/+780
| | * | | | | | [0262]kboskin2020-12-121-0/+35
| | * | | | | | [0262]kboskin2020-12-121-1029/+1029