Merged with John's updates#3
Merged
hmorales merged 3 commits intoTeleSign:masterfrom Mar 19, 2013
cjboorman:master
Merged
Conversation
added 3 commits
March 11, 2013 19:31
Added the file Overview.html, that describes the SDK as a whole. Added five files called package.html, that describe each package. Configured the Eclipse project to include links to the Javadocs for the referenced libraries (the official JDK docs, commons-codec, and gson). All of these types are now hot-linked on our docs. Created an Ant build.xml script for building the HTML docs. This script includes JavaScript for automatically generating information in the header, footer, and bottom of each web page (date stamp, product name and version, copyright information.
Wanted to exclude the Javadoc-built files.
Updated content in Javadoc comments. Conflicts: .gitignore doc/allclasses-frame.html doc/allclasses-noframe.html doc/com/telesign/phoneid/PhoneId.html doc/com/telesign/phoneid/class-use/PhoneId.html doc/com/telesign/phoneid/package-frame.html doc/com/telesign/phoneid/package-summary.html doc/com/telesign/phoneid/package-tree.html doc/com/telesign/phoneid/package-use.html doc/com/telesign/phoneid/response/PhoneIdContactResponse.Contact.html doc/com/telesign/phoneid/response/PhoneIdContactResponse.Error.html doc/com/telesign/phoneid/response/PhoneIdContactResponse.Location.Coordinates.html doc/com/telesign/phoneid/response/PhoneIdContactResponse.Location.Country.html doc/com/telesign/phoneid/response/PhoneIdContactResponse.Location.TimeZone.html doc/com/telesign/phoneid/response/PhoneIdContactResponse.Location.html doc/com/telesign/phoneid/response/PhoneIdContactResponse.Numbering.CleansingNumber.Number.html doc/com/telesign/phoneid/response/PhoneIdContactResponse.Numbering.CleansingNumber.html doc/com/telesign/phoneid/response/PhoneIdContactResponse.Numbering.OriginalNumber.html doc/com/telesign/phoneid/response/PhoneIdContactResponse.Numbering.html doc/com/telesign/phoneid/response/PhoneIdContactResponse.PhoneType.html doc/com/telesign/phoneid/response/PhoneIdContactResponse.Status.html doc/com/telesign/phoneid/response/PhoneIdContactResponse.html doc/com/telesign/phoneid/response/PhoneIdLiveResponse.Error.html doc/com/telesign/phoneid/response/PhoneIdLiveResponse.Live.html doc/com/telesign/phoneid/response/PhoneIdLiveResponse.Location.Coordinates.html doc/com/telesign/phoneid/response/PhoneIdLiveResponse.Location.Country.html doc/com/telesign/phoneid/response/PhoneIdLiveResponse.Location.TimeZone.html doc/com/telesign/phoneid/response/PhoneIdLiveResponse.Location.html doc/com/telesign/phoneid/response/PhoneIdLiveResponse.Numbering.CleansingNumber.Number.html doc/com/telesign/phoneid/response/PhoneIdLiveResponse.Numbering.CleansingNumber.html doc/com/telesign/phoneid/response/PhoneIdLiveResponse.Numbering.OriginalNumber.html doc/com/telesign/phoneid/response/PhoneIdLiveResponse.Numbering.html doc/com/telesign/phoneid/response/PhoneIdLiveResponse.PhoneType.html doc/com/telesign/phoneid/response/PhoneIdLiveResponse.Status.html doc/com/telesign/phoneid/response/PhoneIdLiveResponse.html doc/com/telesign/phoneid/response/PhoneIdScoreResponse.Error.html doc/com/telesign/phoneid/response/PhoneIdScoreResponse.Numbering.CleansingNumber.Number.html doc/com/telesign/phoneid/response/PhoneIdScoreResponse.Numbering.CleansingNumber.html doc/com/telesign/phoneid/response/PhoneIdScoreResponse.Numbering.OriginalNumber.html doc/com/telesign/phoneid/response/PhoneIdScoreResponse.Numbering.html doc/com/telesign/phoneid/response/PhoneIdScoreResponse.PhoneType.html doc/com/telesign/phoneid/response/PhoneIdScoreResponse.Risk.html doc/com/telesign/phoneid/response/PhoneIdScoreResponse.Status.html doc/com/telesign/phoneid/response/PhoneIdScoreResponse.html doc/com/telesign/phoneid/response/PhoneIdStandardResponse.Error.html doc/com/telesign/phoneid/response/PhoneIdStandardResponse.Location.Coordinates.html doc/com/telesign/phoneid/response/PhoneIdStandardResponse.Location.Country.html doc/com/telesign/phoneid/response/PhoneIdStandardResponse.Location.TimeZone.html doc/com/telesign/phoneid/response/PhoneIdStandardResponse.Location.html doc/com/telesign/phoneid/response/PhoneIdStandardResponse.Numbering.CleansingNumber.Number.html doc/com/telesign/phoneid/response/PhoneIdStandardResponse.Numbering.CleansingNumber.html doc/com/telesign/phoneid/response/PhoneIdStandardResponse.Numbering.OriginalNumber.html doc/com/telesign/phoneid/response/PhoneIdStandardResponse.Numbering.html doc/com/telesign/phoneid/response/PhoneIdStandardResponse.PhoneType.html doc/com/telesign/phoneid/response/PhoneIdStandardResponse.Status.html doc/com/telesign/phoneid/response/PhoneIdStandardResponse.html doc/com/telesign/phoneid/response/class-use/PhoneIdContactResponse.Contact.html doc/com/telesign/phoneid/response/class-use/PhoneIdContactResponse.Error.html doc/com/telesign/phoneid/response/class-use/PhoneIdContactResponse.Location.Coordinates.html doc/com/telesign/phoneid/response/class-use/PhoneIdContactResponse.Location.Country.html doc/com/telesign/phoneid/response/class-use/PhoneIdContactResponse.Location.TimeZone.html doc/com/telesign/phoneid/response/class-use/PhoneIdContactResponse.Location.html doc/com/telesign/phoneid/response/class-use/PhoneIdContactResponse.Numbering.CleansingNumber.Number.html doc/com/telesign/phoneid/response/class-use/PhoneIdContactResponse.Numbering.CleansingNumber.html doc/com/telesign/phoneid/response/class-use/PhoneIdContactResponse.Numbering.OriginalNumber.html doc/com/telesign/phoneid/response/class-use/PhoneIdContactResponse.Numbering.html doc/com/telesign/phoneid/response/class-use/PhoneIdContactResponse.PhoneType.html doc/com/telesign/phoneid/response/class-use/PhoneIdContactResponse.Status.html doc/com/telesign/phoneid/response/class-use/PhoneIdContactResponse.html doc/com/telesign/phoneid/response/class-use/PhoneIdLiveResponse.Error.html doc/com/telesign/phoneid/response/class-use/PhoneIdLiveResponse.Live.html doc/com/telesign/phoneid/response/class-use/PhoneIdLiveResponse.Location.Coordinates.html doc/com/telesign/phoneid/response/class-use/PhoneIdLiveResponse.Location.Country.html doc/com/telesign/phoneid/response/class-use/PhoneIdLiveResponse.Location.TimeZone.html doc/com/telesign/phoneid/response/class-use/PhoneIdLiveResponse.Location.html doc/com/telesign/phoneid/response/class-use/PhoneIdLiveResponse.Numbering.CleansingNumber.Number.html doc/com/telesign/phoneid/response/class-use/PhoneIdLiveResponse.Numbering.CleansingNumber.html doc/com/telesign/phoneid/response/class-use/PhoneIdLiveResponse.Numbering.OriginalNumber.html doc/com/telesign/phoneid/response/class-use/PhoneIdLiveResponse.Numbering.html doc/com/telesign/phoneid/response/class-use/PhoneIdLiveResponse.PhoneType.html doc/com/telesign/phoneid/response/class-use/PhoneIdLiveResponse.Status.html doc/com/telesign/phoneid/response/class-use/PhoneIdLiveResponse.html doc/com/telesign/phoneid/response/class-use/PhoneIdScoreResponse.Error.html doc/com/telesign/phoneid/response/class-use/PhoneIdScoreResponse.Numbering.CleansingNumber.Number.html doc/com/telesign/phoneid/response/class-use/PhoneIdScoreResponse.Numbering.CleansingNumber.html doc/com/telesign/phoneid/response/class-use/PhoneIdScoreResponse.Numbering.OriginalNumber.html doc/com/telesign/phoneid/response/class-use/PhoneIdScoreResponse.Numbering.html doc/com/telesign/phoneid/response/class-use/PhoneIdScoreResponse.PhoneType.html doc/com/telesign/phoneid/response/class-use/PhoneIdScoreResponse.Risk.html doc/com/telesign/phoneid/response/class-use/PhoneIdScoreResponse.Status.html doc/com/telesign/phoneid/response/class-use/PhoneIdScoreResponse.html doc/com/telesign/phoneid/response/class-use/PhoneIdStandardResponse.Error.html doc/com/telesign/phoneid/response/class-use/PhoneIdStandardResponse.Location.Coordinates.html doc/com/telesign/phoneid/response/class-use/PhoneIdStandardResponse.Location.Country.html doc/com/telesign/phoneid/response/class-use/PhoneIdStandardResponse.Location.TimeZone.html doc/com/telesign/phoneid/response/class-use/PhoneIdStandardResponse.Location.html doc/com/telesign/phoneid/response/class-use/PhoneIdStandardResponse.Numbering.CleansingNumber.Number.html doc/com/telesign/phoneid/response/class-use/PhoneIdStandardResponse.Numbering.CleansingNumber.html doc/com/telesign/phoneid/response/class-use/PhoneIdStandardResponse.Numbering.OriginalNumber.html doc/com/telesign/phoneid/response/class-use/PhoneIdStandardResponse.Numbering.html doc/com/telesign/phoneid/response/class-use/PhoneIdStandardResponse.PhoneType.html doc/com/telesign/phoneid/response/class-use/PhoneIdStandardResponse.Status.html doc/com/telesign/phoneid/response/class-use/PhoneIdStandardResponse.html doc/com/telesign/phoneid/response/package-frame.html doc/com/telesign/phoneid/response/package-summary.html doc/com/telesign/phoneid/response/package-tree.html doc/com/telesign/phoneid/response/package-use.html doc/com/telesign/util/TeleSignRequest.html doc/com/telesign/util/class-use/TeleSignRequest.html doc/com/telesign/util/package-frame.html doc/com/telesign/util/package-summary.html doc/com/telesign/util/package-tree.html doc/com/telesign/util/package-use.html doc/com/telesign/verify/Verify.html doc/com/telesign/verify/class-use/Verify.html doc/com/telesign/verify/package-frame.html doc/com/telesign/verify/package-summary.html doc/com/telesign/verify/package-tree.html doc/com/telesign/verify/package-use.html doc/com/telesign/verify/response/VerifyResponse.Error.html doc/com/telesign/verify/response/VerifyResponse.Status.html doc/com/telesign/verify/response/VerifyResponse.Verify.html doc/com/telesign/verify/response/VerifyResponse.html doc/com/telesign/verify/response/class-use/VerifyResponse.Error.html doc/com/telesign/verify/response/class-use/VerifyResponse.Status.html doc/com/telesign/verify/response/class-use/VerifyResponse.Verify.html doc/com/telesign/verify/response/class-use/VerifyResponse.html doc/com/telesign/verify/response/package-frame.html doc/com/telesign/verify/response/package-summary.html doc/com/telesign/verify/response/package-tree.html doc/com/telesign/verify/response/package-use.html doc/constant-values.html doc/deprecated-list.html doc/help-doc.html doc/index-files/index-1.html doc/index-files/index-10.html doc/index-files/index-11.html doc/index-files/index-12.html doc/index-files/index-13.html doc/index-files/index-14.html doc/index-files/index-15.html doc/index-files/index-16.html doc/index-files/index-17.html doc/index-files/index-18.html doc/index-files/index-2.html doc/index-files/index-3.html doc/index-files/index-4.html doc/index-files/index-5.html doc/index-files/index-6.html doc/index-files/index-7.html doc/index-files/index-8.html doc/index-files/index-9.html doc/index.html doc/overview-frame.html doc/overview-summary.html doc/overview-tree.html src/com/telesign/phoneid/PhoneId.java src/com/telesign/util/PhoneUtil.java src/com/telesign/util/TeleSignRequest.java src/com/telesign/verify/Verify.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
git fetch upstream
git merge upstream/master
I picked up John's latest bits.
Merged:
● src/com/telesign/phoneid/PhoneId.java
● src/com/telesign/util/TeleSignRequest.java
● src/com/telesign/verify/Verify.java
Resolved conflicts by:
● src/com/telesign/phoneid/PhoneId.java
● src/com/telesign/util/TeleSignRequest.java
● src/com/telesign/verify/Verify.java