Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Create key: upload | Dominik Schürmann | 2014-07-30 | 1 | -13/+20 | |
| * | return values for create key | Dominik Schürmann | 2014-07-30 | 3 | -8/+22 | |
| * | Fix conflicts | Dominik Schürmann | 2014-07-30 | 1 | -1/+2 | |
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-30 | 28 | -948/+299 | |
| |\ | ||||||
| | * | fix a couple remaining AppMsgs | Vincent Breitmoser | 2014-07-29 | 2 | -10/+7 | |
| | * | Merge branch 'ditch-appmsg' | Vincent Breitmoser | 2014-07-29 | 22 | -920/+276 | |
| | |\ | ||||||
| | | * | introduce EditKeyResult with transient UncachedKeyRing (half-baked!) | Vincent Breitmoser | 2014-07-27 | 7 | -45/+93 | |
| | | * | some more work on supertoast and result parcel stuff | Vincent Breitmoser | 2014-07-27 | 10 | -53/+66 | |
| | | * | Merge branch 'master' into ditch-appmsg | Vincent Breitmoser | 2014-07-26 | 41 | -1050/+1505 | |
| | | |\ | ||||||
| | | * | | use SuperToast instead of AppMsg in code, part 2 | Vincent Breitmoser | 2014-07-07 | 2 | -3/+64 | |
| | | * | | use SuperToast instead of AppMsg in code, part 1 | Vincent Breitmoser | 2014-07-07 | 13 | -106/+75 | |
| | | * | | get rid of AppMsg library | Vincent Breitmoser | 2014-07-07 | 1 | -744/+0 | |
| | * | | | watch out for nullpointers from get(Un|)HashedSubpackets | Vincent Breitmoser | 2014-07-28 | 3 | -10/+19 | |
| * | | | | Create key with fragments | Dominik Schürmann | 2014-07-30 | 5 | -217/+472 | |
| |/ / / | ||||||
| * | | | Use new icons in other key related activites, delete old icons | Dominik Schürmann | 2014-07-28 | 4 | -23/+49 | |
| * | | | Use verified icon for certify action | Dominik Schürmann | 2014-07-28 | 1 | -2/+12 | |
| * | | | Set visibility at last | Dominik Schürmann | 2014-07-28 | 2 | -6/+6 | |
| * | | | Use icons in key view | Dominik Schürmann | 2014-07-28 | 2 | -22/+39 | |
| * | | | Use new status icons in key list | Dominik Schürmann | 2014-07-28 | 1 | -20/+23 | |
| * | | | Smaller status images, green test | Dominik Schürmann | 2014-07-28 | 1 | -1/+1 | |
| * | | | Fix resource names, add small test | Dominik Schürmann | 2014-07-28 | 1 | -5/+10 | |
| * | | | cleanup left-overs | Dominik Schürmann | 2014-07-27 | 1 | -2/+0 | |
| * | | | Redesigned QR Code view | Dominik Schürmann | 2014-07-27 | 3 | -115/+119 | |
| * | | | Load QR Code asynchronously and with a fade in animation | Dominik Schürmann | 2014-07-27 | 1 | -5/+41 | |
| * | | | Open keyboard on passphrase dialog, this should now work on all Android versi... | Dominik Schürmann | 2014-07-27 | 2 | -27/+92 | |
| * | | | Make PassphraseCacheService a foreground service | Dominik Schürmann | 2014-07-27 | 1 | -72/+67 | |
| * | | | Prettify buttons | Dominik Schürmann | 2014-07-27 | 1 | -7/+6 | |
| * | | | Work on first time wizard design | Dominik Schürmann | 2014-07-27 | 5 | -22/+90 | |
| | |/ | |/| | ||||||
| * | | canonicalize: couple of fixes | Vincent Breitmoser | 2014-07-26 | 2 | -18/+30 | |
| * | | generic UncachedKeyRing fixes | Vincent Breitmoser | 2014-07-26 | 1 | -25/+24 | |
| * | | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-07-26 | 4 | -43/+48 | |
| |\ \ | ||||||
| | * | | Program flow fixes | Dominik Schürmann | 2014-07-25 | 4 | -43/+48 | |
| * | | | UncachedKeyRing.merge: copy over new secret subkeys into secret keyrings | Vincent Breitmoser | 2014-07-26 | 1 | -12/+9 | |
| * | | | fixes for extractPublicKeyRing, update SpongyCastle | Vincent Breitmoser | 2014-07-26 | 2 | -15/+18 | |
| * | | | test and fix: adding an empty user id should fail | Vincent Breitmoser | 2014-07-26 | 2 | -0/+6 | |
| |/ / | ||||||
* | | | Remove support for V3 signatures | Dominik Schürmann | 2014-07-22 | 7 | -152/+14 | |
* | | | Cleanup | Dominik Schürmann | 2014-07-22 | 1 | -12/+7 | |
* | | | Reuse signature creation timestamp for synchronous signing | Dominik Schürmann | 2014-07-22 | 3 | -33/+44 | |
* | | | Fix test | Dominik Schürmann | 2014-07-21 | 1 | -2/+1 | |
* | | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-07-21 | 4 | -5/+9 | |
|\| | | ||||||
| * | | canonicalize: fix for tests | Vincent Breitmoser | 2014-07-19 | 4 | -5/+9 | |
* | | | NFC Yubikey: only pass through hash of message and not whole content | Dominik Schürmann | 2014-07-21 | 5 | -53/+119 | |
* | | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-07-18 | 4 | -1/+34 | |
|\| | | ||||||
| * | | Merge remote-tracking branch 'upstream/master' | Daniel Albert | 2014-07-16 | 36 | -906/+728 | |
| |\ \ | ||||||
| * | | | Final Commit for #662 | Daniel Albert | 2014-07-16 | 1 | -1/+6 | |
| * | | | Merge remote-tracking branch 'upstream/master' into feature-conceal-software | Daniel Albert | 2014-07-13 | 3 | -8/+223 | |
| |\ \ \ | ||||||
| * | | | | Added Preference for concealing the PgpApplication | Daniel Albert | 2014-07-12 | 3 | -0/+28 | |
* | | | | | Fixes | Dominik Schürmann | 2014-07-17 | 6 | -24/+132 | |
| |_|/ / |/| | | | ||||||
* | | | | Temporary program flow fixes | Dominik Schürmann | 2014-07-16 | 1 | -0/+3 | |
* | | | | Simple create key | Dominik Schürmann | 2014-07-16 | 1 | -1/+0 |