| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-31 | 21 | -127/+259 | |
| |\ | ||||||
| | * | add cancel prevention mechanism, improve cancellation for key import | Vincent Breitmoser | 2014-08-31 | 5 | -21/+67 | |
| | | | ||||||
| | * | don't make our service sticky | Vincent Breitmoser | 2014-08-31 | 1 | -1/+1 | |
| | | | ||||||
| | * | add cancel support to edit key action | Vincent Breitmoser | 2014-08-31 | 13 | -33/+92 | |
| | | | ||||||
| | * | get rid of some last bootstrapbutton references | Vincent Breitmoser | 2014-08-31 | 2 | -3/+1 | |
| | | | ||||||
| | * | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-08-31 | 2 | -8/+15 | |
| | |\ | ||||||
| | * | | Add cancelable mechanism and support in key import | Vincent Breitmoser | 2014-08-31 | 9 | -90/+119 | |
| | | | | | | | | | | | | | Closes #323 | |||||
| * | | | Better leyout for account settings | Dominik Schürmann | 2014-08-31 | 6 | -94/+112 | |
| | | | | ||||||
| * | | | Move date picker to left because of width constraints inside the dialog | Dominik Schürmann | 2014-08-31 | 1 | -6/+1 | |
| | |/ |/| | ||||||
| * | | Hide keyserver spinner under advanced options in certify activity | Dominik Schürmann | 2014-08-31 | 2 | -8/+15 | |
| |/ | ||||||
| * | remember "show advanced tabs" setting | Vincent Breitmoser | 2014-08-31 | 3 | -4/+18 | |
| | | | | | Closes #669 | |||||
| * | if there is only one private key, use it fo certification by default | Vincent Breitmoser | 2014-08-31 | 4 | -28/+37 | |
| | | ||||||
| * | use LoaderFragment for CertifyActivity | Vincent Breitmoser | 2014-08-31 | 7 | -554/+630 | |
| | | ||||||
| * | ditch NullProgressable | Vincent Breitmoser | 2014-08-30 | 4 | -40/+8 | |
| | | ||||||
| * | fix one log level | Vincent Breitmoser | 2014-08-30 | 1 | -1/+1 | |
| | | ||||||
| * | get rid of a deprecated method use | Vincent Breitmoser | 2014-08-30 | 1 | -1/+2 | |
| | | ||||||
| * | Merge remote-tracking branch 'dakid/master' | Vincent Breitmoser | 2014-08-30 | 1 | -1/+1 | |
| |\ | ||||||
| | * | Encrypted message is not being spellchecked anymore | Daniel Albert | 2014-08-30 | 1 | -1/+1 | |
| | | | ||||||
| * | | canonicalize: add check for algorithm type | Vincent Breitmoser | 2014-08-30 | 8 | -16/+50 | |
| |/ | | | | closes #797 | |||||
| * | show bitsizes in import key list again | Vincent Breitmoser | 2014-08-30 | 1 | -4/+4 | |
| | | | | | closes #802 | |||||
| * | Update TokenAutoComplete | Dominik Schürmann | 2014-08-29 | 1 | -0/+0 | |
| | | ||||||
| * | Fix possible nullpointer in Preferences | Dominik Schürmann | 2014-08-29 | 1 | -0/+3 | |
| | | ||||||
| * | Mardown compatible changelog | Dominik Schürmann | 2014-08-28 | 1 | -189/+189 | |
| | | ||||||
| * | Fix crash in PgpKeyHelper | Dominik Schürmann | 2014-08-28 | 1 | -1/+1 | |
| | | ||||||
| * | Update nfc lib | Dominik Schürmann | 2014-08-28 | 1 | -0/+0 | |
| | | ||||||
| * | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-28 | 171 | -2095/+9423 | |
| |\ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | |||||
| | * | Merge pull request #796 from open-keychain/develop | Dominik Schürmann | 2014-08-28 | 29 | -216/+531 | |
| | |\ | | | | | | | ECC support | |||||
| | | * | add ecc support | Vincent Breitmoser | 2014-08-24 | 26 | -191/+524 | |
| | | | | ||||||
| | | * | update to tidy spongy-master | Vincent Breitmoser | 2014-08-23 | 1 | -0/+0 | |
| | | | | ||||||
| | | * | Add ECDH and ECDSA values | Dominik Schürmann | 2014-08-21 | 2 | -0/+6 | |
| | | | | ||||||
| | | * | Fixing build with Spongy Castle 1.51 | Dominik Schürmann | 2014-08-21 | 3 | -30/+5 | |
| | | | | ||||||
| | | * | Update spongy castle, not building... | Dominik Schürmann | 2014-08-21 | 1 | -0/+0 | |
| | | | | ||||||
| | * | | Fix NullPointerException in ImportKeysActivity | Dominik Schürmann | 2014-08-28 | 1 | -1/+3 | |
| | | | | ||||||
| | * | | Fix RuntimeException in KeyListActivity on tablets | Dominik Schürmann | 2014-08-28 | 6 | -53/+47 | |
| | | | | ||||||
| | * | | Travis should use gradle wrapper script | Dominik Schürmann | 2014-08-28 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | v2.8 | Dominik Schürmann | 2014-08-27 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-27 | 8 | -23/+25 | |
| | |\ \ | ||||||
| | | * | | small language fixes for previous commit | Vincent Breitmoser | 2014-08-27 | 8 | -24/+25 | |
| | | | | | ||||||
| | * | | | Strip out duplicate user ids | Dominik Schürmann | 2014-08-27 | 7 | -8/+20 | |
| | |/ / | ||||||
| | * | | Abort import of pubkeys where secret keys exist but new pubkey has more ↵ | Dominik Schürmann | 2014-08-27 | 3 | -9/+34 | |
| | | | | | | | | | | | | | subkeys, fix #696 | |||||
| | * | | Cleanup FoldableLinearLayout | Dominik Schürmann | 2014-08-27 | 5 | -18/+9 | |
| | | | | ||||||
| | * | | Function graphic | Dominik Schürmann | 2014-08-26 | 2 | -0/+4042 | |
| | | | | ||||||
| | * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-23 | 1 | -0/+1 | |
| | |\ \ | ||||||
| | | * | | tests: fix non-deterministic testMasterModify | Vincent Breitmoser | 2014-08-23 | 1 | -0/+1 | |
| | | | | | ||||||
| | * | | | API: Fix re-seletion of keys on default account | Dominik Schürmann | 2014-08-23 | 2 | -9/+16 | |
| | |/ / | ||||||
| | * | | Pull from transifex | Dominik Schürmann | 2014-08-22 | 19 | -13/+100 | |
| | | | | ||||||
| | * | | 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 | |
| | |/ | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |