| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | cleanup | Dominik Schürmann | 2014-08-21 | 1 | -71/+0 |
| | | |||||
| * | Fix result handling in account settings | Dominik Schürmann | 2014-08-21 | 2 | -16/+13 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-21 | 6 | -41/+71 |
| |\ | |||||
| | * | Comment extra in requestSync | Dominik Schürmann | 2014-08-20 | 1 | -0/+1 |
| | | | |||||
| | * | Sync in KeychainIntentService on delete, import, save | Dominik Schürmann | 2014-08-20 | 2 | -0/+21 |
| | | | |||||
| | * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-20 | 8 | -51/+133 |
| | |\ | |||||
| | * | | Enable sync adapter, changelog | Dominik Schürmann | 2014-08-20 | 4 | -2/+9 |
| | | | | |||||
| | * | | Disable key import in sync adapter | Dominik Schürmann | 2014-08-20 | 1 | -38/+39 |
| | | | | |||||
| | * | | improve certs_text | Dominik Schürmann | 2014-08-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Copyright (C) 2014 Vincent Breitmoser | Vincent Breitmoser | 2014-08-21 | 38 | -3/+39 |
| | |/ |/| | |||||
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 4 | -13/+8 |
| |\| | |||||
| | * | Upload key working | Dominik Schürmann | 2014-08-20 | 4 | -13/+8 |
| | | | |||||
| * | | small change to make android studio recognize a honeycomb-only block | Vincent Breitmoser | 2014-08-20 | 1 | -2/+4 |
| | | | |||||
| * | | move key deletion into KeychainIntentHandler | Vincent Breitmoser | 2014-08-20 | 4 | -40/+104 |
| | | | |||||
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 7 | -33/+49 |
| |\| | |||||
| | * | Upload key working | Dominik Schürmann | 2014-08-20 | 1 | -0/+3 |
| | | | |||||
| | * | Fix key sharing | Dominik Schürmann | 2014-08-20 | 1 | -3/+1 |
| | | | |||||
| | * | Work on upload key | Dominik Schürmann | 2014-08-20 | 1 | -14/+24 |
| | | | |||||
| | * | Notify duration, cleanup | Dominik Schürmann | 2014-08-20 | 2 | -9/+4 |
| | | | |||||
| | * | Fix nullpointer in first time activity | Dominik Schürmann | 2014-08-20 | 1 | -1/+3 |
| | | | |||||
| | * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-20 | 2 | -3/+3 |
| | |\ | |||||
| | * | | return some more results | Dominik Schürmann | 2014-08-20 | 2 | -6/+14 |
| | | | | |||||
| * | | | consolidate: small ui things | Vincent Breitmoser | 2014-08-20 | 2 | -1/+6 |
| | | | | |||||
| * | | | make number of secret keys imported part of ImportResult parcel | Vincent Breitmoser | 2014-08-20 | 2 | -5/+11 |
| | | | | |||||
| * | | | close actionmode in keylist on loading events (avoid inconsistent state) | Vincent Breitmoser | 2014-08-20 | 1 | -0/+10 |
| | | | | |||||
| * | | | consolidate: remove debug "breakpoint" | Vincent Breitmoser | 2014-08-20 | 1 | -5/+0 |
| | |/ |/| | |||||
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 2 | -9/+7 |
| |\| | |||||
| | * | progress dialog design fix | Dominik Schürmann | 2014-08-20 | 2 | -9/+7 |
| | | | |||||
| * | | modifyKey: small logging changes | Vincent Breitmoser | 2014-08-20 | 2 | -3/+3 |
| |/ | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-20 | 4 | -91/+115 |
| |\ | |||||
| | * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 7 | -19/+30 |
| | |\ | |||||
| | * | | consolidate: prevent concurrent calls of step 2 | Vincent Breitmoser | 2014-08-20 | 4 | -91/+115 |
| | | | | |||||
| * | | | return some more results | Dominik Schürmann | 2014-08-20 | 6 | -35/+41 |
| | |/ |/| | |||||
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-20 | 8 | -54/+74 |
| |\| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| | * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 15 | -76/+135 |
| | |\ | |||||
| | * | | consolidate: implement (mostly) recovery mode | Vincent Breitmoser | 2014-08-20 | 5 | -49/+67 |
| | | | | |||||
| | * | | consolidate: use KeychainProvider for deletion operation | Vincent Breitmoser | 2014-08-20 | 4 | -5/+7 |
| | | | | |||||
| * | | | Fixes and temporary fixes for returning results | Dominik Schürmann | 2014-08-20 | 7 | -19/+30 |
| | |/ |/| | |||||
| * | | Pull from transifex | Dominik Schürmann | 2014-08-20 | 15 | -76/+135 |
| |/ | |||||
| * | Pull from transifex | Dominik Schürmann | 2014-08-20 | 32 | -338/+1203 |
| | | |||||
| * | Travis is now stable | Dominik Schürmann | 2014-08-20 | 1 | -2/+0 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-20 | 2 | -3/+5 |
| |\ | |||||
| | * | Merge pull request #782 from mar-v-in/issue-781 | Dominik Schürmann | 2014-08-19 | 2 | -3/+5 |
| | |\ | | | | | | | Fix mime types | ||||
| | | * | Fix mime types, #781 | mar-v-in | 2014-08-19 | 2 | -3/+5 |
| | |/ | |||||
| * / | Update keybase lib | Dominik Schürmann | 2014-08-20 | 1 | -0/+0 |
| |/ | |||||
| * | Fix strings | Dominik Schürmann | 2014-08-19 | 3 | -7/+7 |
| | | |||||
| * | consolidate: a lot more log output, better recovery | Vincent Breitmoser | 2014-08-19 | 4 | -35/+108 |
| | | |||||
| * | Start consolidate activity | Dominik Schürmann | 2014-08-19 | 1 | -1/+8 |
| | | |||||
| * | ConsolidateDialogActivity | Dominik Schürmann | 2014-08-19 | 2 | -41/+30 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-19 | 10 | -27/+266 |
| |\ | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |