| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | avoid nullpointerexception in EditKeyResult | Vincent Breitmoser | 2014-07-31 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| | * | | | | | | Keyserver exception translateable | Dominik Schürmann | 2014-07-31 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | couple of logging fixes | Vincent Breitmoser | 2014-07-31 | 1 | -2/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | rename Wrapped*Key* to Canonicalized*Key* | Vincent Breitmoser | 2014-07-31 | 3 | -12/+11 | |
| | | | | | | | | ||||||
| | * | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-30 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | couple of fixes in save*KeyRing methods | Vincent Breitmoser | 2014-07-30 | 1 | -0/+1 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Create key: work on upload | Dominik Schürmann | 2014-07-30 | 1 | -0/+9 | |
| | |/ / / / / / | ||||||
| | * | | | | | | return values for create key | Dominik Schürmann | 2014-07-30 | 1 | -4/+2 | |
| | | | | | | | | ||||||
| | * | | | | | | Merge branch 'ditch-appmsg' | Vincent Breitmoser | 2014-07-29 | 4 | -42/+158 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java | |||||
| | | * | | | | | | introduce EditKeyResult with transient UncachedKeyRing (half-baked!) | Vincent Breitmoser | 2014-07-27 | 3 | -26/+69 | |
| | | | | | | | | | ||||||
| | | * | | | | | | some more work on supertoast and result parcel stuff | Vincent Breitmoser | 2014-07-27 | 3 | -20/+33 | |
| | | | | | | | | | ||||||
| | | * | | | | | | Merge branch 'master' into ditch-appmsg | Vincent Breitmoser | 2014-07-26 | 4 | -50/+224 | |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java | |||||
| | | * | | | | | | | use SuperToast instead of AppMsg in code, part 2 | Vincent Breitmoser | 2014-07-07 | 2 | -3/+64 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | use SuperToast instead of AppMsg in code, part 1 | Vincent Breitmoser | 2014-07-07 | 1 | -4/+3 | |
| | | | |_|_|_|_|/ | | |/| | | | | | ||||||
| | * | | | | | | | Make PassphraseCacheService a foreground service | Dominik Schürmann | 2014-07-27 | 1 | -72/+67 | |
| | | |/ / / / / | |/| | | | | | ||||||
| | * | | | | | | test and fix: adding an empty user id should fail | Vincent Breitmoser | 2014-07-26 | 1 | -0/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Remove support for V3 signatures | Dominik Schürmann | 2014-07-22 | 1 | -1/+0 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-07-21 | 1 | -0/+2 | |
| |\| | | | | | | ||||||
| | * | | | | | | canonicalize: fix for tests | Vincent Breitmoser | 2014-07-19 | 1 | -0/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Fixes | Dominik Schürmann | 2014-07-17 | 1 | -0/+8 | |
| |/ / / / / / | ||||||
| * | | | | | | Fallback if no primary user id exists | Dominik Schürmann | 2014-07-16 | 2 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId) | Vincent Breitmoser | 2014-07-15 | 1 | -2/+1 | |
| | | | | | | | ||||||
| * | | | | | | merge: different msg if nothing was merged | Vincent Breitmoser | 2014-07-15 | 1 | -0/+1 | |
| | | | | | | | ||||||
| * | | | | | | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-15 | 2 | -13/+139 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | |||||
| | * | | | | | | Fixed misplaced bracket | Daniel Albert | 2014-07-12 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | Fixed issues discussed in #713 | Daniel Albert | 2014-07-12 | 1 | -10/+10 | |
| | | | | | | | | ||||||
| | * | | | | | | Put text into strings.xml, for internationalization | Daniel Albert | 2014-07-12 | 1 | -6/+6 | |
| | | | | | | | | ||||||
| | * | | | | | | Added Purging for Android < 4.1 | Daniel Albert | 2014-07-12 | 1 | -28/+51 | |
| | | | | | | | | ||||||
| | * | | | | | | Implemented Notification, no fallback yet | Daniel Albert | 2014-07-12 | 2 | -4/+71 | |
| | | | | | | | | ||||||
| | * | | | | | | new PassphraseCache, storing UserIDs as well | Daniel Albert | 2014-07-12 | 1 | -11/+47 | |
| | | | | | | | | ||||||
| * | | | | | | | createKey: better logging, handle empty user id case | Vincent Breitmoser | 2014-07-12 | 1 | -0/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-11 | 1 | -8/+8 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | | | | | | modifyKey: make SubkeyChange operations work | Vincent Breitmoser | 2014-07-11 | 1 | -0/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | SaveKeyringParcel: follow attribute m prefix coding guideline | Vincent Breitmoser | 2014-07-11 | 2 | -30/+30 | |
| | | | | | | | | ||||||
| * | | | | | | | 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 | 1 | -4/+0 | |
| | | | | | | | | ||||||
| * | | | | | | | modifyKey: error out on nonexisting new primary user id | Vincent Breitmoser | 2014-07-11 | 1 | -0/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | add come createKey strings | Vincent Breitmoser | 2014-07-11 | 1 | -1/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | tests: add testSubkeyAdd | Vincent Breitmoser | 2014-07-10 | 1 | -0/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge remote-tracking branch ↵ | Vincent Breitmoser | 2014-07-09 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'artbristol/functional-testing-canonicalize-badsignature' into external-test Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell | |||||
| | * | | | | | | | add toString for test ease | Art O Cathain | 2014-07-06 | 1 | -0/+10 | |
| | |/ / / / / / | ||||||
| * | | | | | | | Merge remote-tracking branch 'artbristol/functional-testing-canonicalize' | Vincent Breitmoser | 2014-07-07 | 1 | -0/+10 | |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java | |||||
| | * | | | | | | add toString for test ease | Art O Cathain | 2014-07-06 | 1 | -0/+10 | |
| | |/ / / / / | ||||||
| * / / / / / | Prefer composition to inheritance is the mantra these das | Art O Cathain | 2014-07-06 | 1 | -5/+25 | |
| |/ / / / / | ||||||
| * | | | | | parcel newPassphrase | Dominik Schürmann | 2014-07-03 | 1 | -0/+4 | |
| | | | | | | ||||||
| * | | | | | Work on edit | Dominik Schürmann | 2014-07-03 | 1 | -7/+7 | |
| | | | | | | ||||||
| * | | | | | merge KeychainIntentService | Dominik Schürmann | 2014-07-02 | 4 | -26/+55 | |
| |\ \ \ \ \ | ||||||
| | * \ \ \ \ | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-07-02 | 1 | -16/+15 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'create-keyring' | Vincent Breitmoser | 2014-07-02 | 4 | -25/+54 | |
| | |\ \ \ \ \ \ | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |