Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add simple StatusIndicator widget | Vincent Breitmoser | 2015-09-01 | 2 | -0/+55 |
* | linked: Github -> GitHub (fixes #1513) | Vincent Breitmoser | 2015-08-31 | 1 | -9/+9 |
* | linked: fix small typo | Vincent Breitmoser | 2015-08-31 | 1 | -1/+1 |
* | linked: disable DNS resource (for now) | Vincent Breitmoser | 2015-08-31 | 3 | -5/+9 |
* | Show linked identity menu item and linked identities only when feature is ena... | Dominik Schürmann | 2015-08-29 | 3 | -6/+10 |
* | Reword experimental settings | Dominik Schürmann | 2015-08-29 | 3 | -6/+11 |
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2015-08-29 | 4 | -74/+163 |
|\ | |||||
| * | Improve decrypt strings | Dominik Schürmann | 2015-08-28 | 1 | -2/+2 |
| * | Support OpenPGP API v9 | Dominik Schürmann | 2015-08-28 | 1 | -10/+6 |
| * | Cleanup OpenPgpService2 code, update openpgp-api lib | Dominik Schürmann | 2015-08-28 | 1 | -51/+3 |
| * | Merge branch 'master' of https://github.com/mgeier63/open-keychain into mgeie... | Dominik Schürmann | 2015-08-28 | 3 | -63/+204 |
| |\ | |||||
| | * | service side support for https://github.com/open-keychain/openpgp-api/pull/3 | mgeier63 | 2015-08-27 | 3 | -63/+204 |
* | | | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 105 | -89/+6129 |
|\ \ \ | |/ / |/| | | |||||
| * | | yubikey: don't assume signing key is masterKeyId in ViewKeyActivity | Vincent Breitmoser | 2015-05-16 | 2 | -42/+54 |
| * | | fix fragment handling in ViewKeyActivity | Vincent Breitmoser | 2015-05-16 | 1 | -37/+12 |
| * | | linked-ids: remove debug uri | Vincent Breitmoser | 2015-05-16 | 1 | -1/+1 |
| * | | allow linked token without one colon | Vincent Breitmoser | 2015-05-12 | 1 | -3/+2 |
| * | | rename LinkedIdentity to LinkedAttribute | Vincent Breitmoser | 2015-05-12 | 5 | -13/+13 |
| * | | Merge tag 'v3.2.1' into linked-identities | Vincent Breitmoser | 2015-05-11 | 81 | -712/+1142 |
| |\ \ | |||||
| * | | | linked-ids: small compatibility changes | Vincent Breitmoser | 2015-05-11 | 3 | -2/+4 |
| * | | | linked-ids: add certificate pinning, pin twitter api cert | Vincent Breitmoser | 2015-05-09 | 8 | -27/+53 |
| * | | | linked-ids: rename RawLinkedIdentity to UriAttribute | Vincent Breitmoser | 2015-05-09 | 7 | -25/+25 |
| * | | | linked-ids: rename "cookie" to "token" | Vincent Breitmoser | 2015-05-09 | 12 | -43/+43 |
| * | | | linked-ids: code cleanup, handle all lint errors | Vincent Breitmoser | 2015-05-09 | 22 | -324/+295 |
| * | | | check for fingerprint of any subkey (arguable?) | Vincent Breitmoser | 2015-05-06 | 2 | -6/+18 |
| * | | | fix crash when moving focus from EncryptKeyCompletionView with unknown text | Vincent Breitmoser | 2015-04-28 | 1 | -1/+1 |
| * | | | display unknown keys red rather than orange | Vincent Breitmoser | 2015-04-28 | 1 | -1/+1 |
| * | | | fix "select all" in key list multi-select | Vincent Breitmoser | 2015-04-28 | 1 | -1/+1 |
| * | | | small ui niceties | Vincent Breitmoser | 2015-04-27 | 6 | -13/+30 |
| * | | | prevent crashes in EncryptKeyCompletionView | Vincent Breitmoser | 2015-04-27 | 1 | -2/+10 |
| * | | | display creation dates for ambiguous user ids | Vincent Breitmoser | 2015-04-27 | 4 | -17/+44 |
| * | | | add distinct status for messages signed by "your" key | Vincent Breitmoser | 2015-04-27 | 2 | -0/+14 |
| * | | | small changes for performance | Vincent Breitmoser | 2015-04-27 | 1 | -3/+4 |
| * | | | profiling says: caching qrCode bitmaps is a good idea | Vincent Breitmoser | 2015-04-27 | 2 | -19/+43 |
| * | | | show linked ids card only if unfiltered ids are available | Vincent Breitmoser | 2015-04-26 | 1 | -1/+1 |
| * | | | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-04-26 | 3 | -140/+0 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-04-26 | 53 | -226/+1092 |
| |\ \ \ \ | |||||
| * | | | | | update uris and cookie patterns, plus some stylings | Vincent Breitmoser | 2015-04-25 | 11 | -33/+65 |
| * | | | | | change HttpsEditText to generic PrefixEditText | Vincent Breitmoser | 2015-04-25 | 5 | -10/+27 |
| * | | | | | fix encrypt activity layout | Vincent Breitmoser | 2015-04-24 | 2 | -3/+4 |
| * | | | | | revamp decrypt ui | Vincent Breitmoser | 2015-04-24 | 7 | -230/+391 |
| * | | | | | don't show key spinner for a single entry | Vincent Breitmoser | 2015-04-24 | 2 | -1/+10 |
| * | | | | | use CryptoOperationFragment for linked id fragments, and some warning cleanup | Vincent Breitmoser | 2015-04-24 | 6 | -80/+38 |
| * | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-24 | 235 | -4742/+6836 |
| |\ \ \ \ \ | |||||
| * | | | | | | minor ui and wording changes | Vincent Breitmoser | 2015-04-09 | 2 | -8/+20 |
| * | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-09 | 225 | -8050/+10228 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapter | Vincent Breitmoser | 2015-03-30 | 7 | -406/+423 |
| * | | | | | | | even more linked id ui work | Vincent Breitmoser | 2015-03-29 | 8 | -34/+38 |
| * | | | | | | | more (subtle) ui work | Vincent Breitmoser | 2015-03-26 | 4 | -39/+65 |
| * | | | | | | | more linked id ui fine tuning | Vincent Breitmoser | 2015-03-26 | 17 | -0/+2 |