| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 | ||||
| | * \ | Merge pull request #649 from mar-v-in/automatic-contact-discovery | Dominik Schürmann | 2014-06-06 | 1 | -0/+2 |
| | |\ \ | | | | | | | | | Automatic contact discovery and more | ||||
| | | * | | Fixing TAG and string resource | mar-v-in | 2014-06-06 | 1 | -2/+1 |
| | | | | | |||||
| | | * | | Show keys with android contacts | mar-v-in | 2014-06-05 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid. | ||||
| | | * | | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-04 | 1 | -0/+1 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| | | * | | | First version of automatic contact discovery. | mar-v-in | 2014-06-04 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: - Configuration (much of it) - Enabled by default? - Which keys to import? Current state: All non-revoked and non-expired with matching userid - Search for keys if already known? Current state: yes, may cause traffic (configuration: only when wifi?) - Update interval: Currently Android handles it, might be good (causes automatic refresh on new contact and stuff like that) or bad (too many of refreshes) | ||||
| | * | | | | Hide subkeys, certs tabs in key view, checkable menu item to show/hide them | Dominik Schürmann | 2014-06-06 | 1 | -0/+1 |
| | | |/ / | |/| | | |||||
| * | | | | canonicalize: require primary key binding certificates for signing subkeys | Vincent Breitmoser | 2014-06-12 | 1 | -2/+5 |
| | | | | | |||||
| * | | | | canonicalize: simplify import with info from canonicalization | Vincent Breitmoser | 2014-06-12 | 1 | -4/+0 |
| | | | | | |||||
| * | | | | canonicalize: filter out future and local certificates | Vincent Breitmoser | 2014-06-12 | 1 | -6/+13 |
| | | | | | |||||
| * | | | | import-log: more minor improvements | Vincent Breitmoser | 2014-06-12 | 1 | -8/+6 |
| | | | | | |||||
| * | | | | import: use wrapped keyring instead of uncached keyring for trust | Vincent Breitmoser | 2014-06-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | import-log: minor improvements | Vincent Breitmoser | 2014-06-12 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | canonicalize: more stuff | Vincent Breitmoser | 2014-06-12 | 1 | -7/+10 |
| | | | | | |||||
| * | | | | canonicalize: implementation, first draft | Vincent Breitmoser | 2014-06-12 | 1 | -1/+20 |
| | | | | | |||||
| * | | | | import-log: better way to check self trust, and fix log level filtering | Vincent Breitmoser | 2014-06-12 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | import-log: work on log fragment ui | Vincent Breitmoser | 2014-06-10 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | import-log: switch to flags instead of statuses for result int | Vincent Breitmoser | 2014-06-10 | 1 | -20/+22 |
| | | | | | |||||
| * | | | | import-log: more interface work | Vincent Breitmoser | 2014-06-10 | 1 | -10/+23 |
| | | | | | |||||
| * | | | | import-log: some cosmetics | Vincent Breitmoser | 2014-06-10 | 1 | -23/+26 |
| | | | | | |||||
| * | | | | import-log: add OperationResults, use it in ImportKeys operation | Vincent Breitmoser | 2014-06-10 | 1 | -3/+9 |
| | |_|/ |/| | | |||||
| * | | | import-log: better stripped key logging | Vincent Breitmoser | 2014-06-06 | 1 | -1/+2 |
| | | | | |||||
| * | | | import-log: add import log string resources | Vincent Breitmoser | 2014-06-06 | 1 | -0/+38 |
| |/ / | |||||
| * | | Merge remote-tracking branch 'origin/master' into edit-key-rewrite | Vincent Breitmoser | 2014-06-02 | 1 | -3/+3 |
| |\| | |||||
| | * | Add Log.d for QueryFailedException | Tim Bray | 2014-05-23 | 1 | -3/+3 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-14 | 1 | -24/+42 |
| |\| | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java OpenKeychain/src/main/res/values/strings.xml | ||||
| | * | Add applications section to help | Dominik Schürmann | 2014-05-07 | 1 | -1/+1 |
| | | | |||||
| | * | Start app menu item for registered apps | Dominik Schürmann | 2014-05-07 | 1 | -0/+1 |
| | | | |||||
| | * | Design fixes for certification activity | Dominik Schürmann | 2014-05-07 | 1 | -0/+1 |
| | | | |||||
| | * | Use paste icon, clarify language once again | Dominik Schürmann | 2014-05-07 | 1 | -3/+4 |
| | | | |||||
| | * | Clarify language | Dominik Schürmann | 2014-05-07 | 1 | -2/+3 |
| | | | |||||
| | * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-05-07 | 1 | -0/+1 |
| | |\ | |||||
| | | * | display AppMsg warning when no encryption subkey is available | Vincent Breitmoser | 2014-05-07 | 1 | -0/+1 |
| | | | | |||||
| | * | | Clarify language | Dominik Schürmann | 2014-05-07 | 1 | -4/+4 |
| | |/ | |||||
| | * | Clarify language | Dominik Schürmann | 2014-05-06 | 1 | -8/+8 |
| | | | |||||
| | * | Some small style fixes | Dominik Schürmann | 2014-05-06 | 1 | -2/+2 |
| | | | |||||
| | * | ui: use textviews instead of bootstrap buttons in SignEncrypt | Vincent Breitmoser | 2014-05-06 | 1 | -0/+1 |
| | | | |||||
| | * | ui: remove primary subkey info | Vincent Breitmoser | 2014-05-05 | 1 | -1/+1 |
| | | | |||||
| | * | Merge pull request #603 from timbray/master | Dominik Schürmann | 2014-05-05 | 1 | -0/+3 |
| | |\ | | | | | | | Adds first level of keybase support | ||||
| | | * | can search openkeychain, retrieve & install & use keys from there | Tim Bray | 2014-04-29 | 1 | -0/+3 |
| | | | | |||||
| | * | | Update from transifex | Dominik Schürmann | 2014-05-05 | 1 | -1/+2 |
| | | | | |||||
| | * | | New key view design, using Android flat buttons and Android icons | Dominik Schürmann | 2014-05-05 | 1 | -14/+22 |
| | |/ | |||||
| * / | wrapped-key-ring: more refactoring - no more pgp imports in ↵ | Vincent Breitmoser | 2014-05-03 | 1 | -0/+1 |
| |/ | | | | KeychainIntentService! | ||||
| * | Merge commit '0b7fb70' | Vincent Breitmoser | 2014-04-22 | 1 | -0/+1 |
| |\ | | | | | | | | | Conflicts: OpenKeychain/src/main/res/values/strings.xml | ||||
| | * | split up filterSign and filterCertify in SelectSecretKeyFragment | Vincent Breitmoser | 2014-04-20 | 1 | -0/+1 |
| | | | | | | | | | Closes #588 | ||||
| * | | More code cleanup | Dominik Schürmann | 2014-04-19 | 1 | -10/+13 |
| |/ | |||||
| * | better error string for too many responses | Dominik Schürmann | 2014-04-19 | 1 | -1/+1 |
| | | |||||
| * | Trying a fix for #585 | Dominik Schürmann | 2014-04-19 | 1 | -1/+1 |
| | | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |