| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | v2.8 beta4 | Dominik Schürmann | 2014-08-22 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | Fix contact sync | Dominik Schürmann | 2014-08-22 | 1 | -5/+5 | |
| | | | | ||||||
| | * | | Revert "No need for setSyncAutomatically, this is only for network tickles" | Dominik Schürmann | 2014-08-22 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0c1e65bc8bbfed59d299e2f0ca7a6a30eef22664. Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java | |||||
| | * | | Add info about device with intent chooser bug | Dominik Schürmann | 2014-08-21 | 1 | -1/+1 | |
| | |/ | ||||||
| | * | 2.8 beta3 | Dominik Schürmann | 2014-08-21 | 1 | -2/+2 | |
| | | | ||||||
| | * | Disable custom intent chooser | Dominik Schürmann | 2014-08-21 | 1 | -53/+54 | |
| | | | ||||||
| | * | 2.8 beta2 | Dominik Schürmann | 2014-08-21 | 1 | -2/+2 | |
| | | | ||||||
| | * | Fix nullpointer when revoking keys | Dominik Schürmann | 2014-08-21 | 1 | -1/+2 | |
| | | | ||||||
| | * | Add account only on jelly bean and above | Dominik Schürmann | 2014-08-21 | 2 | -8/+15 | |
| | | | ||||||
| | * | No need for setSyncAutomatically, this is only for network tickles | Dominik Schürmann | 2014-08-21 | 1 | -3/+5 | |
| | | | ||||||
| | * | Add sync properties | Dominik Schürmann | 2014-08-21 | 2 | -2/+7 | |
| | | | ||||||
| | * | Change account type | Dominik Schürmann | 2014-08-21 | 6 | -9/+12 | |
| | | | ||||||
| | * | XML cleanup | Dominik Schürmann | 2014-08-21 | 7 | -79/+11 | |
| | | | ||||||
| | * | v2.8 beta1 | Dominik Schürmann | 2014-08-21 | 1 | -2/+2 | |
| | | | ||||||
| | * | Pull from transifex | Dominik Schürmann | 2014-08-21 | 6 | -42/+22 | |
| | | | ||||||
| | * | 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 | 5 | -41/+70 | |
| | |\ | ||||||
| | | * | 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 | 3 | -2/+8 | |
| | | | | | ||||||
| | | * | | 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 | 31 | -2/+31 | |
| | | |/ | |/| | ||||||
| | * | | 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 | |
| | | |\ | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |