Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #600 from SamWhited/gradle | Daniel Gultsch | 2014-11-01 | 434 | -99/+7009 |
|\ | | | | | Build system and library changes (Gradle / Subtree merging) | ||||
| * | Merge branch 'gradle' into development | Sam Whited | 2014-10-30 | 434 | -99/+7009 |
|/| | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib | ||||
| * | Tweak README some more | Sam Whited | 2014-10-28 | 1 | -2/+3 |
| | | |||||
| * | Fix typo in subtree merge directions | Sam Whited | 2014-10-28 | 1 | -1/+1 |
| | | |||||
| * | Add subtree merge directions to README | Sam Whited | 2014-10-28 | 1 | -3/+19 |
| | | |||||
| * | Subtree merged in openpgp api lib | Sam Whited | 2014-10-28 | 45 | -6/+1829 |
| |\ | |||||
| | * | Work on Yubikey decryption | Dominik Schürmann | 2014-09-08 | 1 | -0/+1 |
| | | | |||||
| | * | Fix for user ids in API | Dominik Schürmann | 2014-09-07 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'master' of https://github.com/open-keychain/openpgp-api-lib | Dominik Schürmann | 2014-09-07 | 18 | -2/+81 |
| | |\ | |||||
| | | * | Pull from transifex | Dominik Schürmann | 2014-09-04 | 17 | -0/+61 |
| | | | | |||||
| | | * | Update README | Dominik Schürmann | 2014-09-02 | 1 | -1/+1 |
| | | | | |||||
| | | * | Update README | Dominik Schürmann | 2014-09-02 | 1 | -1/+1 |
| | | | | |||||
| | | * | Update README | Dominik Schürmann | 2014-09-02 | 1 | -2/+20 |
| | | | | |||||
| | * | | Fix nullpointer with new OpenPgpSignatureResult version | Dominik Schürmann | 2014-09-07 | 1 | -0/+1 |
| | |/ | |||||
| | * | Changelog | Dominik Schürmann | 2014-08-31 | 1 | -1/+2 |
| | | | |||||
| | * | Add userIds to OpenPgpSignatureResult | Dominik Schürmann | 2014-08-31 | 1 | -14/+29 |
| | | | |||||
| | * | Merge branch 'master' of https://github.com/open-keychain/openpgp-api-lib | Dominik Schürmann | 2014-08-31 | 1 | -2/+5 |
| | |\ | |||||
| | | * | Merge pull request #1 from Flowdalic/flow | Dominik Schürmann | 2014-08-30 | 1 | -2/+5 |
| | | |\ | | | | | | | | | | | Add my Real-name to the Copyright statement | ||||
| | | | * | Add my Real-name to the Copyright statement | Florian Schmaus | 2014-08-30 | 1 | -2/+5 |
| | | |/ | | | | | | | | | | | | | of ParcelFileDescriptorUtil. | ||||
| | * / | Add SIGNATURE_KEY_REVOKED, SIGNATURE_KEY_EXPIRED, rename ↵ | Dominik Schürmann | 2014-08-31 | 2 | -6/+12 |
| | |/ | | | | | | | | | | SIGNATURE_PUB_KEY_UNKNOWN | ||||
| | * | Use application context | Dominik Schürmann | 2014-08-12 | 1 | -1/+1 |
| | | | |||||
| | * | More fixes for OpenPgpServiceConnection | Dominik Schürmann | 2014-08-12 | 1 | -3/+6 |
| | | | |||||
| | * | Refactor OpenPgpServiceConnection with better callback | Dominik Schürmann | 2014-08-12 | 1 | -13/+16 |
| | | | |||||
| | * | Add EXTRA_ORIGINAL_FILENAME | Dominik Schürmann | 2014-08-11 | 1 | -1/+4 |
| | | | |||||
| | * | Rename to OpenPgpMetadata | Dominik Schürmann | 2014-08-11 | 1 | -10/+10 |
| | | | |||||
| | * | Support mime type in metadata | Dominik Schürmann | 2014-08-11 | 1 | -14/+13 |
| | | | |||||
| | * | Increase version to 4 | Dominik Schürmann | 2014-08-11 | 1 | -5/+30 |
| | | | |||||
| | * | Add metadata parcel | Dominik Schürmann | 2014-08-11 | 1 | -0/+133 |
| | | | |||||
| | * | Lint fixes | Dominik Schürmann | 2014-08-04 | 1 | -1/+1 |
| | | | |||||
| | * | Update gradle plugin to 0.12.2 | Dominik Schürmann | 2014-07-27 | 1 | -1/+1 |
| | | | |||||
| | * | Add values for NFC support | Dominik Schürmann | 2014-07-22 | 1 | -2/+3 |
| | | | |||||
| | * | Extend for NFC | Dominik Schürmann | 2014-07-17 | 1 | -0/+3 |
| | | | |||||
| | * | Update android gradle plugin to 0.12.0 | Dominik Schürmann | 2014-06-28 | 1 | -1/+1 |
| | | | |||||
| | * | Add transifex config | Dominik Schürmann | 2014-06-22 | 1 | -0/+8 |
| | | | |||||
| | * | Update buildTools to 19.1 | Dominik Schürmann | 2014-06-09 | 1 | -2/+2 |
| | | | |||||
| | * | Add readme | Dominik Schürmann | 2014-05-07 | 1 | -0/+3 |
| | | | |||||
| | * | Initial import from main repo | Dominik Schürmann | 2014-05-07 | 24 | -0/+1542 |
| | | |||||
| * | Subtree merged in minidns | Sam Whited | 2014-10-28 | 23 | -0/+2945 |
| | | |||||
| * | Remove minidns dir | Sam Whited | 2014-10-28 | 1 | -6/+0 |
| | | |||||
| * | Subtree merged in MemorizingTrustManager | Sam Whited | 2014-10-28 | 35 | -0/+1875 |
| |\ | |||||
| | * | Allow mdns multicast / unicast reply queries | Rene Treffer | 2014-07-30 | 1 | -2/+18 |
| | | | |||||
| | * | Remove System.out code | Rene Treffer | 2014-07-30 | 1 | -2/+6 |
| | | | |||||
| | * | Fix style on build.gradle | Rene Treffer | 2014-07-30 | 1 | -2/+4 |
| | | | |||||
| | * | Merge branch 'v0.1' | Rene Treffer | 2014-07-23 | 3 | -2/+24 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: src/main/java/de/measite/minidns/Record.java | ||||
| | | * | Add parsing for mdns QU records (RFC6762) | Rene Treffer | 2014-07-23 | 1 | -1/+15 |
| | | | | |||||
| | | * | Better / more verbose toString | Rene Treffer | 2014-07-23 | 2 | -1/+9 |
| | | | | |||||
| | | * | Add TXT record | Rene Treffer | 2014-07-23 | 2 | -1/+74 |
| | | | | |||||
| | | * | Add PTR record parsing | Rene Treffer | 2014-07-22 | 3 | -1/+24 |
| | | | | |||||
| | * | | Add TXT record | Rene Treffer | 2014-07-23 | 2 | -1/+74 |
| | | | | |||||
| | * | | Add PTR record parsing | Rene Treffer | 2014-07-22 | 3 | -1/+24 |
| | |/ |