Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Handle result in create key | Dominik Schürmann | 2014-07-31 | 1 | -2/+7 |
* | Keyserver exception translateable | Dominik Schürmann | 2014-07-31 | 1 | -2/+4 |
* | reduce memory usage while parsing multiple keyrings from a stream | Vincent Breitmoser | 2014-07-31 | 1 | -4/+6 |
* | couple of logging fixes | Vincent Breitmoser | 2014-07-31 | 1 | -2/+0 |
* | rename Wrapped*Key* to Canonicalized*Key* | Vincent Breitmoser | 2014-07-31 | 4 | -18/+19 |
* | Better exception handling for import of keys | Dominik Schürmann | 2014-07-31 | 2 | -36/+16 |
* | More file association hacks for AndroidManifest and key import | Dominik Schürmann | 2014-07-31 | 2 | -14/+24 |
* | Create key: work on upload | Dominik Schürmann | 2014-07-30 | 4 | -10/+14 |
* | Create key: repeat passphrase | Dominik Schürmann | 2014-07-30 | 2 | -7/+32 |
* | Create key: upload | Dominik Schürmann | 2014-07-30 | 1 | -13/+20 |
* | return values for create key | Dominik Schürmann | 2014-07-30 | 2 | -4/+20 |
* | 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 | 18 | -873/+92 |
|\ | |||||
| * | fix a couple remaining AppMsgs | Vincent Breitmoser | 2014-07-29 | 2 | -10/+7 |
| * | Merge branch 'ditch-appmsg' | Vincent Breitmoser | 2014-07-29 | 14 | -850/+84 |
| |\ | |||||
| | * | introduce EditKeyResult with transient UncachedKeyRing (half-baked!) | Vincent Breitmoser | 2014-07-27 | 3 | -10/+6 |
| | * | some more work on supertoast and result parcel stuff | Vincent Breitmoser | 2014-07-27 | 5 | -15/+18 |
| | * | Merge branch 'master' into ditch-appmsg | Vincent Breitmoser | 2014-07-26 | 14 | -602/+813 |
| | |\ | |||||
| | * | | use SuperToast instead of AppMsg in code, part 1 | Vincent Breitmoser | 2014-07-07 | 11 | -101/+71 |
| | * | | get rid of AppMsg library | Vincent Breitmoser | 2014-07-07 | 1 | -744/+0 |
* | | | | Create key with fragments | Dominik Schürmann | 2014-07-30 | 4 | -212/+464 |
|/ / / | |||||
* | | | 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 |
* | | | 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 |
| |/ |/| | |||||
* | | Program flow fixes | Dominik Schürmann | 2014-07-25 | 3 | -42/+47 |
* | | Merge remote-tracking branch 'upstream/master' | Daniel Albert | 2014-07-16 | 11 | -550/+317 |
|\ \ | |||||
| * | | 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 |
| * | | Simple create key | Dominik Schürmann | 2014-07-16 | 2 | -46/+57 |
| * | | New first time screen | Dominik Schürmann | 2014-07-16 | 4 | -474/+230 |
| * | | Fallback if no primary user id exists | Dominik Schürmann | 2014-07-16 | 2 | -4/+4 |
| * | | move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId) | Vincent Breitmoser | 2014-07-15 | 2 | -4/+4 |
| * | | some fixes for edit | Dominik Schürmann | 2014-07-15 | 1 | -3/+4 |
| * | | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-15 | 3 | -10/+234 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-11 | 4 | -53/+247 |
| |\ \ \ | |||||
| * | | | | SaveKeyringParcel: follow attribute m prefix coding guideline | Vincent Breitmoser | 2014-07-11 | 5 | -24/+21 |
* | | | | | Merge remote-tracking branch 'upstream/master' into feature-conceal-software | Daniel Albert | 2014-07-13 | 2 | -7/+222 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-12 | 1 | -3/+12 |
| |\ \ \ \ | |||||
| * | | | | | more work on edit key | Dominik Schürmann | 2014-07-12 | 2 | -7/+222 |
| | |_|/ / | |/| | | | |||||
* | | | | | Added Preference for concealing the PgpApplication | Daniel Albert | 2014-07-12 | 1 | -0/+17 |
| |/ / / |/| | | |