| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | canonicalize: fix for tests | Vincent Breitmoser | 2014-07-19 | 1 | -0/+2 | |
| | | | | | | ||||||
| * | | | | | Fixed another unescaped apostrophe. | Daniel Albert | 2014-07-17 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Fixed unescaped apostrophe | Daniel Albert | 2014-07-17 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Added description to Setting, Changed title to suggested one | Daniel Albert | 2014-07-17 | 1 | -1/+2 | |
| | | | | | | ||||||
| * | | | | | Merge remote-tracking branch 'upstream/master' | Daniel Albert | 2014-07-16 | 1 | -3/+22 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java | |||||
| | * | | | | | New first time screen | Dominik Schürmann | 2014-07-16 | 1 | -1/+6 | |
| | | | | | | | ||||||
| | * | | | | | 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 | 1 | -0/+7 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | |||||
| | * | | | | | | 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 | -0/+5 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | * | | | | | | | get rid of some inspection warnings | Vincent Breitmoser | 2014-07-11 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| | * | | | | | | | 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/+8 | |
| | | |_|/ / / / | |/| | | | | | ||||||
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into feature-conceal-software | Daniel Albert | 2014-07-13 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||||
| | * | | | | | | Fix strings from 'keys' to 'passphrases' | Dominik Schürmann | 2014-07-12 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Added Preference for concealing the PgpApplication | Daniel Albert | 2014-07-12 | 1 | -0/+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 | 1 | -2/+3 | |
| | | | | | | | ||||||
| * | | | | | | Put text into strings.xml, for internationalization | Daniel Albert | 2014-07-12 | 1 | -0/+6 | |
| | |/ / / / |/| | | | | ||||||
| * | | | | | Work on subkeys adapter | Dominik Schürmann | 2014-07-08 | 1 | -0/+5 | |
| |/ / / / | ||||||
| * | | | | Bett API string | Dominik Schürmann | 2014-07-04 | 1 | -3/+3 | |
| | | | | | ||||||
| * | | | | Use strings in edit key | Dominik Schürmann | 2014-07-03 | 1 | -0/+10 | |
| | | | | | ||||||
| * | | | | Small strings fix | Dominik Schürmann | 2014-07-03 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Work on edit | Dominik Schürmann | 2014-07-03 | 1 | -4/+3 | |
| | | | | | ||||||
| * | | | | Merge branch 'create-keyring' | Vincent Breitmoser | 2014-07-02 | 1 | -0/+4 | |
| |\ \ \ \ | ||||||
| | * | | | | support changing primary user id in SaveKeyringParcel | Vincent Breitmoser | 2014-07-02 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | Closes #695 | |||||
| | * | | | | add create key capabilities to SaveKeyringParcel | Vincent Breitmoser | 2014-06-29 | 1 | -0/+2 | |
| | | |_|/ | |/| | | ||||||
| * / | | | don't use zero plural string for english | Vincent Breitmoser | 2014-07-02 | 1 | -1/+1 | |
| |/ / / | | | | | | | | | | closes #703 | |||||
| * | | | code cleanup and plurals in import log entries | Vincent Breitmoser | 2014-06-28 | 1 | -10/+23 | |
| | | | | | | | | | | | | | closes #698 | |||||
| * | | | Start work on a first-time wizard | Dominik Schürmann | 2014-06-27 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Rename registered apps to apps | Dominik Schürmann | 2014-06-24 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Revert hint_keybase_search | Dominik Schürmann | 2014-06-22 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Moved Keybase stuff into KeybaseLib submodule | Tim Bray | 2014-06-20 | 1 | -1/+1 | |
| | |/ |/| | ||||||
| * | | Fix onTouchEvent delegation, with workaround for Android bug | Dominik Schürmann | 2014-06-20 | 1 | -8/+0 | |
| |/ | ||||||
| * | canonicalize: missed two logging entries | Vincent Breitmoser | 2014-06-18 | 1 | -3/+4 | |
| | | ||||||
| * | Merge branch 'new-edit' | Vincent Breitmoser | 2014-06-18 | 1 | -1/+19 | |
| |\ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/res/values/strings.xml | |||||
| | * | new-edit: add logging to modifySecretKeyRing operation | Vincent Breitmoser | 2014-06-17 | 1 | -0/+19 | |
| | | | ||||||
| * | | generate public keyring from secret if not available | Vincent Breitmoser | 2014-06-18 | 1 | -1/+2 | |
| | | | ||||||
| * | | consolidate: almost sane logging | Vincent Breitmoser | 2014-06-18 | 1 | -3/+4 | |
| | | | ||||||
| * | | consolidate: add key import routines with consolidation | Vincent Breitmoser | 2014-06-18 | 1 | -3/+3 | |
| | | | ||||||
| * | | consolidate: make it work | Vincent Breitmoser | 2014-06-18 | 1 | -6/+8 | |
| | | | ||||||
| * | | consolidate: add logging | Vincent Breitmoser | 2014-06-18 | 1 | -0/+7 | |
| | | | ||||||
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-18 | 1 | -10/+23 | |
| |\ \ | ||||||
| | * | | handle database error on secret key insert | Vincent Breitmoser | 2014-06-17 | 1 | -0/+1 | |
| | | | | ||||||
| | * | | canonicalize: support secret keys | Vincent Breitmoser | 2014-06-17 | 1 | -1/+3 | |
| | |/ | ||||||
| | * | drop invalid user ids and add fatal case(s) | Vincent Breitmoser | 2014-06-16 | 1 | -0/+2 | |
| | | | ||||||
| | * | import-log: distinguish master/subkeys, distinguish redundant/bad certs, ↵ | Vincent Breitmoser | 2014-06-16 | 1 | -9/+17 | |
| | | | | | | | | | more docs | |||||
| * | | Redesign Import, still some todos and regression bugs | Dominik Schürmann | 2014-06-18 | 1 | -14/+9 | |
| |/ | ||||||
| * | Merge remote-tracking branch 'origin/master' into canonicalize | Vincent Breitmoser | 2014-06-13 | 1 | -0/+3 | |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/res/values/strings.xml settings.gradle | |||||
| | * | Merge pull request #650 from open-keychain/v/import-log | Dominik Schürmann | 2014-06-06 | 1 | -0/+39 | |
| | |\ | | | | | | | Parcelable operation result with logging capabilities + import logging | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |