| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | | | Temporary program flow fixes | Dominik Schürmann | 2014-07-16 | 1 | -0/+3 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Simple create key | Dominik Schürmann | 2014-07-16 | 1 | -1/+0 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Simple create key | Dominik Schürmann | 2014-07-16 | 3 | -51/+57 | |
| | | | | | | | | | ||||||
| * | | | | | | | | New first time screen | Dominik Schürmann | 2014-07-16 | 15 | -681/+362 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Fallback if no primary user id exists | Dominik Schürmann | 2014-07-16 | 11 | -13/+34 | |
| | | | | | | | | | ||||||
| * | | | | | | | | move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId) | Vincent Breitmoser | 2014-07-15 | 9 | -22/+21 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-15 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | signatures: a revocation reason does NOT determine if a cert is a revocation ↵ | Vincent Breitmoser | 2014-07-15 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | type | |||||
| * | | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-15 | 4 | -3/+9 | |
| |\| | | | | | | | | ||||||
| | * | | | | | | | | merge: different msg if nothing was merged | Vincent Breitmoser | 2014-07-15 | 4 | -3/+9 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | some fixes for edit | Dominik Schürmann | 2014-07-15 | 2 | -4/+5 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-15 | 6 | -23/+380 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | |||||
| | * | | | | | | | Fix strings from 'keys' to 'passphrases' | Dominik Schürmann | 2014-07-12 | 1 | -2/+2 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-12 | 4 | -16/+158 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | Fixed misplaced bracket | Daniel Albert | 2014-07-12 | 1 | -1/+1 | |
| | | |/ / / / / / | ||||||
| | | * | | | | | | Wello there, That's Java, not C^^ | Daniel Albert | 2014-07-12 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| | | * | | | | | | Fixed issues discussed in #713 | Daniel Albert | 2014-07-12 | 3 | -14/+15 | |
| | | | | | | | | | ||||||
| | | * | | | | | | Put text into strings.xml, for internationalization | Daniel Albert | 2014-07-12 | 2 | -6/+12 | |
| | | | | | | | | | ||||||
| | | * | | | | | | Added Purging for Android < 4.1 | Daniel Albert | 2014-07-12 | 1 | -28/+51 | |
| | | | | | | | | | ||||||
| | | * | | | | | | Implemented Notification, no fallback yet | Daniel Albert | 2014-07-12 | 3 | -7/+83 | |
| | | | | | | | | | ||||||
| | | * | | | | | | new PassphraseCache, storing UserIDs as well | Daniel Albert | 2014-07-12 | 1 | -11/+47 | |
| | | | | | | | | | ||||||
| | * | | | | | | | more work on edit key | Dominik Schürmann | 2014-07-12 | 2 | -7/+222 | |
| | |/ / / / / / | ||||||
| * | | | | | | | modifyKey: error out on integrity check fails | Vincent Breitmoser | 2014-07-12 | 2 | -10/+18 | |
| | | | | | | | | ||||||
| * | | | | | | | createKey: better logging, handle empty user id case | Vincent Breitmoser | 2014-07-12 | 3 | -44/+66 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-11 | 9 | -76/+296 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java | |||||
| | * | | | | | | Fix OperationResultParcel | mar-v-in | 2014-07-09 | 1 | -8/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | Naming conventions save lives... or atleast make addAll() work | |||||
| | * | | | | | | Fix nullpointer in API, fix #693 | Dominik Schürmann | 2014-07-08 | 1 | -1/+7 | |
| | | | | | | | | ||||||
| | * | | | | | | cleanup | Dominik Schürmann | 2014-07-08 | 1 | -30/+0 | |
| | | | | | | | | ||||||
| | * | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-08 | 2 | -6/+27 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | Work on subkeys adapter | Dominik Schürmann | 2014-07-08 | 8 | -66/+310 | |
| | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | | travis: get rid of lint | Vincent Breitmoser | 2014-07-11 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | modifyKey: proper expiry check during SubkeyAdd | Vincent Breitmoser | 2014-07-11 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | modifyKey: make SubkeyChange operations work | Vincent Breitmoser | 2014-07-11 | 4 | -27/+64 | |
| | | | | | | | | ||||||
| * | | | | | | | SaveKeyringParcel: follow attribute m prefix coding guideline | Vincent Breitmoser | 2014-07-11 | 8 | -69/+66 | |
| | | | | | | | | ||||||
| * | | | | | | | test: get rid of some SaveKeyringParcel boilerplate | Vincent Breitmoser | 2014-07-11 | 1 | -5/+11 | |
| | | | | | | | | ||||||
| * | | | | | | | get rid of some inspection warnings | Vincent Breitmoser | 2014-07-11 | 3 | -5/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | modifyKey: error out on nonexisting new primary user id | Vincent Breitmoser | 2014-07-11 | 3 | -0/+12 | |
| | | | | | | | | ||||||
| * | | | | | | | fix bug in canonicalization regarding subkey revocation | Vincent Breitmoser | 2014-07-11 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | modifyKey: couple more fixes from tests | Vincent Breitmoser | 2014-07-11 | 2 | -4/+34 | |
| | | | | | | | | ||||||
| * | | | | | | | some UncachedKeyRing fixes, primary user id mostly | Vincent Breitmoser | 2014-07-11 | 3 | -18/+67 | |
| | | | | | | | | ||||||
| * | | | | | | | modifyKey: preserve master key flags | Vincent Breitmoser | 2014-07-11 | 1 | -5/+22 | |
| | | | | | | | | ||||||
| * | | | | | | | add come createKey strings | Vincent Breitmoser | 2014-07-11 | 3 | -3/+19 | |
| | | | | | | | | ||||||
| * | | | | | | | tests: add testSubkeyAdd | Vincent Breitmoser | 2014-07-10 | 2 | -0/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge remote-tracking branch ↵ | Vincent Breitmoser | 2014-07-09 | 8 | -830/+1 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'artbristol/functional-testing-canonicalize-badsignature' into external-test Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell | |||||
| | * | | | | | | | actually provide a tostring | Art O Cathain | 2014-07-07 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| | * | | | | | | | prevent odd ambiguous method toString error | Art O Cathain | 2014-07-07 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| | * | | | | | | | (c) headers, tidy imports | Art O Cathain | 2014-07-07 | 9 | -7/+151 | |
| | | | | | | | | | ||||||
| | * | | | | | | | use KeyringTestHelper.diffKeyrings method for unit test | Vincent Breitmoser | 2014-07-07 | 2 | -1/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/test/java/tests/UncachedKeyringTest.java | |||||
| | * | | | | | | | add diffKeyrings method | Vincent Breitmoser | 2014-07-07 | 1 | -0/+133 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Actually test canonicalize | Art O Cathain | 2014-07-06 | 3 | -87/+181 | |
| | | | | | | | | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/OpenKeychain