summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into feature/issue-1684-protocol-nak-reasonfeature/issue-1684-protocol-nak-reasonJoel Fischer2020-08-31150-2154/+7656
|\
| * Merge pull request #1694 from yoooriii/feature/0261_vehicle_data_WindowStatusNicoleYarroch2020-08-2837-167/+768
| |\
| | * 0261 'New vehicle data WindowStatus': code review, update window status comme...leonid lokhmatov, Luxoft2020-08-2810-10/+26
| | * 0261 'New vehicle data WindowStatus': Merge branch 'develop' into this [0261]...leonid lokhmatov, Luxoft2020-08-2791-370/+2449
| | |\ | | |/ | |/|
| * | Merge pull request #1740 from smartdevicelink/feature/issue-1520-main-menu-up...Joel Fischer2020-08-2538-135/+1040
| |\ \
| | * | Update for review commentsJoel Fischer2020-08-254-19/+10
| | * | Merge branch 'develop' into feature/issue-1520-main-menu-updating-and-paginationJoel Fischer2020-08-2544-1272/+2087
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1690 from yoooriii/feature/0266_vehicle_data_GearStatusNicoleYarroch2020-08-2544-1272/+2087
| |\ \ \
| | * | | [0266] "New vehicle data GearStatus": fix review comment: capitalized suffix:...leonid lokhmatov, Luxoft2020-08-243-3/+3
| | * | | 0266 "New vehicle data GearStatus": fix/implement review suggestions from Nic...leonid lokhmatov, Luxoft2020-08-2116-41/+110
| | * | | 0266 "New vehicle data GearStatus": fix typos, (extra space etc).leonid lokhmatov, Luxoft2020-08-153-3/+3
| | * | | 0266 "New vehicle data GearStatus": minor fix, edit typos, etc.leonid lokhmatov, Luxoft2020-08-156-29/+27
| | * | | 0266 "New vehicle data GearStatus": fix formatting in testsleonid lokhmatov, Luxoft2020-08-156-20/+14
| | * | | 0266 "New vehicle data GearStatus": fix tests after merge.leonid lokhmatov, Luxoft2020-08-147-696/+718
| | |\ \ \
| | | * | | Merge branch 'feature/0266_vehicle_data_GearStatus' into develop, resolve con...leonid lokhmatov, Luxoft2020-08-14251-7767/+11850
| | | | * | Fix a commentfeature/issue-1520-main-menu-updating-and-paginationJoel Fischer2020-08-241-0/+1
| | | | * | Merge branch 'develop' into feature/issue-1520-main-menu-updating-and-paginationJoel Fischer2020-08-2445-220/+1280
| | | | |\ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #1735 from smartdevicelink/feature/0242_subtle_alert_styleJoel Fischer2020-08-2044-219/+1288
| |\ \ \ \ \
| | * | | | | Refactored permission checks in Swift ex. appfeature/0242_subtle_alert_styleNicoleYarroch2020-08-201-2/+2
| | * | | | | Fixed spellingNicoleYarroch2020-08-191-1/+1
| | * | | | | Change fileprivate to privateNicoleYarroch2020-08-171-2/+2
| | * | | | | Reverting changes to `SDLImageFieldName`NicoleYarroch2020-08-171-25/+21
| | * | | | | Revert changes to method nameNicoleYarroch2020-08-171-1/+1
| | * | | | | More newline fixesNicoleYarroch2020-08-141-1/+1
| | * | | | | Attempting to fix newlinesNicoleYarroch2020-08-141-0/+2
| | * | | | | Trying to fix newlineNicoleYarroch2020-08-141-1/+0
| | * | | | | Fixing newlineNicoleYarroch2020-08-141-1/+0
| | * | | | | Removed the patch numberNicoleYarroch2020-08-131-3/+3
| | * | | | | Fixed images and soft button statesNicoleYarroch2020-08-132-9/+23
| | * | | | | Added/updated ex. app constantsNicoleYarroch2020-08-132-4/+10
| | * | | | | Removed patch numberNicoleYarroch2020-08-131-1/+1
| | * | | | | Added back 2 newlinesNicoleYarroch2020-08-131-0/+2
| | * | | | | Removed removed newlineNicoleYarroch2020-08-131-1/+0
| | * | | | | Updated copyright on cancel interaction fileNicoleYarroch2020-08-132-15/+63
| | * | | | | Added permissions checks for alertsNicoleYarroch2020-08-134-19/+45
| | * | | | | Updated ex. apps alert manager classesNicoleYarroch2020-08-1313-115/+118
| | * | | | | Apply suggestions from code reviewNicoleYarroch2020-08-122-2/+2
| | * | | | | Removed unused app constantNicoleYarroch2020-08-112-2/+0
| | * | | | | Fixed guard statemnt for soft buttonNicoleYarroch2020-08-111-4/+8
| | * | | | | Removed extra pragmaNicoleYarroch2020-08-111-4/+0
| | * | | | | Fixed capitalizationNicoleYarroch2020-08-111-6/+6
| | * | | | | Moved image uploads for alerts to Alert ManagerNicoleYarroch2020-08-115-63/+105
| | * | | | | Added subtle alert to ex. appsNicoleYarroch2020-08-109-113/+138
| | * | | | | Merge branch 'develop' into feature/0242_subtle_alert_styleNicoleYarroch2020-08-10120-1379/+3776
| | |\ \ \ \ \
| | * | | | | | Added new enum testsNicoleYarroch2020-08-052-0/+4
| | * | | | | | Updated docs in subtle alert responseNicoleYarroch2020-08-051-3/+1
| | * | | | | | Updated subtle alert header docsNicoleYarroch2020-08-051-14/+2
| | * | | | | | Added notification constants for new RPCsNicoleYarroch2020-07-282-2/+14
| | * | | | | | Added OnSubtleAlertPressed notificationNicoleYarroch2020-07-2810-0/+151
| | * | | | | | Added newl inits & tests to CancelInteractionNicoleYarroch2020-07-283-0/+26