summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into feature/issue_1438_missing_min_maxfeature/issue_1438_missing_min_maxBilal Alsharifi2020-08-13592-2997/+2883
|\
| * Merge pull request #1442 from smartdevicelink/feature/issue_1048_remove_symlinksRobert Henigan2020-08-12103-1352/+530
| |\
| | * Merge branch 'develop' into feature/issue_1048_remove_symlinksfeature/issue_1048_remove_symlinksBilal Alsharifi2020-08-113-4/+2
| | |\
| | * \ Merge branch 'develop' into feature/issue_1048_remove_symlinksBilal Alsharifi2020-08-11455-705/+708
| | |\ \
| | * \ \ Merge branch 'develop' into feature/issue_1048_remove_symlinksBilal Alsharifi2020-08-1126-9/+793
| | |\ \ \
| | * | | | Move java specific classes to javaSEBilal Alsharifi2020-08-116-0/+0
| | * | | | Deprecate IProtocolListenerBilal Alsharifi2020-08-111-31/+32
| | * | | | Merge branch 'develop' into feature/issue_1048_remove_symlinksBilal Alsharifi2020-08-114-24/+264
| | |\ \ \ \
| | * | | | | remove baseAndroidBilal Alsharifi2020-08-1177-157/+0
| | * | | | | Update Android build.gradle to link directly to base setBilal Alsharifi2020-08-111-14/+1
| | * | | | | Move WebSocket classes to JavaSEBilal Alsharifi2020-08-112-0/+0
| | * | | | | Move Android stub classes to JavaSEBilal Alsharifi2020-08-114-0/+0
| | * | | | | Move cloud JSON classes to javaSEBilal Alsharifi2020-08-117-0/+0
| | * | | | | Move cloud SdlTrace to javaSEBilal Alsharifi2020-08-111-0/+0
| | * | | | | Handle files that exist in both base & androidBilal Alsharifi2020-08-117-1105/+452
| * | | | | | Merge pull request #1437 from smartdevicelink/feature/issue_1425_gen_enum_capsJulian Kast2020-08-121-1/+1
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Fix generated enum value names in RPC generatorfeature/issue_1425_gen_enum_capsBilal Alsharifi2020-08-071-1/+1
| * | | | | | Merge pull request #1443 from smartdevicelink/AndroidX_FixesJulian Kast2020-08-113-4/+2
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Import fixes for androidXAndroidX_FixesRHenigan2020-08-113-4/+2
| |/ / / / /
| * | | | | Merge pull request #1441 from smartdevicelink/AndroidXRobert Henigan2020-08-11455-705/+708
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Update JavaEE to use androidXAndroidXJulian Kast2020-08-111-1/+1
| | * | | | Edit imports to use androidX, fixing merge conflictsJulian Kast2020-08-112-2/+2
| | * | | | Fix sdlProxyBase Merge conflictJulian Kast2020-08-111-1/+1
| | * | | | Merge branch 'develop' into AndroidXJulian Kast2020-08-1128-911/+594
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Update javaSE ImportsJulian Kast2020-08-1114-16/+16
| | * | | | Update javaSE gradle file to use androidXJulian Kast2020-08-111-1/+1
| | * | | | convert hello_sdl to androidXJulian Kast2020-08-112-4/+4
| | * | | | convert sdl_android gradle to androidXJulian Kast2020-08-111-0/+2
| | * | | | convert sdl_android gradle to androidXJulian Kast2020-08-111-5/+6
| | * | | | Convert lockScreen to android xJulian Kast2020-08-111-8/+8
| | * | | | Update imports for androidXJulian Kast2020-08-1084-85/+85
| | * | | | Update imports to androidXJulian Kast2020-08-10115-115/+115
| | * | | | Update imports to androidXJulian Kast2020-08-1056-68/+68
| | * | | | Update Unit Test to androidxJulian Kast2020-08-10177-400/+400
| | | |/ / | | |/| |
| * | | | New vehicle data WindowStatus (#1396)Kostiantyn Boskin2020-08-1126-9/+793
| | |_|/ | |/| |
| * | | Merge pull request #1436 from smartdevicelink/feature/integration_validatorRobert Henigan2020-08-114-24/+264
| |\ \ \ | | |_|/ | |/| |
| | * | Add flag to skip RS check in validatorfeature/integration_validatorJoey Grover2020-08-103-19/+37
| | * | Remove typoJoey Grover2020-08-061-1/+1
| | * | Add integration validationJoey Grover2020-08-064-24/+246
| * | | Merge pull request #1430 from smartdevicelink/feature/refactor_interfacesJulian Kast2020-08-1120-815/+455
| |\ \ \
| | * | | Fix issues found during reviewfeature/refactor_interfacesJoey Grover2020-08-108-20/+12
| | * | | Run code formatter on session classesJoey Grover2020-08-042-56/+56
| | * | | Merge branch 'develop' of https://github.com/smartdevicelink/sdl_android into...Joey Grover2020-08-0421-133/+122
| | |\ \ \ | | | |/ /
| | * | | Fix unit testsJoey Grover2020-08-043-124/+54
| | * | | Implement interface refactor into JavaSEJoey Grover2020-07-303-54/+31
| | * | | Remove redundant caching of transport configJoey Grover2020-07-301-3/+1
| | * | | update symlink to new file nameJoey Grover2020-07-301-1/+1
| | * | | Rename actual interface fileJoey Grover2020-07-301-80/+80
| | * | | Merge branch 'feature/sdlsession_refactor' of https://github.com/smartdevicel...Joey Grover2020-07-301-0/+7
| | |\ \ \
| | * \ \ \ Merge branch 'feature/sdlsession_refactor' of https://github.com/smartdevicel...Joey Grover2020-07-307-27/+66
| | |\ \ \ \