summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* updated documentationfeature/ongoing-docsHansenKirk2015-09-25129-1193/+1196
* Merge branch 'github/develop' into feature/UpdatedDocsMarkos Rapitis2015-08-1237-2846/+633
|\
| * Merge pull request #239 from smartdevicelink/revert-174-feature/issue_166Joey Grover2015-08-0537-2846/+633
| |\
| | * Revert "Fixes #166 by adding more robust parameter checking."Joey Grover2015-07-3037-2846/+633
| |/
* | removed special charactersvirat-shukla2015-07-2413-73/+73
* | Updated documentation for Java docsAnil Dahiya2015-07-16136-115/+5340
|/
* Merge pull request #227 from smartdevicelink/hotfix/fixes_226Joey Grover2015-07-081-8/+8
|\
| * Fixes #226Joey Grover2015-06-261-8/+8
|/
* Merge pull request #225 from smartdevicelink/feature/deprecation_cleanupJoey Grover2015-06-231-5/+147
|\
| * Removes deprecation warnings by deprecating old methods related to integer of...Mikayla Ray2015-06-231-5/+147
|/
* Merge pull request #207 from smartdevicelink/feature/issue_199Joey Grover2015-06-231-7/+6
|\
| * Merged develop into branch.Mikayla Ray2015-06-2320-526/+150
| |\
| * | Removed redundancy in SdlTrace.Mikayla Ray2015-06-021-7/+6
* | | Merge pull request #223 from smartdevicelink/feature/converter_cleanupJoey Grover2015-06-231-10/+23
|\ \ \
| * | | Cleaned up SdlDataTypeConverter methods.Mikayla Ray2015-06-191-10/+23
| | |/ | |/|
* | | Merge pull request #216 from smartdevicelink/feature/issue_99Joey Grover2015-06-237-122/+0
|\ \ \
| * | | Makes suggested changes proposed in #99Mikayla Ray2015-06-107-122/+0
| |/ /
* | | Merge pull request #215 from smartdevicelink/feature/issue_214Joey Grover2015-06-231-1/+39
|\ \ \
| * | | Fixes #214Mikayla Ray2015-06-101-1/+39
| |/ /
* | | Merge pull request #206 from smartdevicelink/feature/issue_194Joey Grover2015-06-2313-6/+19
|\ \ \ | | |/ | |/|
| * | Suggested change mentioned in #194Mikayla Ray2015-06-0213-6/+19
* | | Merge pull request #205 from smartdevicelink/feature/unused_method_cleanupJoey Grover2015-06-233-145/+10
|\ \ \
| * | | Resolves #201 by removing unused methods.Mikayla Ray2015-05-291-7/+1
| * | | Resolves #200 by removing unused methods.Mikayla Ray2015-05-291-9/+1
| * | | Resolves #196 by removing unused methods.Mikayla Ray2015-05-291-129/+8
| |/ /
* | | Merge pull request #179 from smartdevicelink/feature/issue_165Joey Grover2015-06-233-9/+34
|\ \ \
| * | | Fixes #165 by checking against null Hashtable assignments and invalid message...Mikayla Ray2015-04-303-9/+34
* | | | Merge pull request #174 from smartdevicelink/feature/issue_166Joey Grover2015-06-2337-633/+2846
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merged develop into feature branch.Mikayla Ray2015-06-09158-1798/+1723
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #175 from smartdevicelink/feature/issue_169Joey Grover2015-06-041-2/+2
|\ \ \ \
| * | | | Fixes #169 by changing the key used for data retrieval.Mikayla Ray2015-04-301-2/+2
| | |/ / | |/| |
* | | | Merge pull request #176 from smartdevicelink/feature/issue_168Joey Grover2015-06-044-7/+8
|\ \ \ \
| * | | | Fixes #168 by modifying the toArray call.Mikayla Ray2015-04-304-7/+8
| |/ / /
* | | | Merge pull request #177 from smartdevicelink/feature/issue_141Joey Grover2015-06-043-341/+0
|\ \ \ \
| * | | | Fixes #141 by deleting the unused classes.Mikayla Ray2015-04-303-341/+0
| |/ / /
* | | | Merge pull request #178 from smartdevicelink/feature/issue_132Joey Grover2015-06-047-88/+14
|\ \ \ \
| * | | | Fixes #132 by directing deprecated methods to replacement methods.Mikayla Ray2015-04-307-88/+14
| |/ / /
* | | | Merge pull request #185 from smartdevicelink/feature/logging_feedbackJoey Grover2015-06-042-70/+80
|\ \ \ \
| * | | | Added logging feedback to SdlTrace class.Mikayla Ray2015-05-191-46/+50
| * | | | Added logging feedback to NativeLogTool class.Mikayla Ray2015-05-131-24/+30
| |/ / /
* | | | Merge pull request #192 from smartdevicelink/feature/issue_191Joey Grover2015-06-041-5/+13
|\ \ \ \
| * | | | Fixes #191 by adding a try/catch block.Mikayla Ray2015-05-151-5/+13
| |/ / /
* | | | Merge branch 'master' into developJoey Grover2015-06-022-13/+33
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update README.mdJoey Grover2015-06-021-2/+7
| * | | Update Contributing.mdJoey Grover2015-06-021-10/+18
| * | | Update README.mdJoey Grover2015-06-021-3/+10
* | | | Changed FunctionId back to FunctionIDJoey Grover2015-05-26101-278/+278
* | | | Merge branch 'feature/feature_138' into developJoey Grover2015-05-22102-470/+413
|\ \ \ \
| * \ \ \ Merge branch 'develop' into feature/feature_138Joey Grover2015-05-2286-1004/+1293
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch 'mrapitis-update_putfile_stream_enhancements' into developJoey Grover2015-05-2215-62/+628
|\ \ \ \ \