| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | remove margin in import keys (leftover from nav drawer) | Dominik Schürmann | 2014-06-23 | 1 | -2/+0 |
| | | |||||
| * | new edit key: diff for existing user ids | Dominik Schürmann | 2014-06-22 | 2 | -10/+21 |
| | | |||||
| * | add buttons in edit key | Dominik Schürmann | 2014-06-22 | 1 | -0/+64 |
| | | |||||
| * | Revert hint_keybase_search | Dominik Schürmann | 2014-06-22 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #668 from timbray/master | Dominik Schürmann | 2014-06-21 | 1 | -1/+1 |
| |\ | | | | | Moved Keybase stuff into KeybaseLib submodule | ||||
| | * | Moved Keybase stuff into KeybaseLib submodule | Tim Bray | 2014-06-20 | 1 | -1/+1 |
| | | | |||||
| * | | Start new designed activity | Dominik Schürmann | 2014-06-21 | 3 | -0/+73 |
| |/ | |||||
| * | Use actionbar button for log activity | Dominik Schürmann | 2014-06-20 | 1 | -30/+0 |
| | | |||||
| * | Fix onTouchEvent delegation, with workaround for Android bug | Dominik Schürmann | 2014-06-20 | 1 | -8/+0 |
| | | |||||
| * | Remove unused code to import splitted qr codes | Dominik Schürmann | 2014-06-19 | 1 | -19/+0 |
| | | |||||
| * | Reference ic_launcher instead of icon | Dominik Schürmann | 2014-06-18 | 4 | -4/+4 |
| | | |||||
| * | decrease size of search icons in import | Dominik Schürmann | 2014-06-18 | 2 | -2/+2 |
| | | |||||
| * | Fix new actionbar icon sizes, rename icon to ic_launcher following Android ↵ | Dominik Schürmann | 2014-06-18 | 15 | -2/+2 |
| | | | | | naming conventions | ||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-18 | 1 | -3/+4 |
| |\ | |||||
| | * | canonicalize: missed two logging entries | Vincent Breitmoser | 2014-06-18 | 1 | -3/+4 |
| | | | |||||
| * | | consistent button design in import activity | Dominik Schürmann | 2014-06-18 | 2 | -18/+0 |
| |/ | |||||
| * | 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 | 19 | -136/+210 |
| |/ | |||||
| * | Added notification area to decrypt content | Daniel Haß | 2014-06-16 | 1 | -0/+2 |
| | | |||||
| * | Added notification area as reusable layout | Daniel Haß | 2014-06-16 | 1 | -0/+12 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into canonicalize | Vincent Breitmoser | 2014-06-13 | 7 | -2/+28 |
| |\ | | | | | | | | | | | | | | | | | | | 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 | 4 | -0/+19 |
| | |\ \ | | | | | | | | | 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 | 2 | -3/+2 |
| | | | | | | | | | | | | | | | | | 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 | 93 | -649/+1315 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| | | * | | | First version of automatic contact discovery. | mar-v-in | 2014-06-04 | 4 | -0/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) | ||||
| | * | | | | Move SlidingTabLayout and SlidingTabStrip into appropriate subpackage | Dominik Schürmann | 2014-06-06 | 2 | -2/+2 |
| | | | | | | |||||
| | * | | | | Hide subkeys, certs tabs in key view, checkable menu item to show/hide them | Dominik Schürmann | 2014-06-06 | 2 | -0/+7 |
| | | |/ / | |/| | | |||||
| * | | | | 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 | 2 | -3/+11 |
| | | | | | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |