Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | linked: work on github design | Vincent Breitmoser | 2015-09-01 | 2 | -12/+56 |
* | linked: redesign github resource creation, implement ouath flow (WIP) | Vincent Breitmoser | 2015-09-01 | 4 | -9/+316 |
* | add simple StatusIndicator widget | Vincent Breitmoser | 2015-09-01 | 1 | -0/+25 |
* | linked: disable DNS resource (for now) | Vincent Breitmoser | 2015-08-31 | 2 | -4/+6 |
* | Show linked identity menu item and linked identities only when feature is ena... | Dominik Schürmann | 2015-08-29 | 2 | -5/+9 |
* | Reword experimental settings | Dominik Schürmann | 2015-08-29 | 1 | -2/+4 |
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2015-08-29 | 2 | -70/+145 |
|\ | |||||
| * | 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 | 2 | -61/+188 |
| |\ | |||||
| | * | service side support for https://github.com/open-keychain/openpgp-api/pull/3 | mgeier63 | 2015-08-27 | 2 | -61/+188 |
* | | | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 51 | -75/+4152 |
|\ \ \ | |/ / |/| | | |||||
| * | | 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 | 40 | -384/+692 |
| |\ \ | |||||
| * | | | linked-ids: small compatibility changes | Vincent Breitmoser | 2015-05-11 | 2 | -2/+3 |
| * | | | 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 | 11 | -37/+37 |
| * | | | 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 | 4 | -7/+24 |
| * | | | prevent crashes in EncryptKeyCompletionView | Vincent Breitmoser | 2015-04-27 | 1 | -2/+10 |
| * | | | display creation dates for ambiguous user ids | Vincent Breitmoser | 2015-04-27 | 2 | -14/+29 |
| * | | | add distinct status for messages signed by "your" key | Vincent Breitmoser | 2015-04-27 | 1 | -0/+13 |
| * | | | 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 | 27 | -183/+802 |
| |\ \ \ | |||||
| * | | | | update uris and cookie patterns, plus some stylings | Vincent Breitmoser | 2015-04-25 | 7 | -17/+53 |
| * | | | | change HttpsEditText to generic PrefixEditText | Vincent Breitmoser | 2015-04-25 | 2 | -6/+13 |
| * | | | | fix encrypt activity layout | Vincent Breitmoser | 2015-04-24 | 1 | -2/+1 |
| * | | | | revamp decrypt ui | Vincent Breitmoser | 2015-04-24 | 3 | -149/+347 |
| * | | | | 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 | 4 | -76/+30 |
| * | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-24 | 99 | -3465/+4785 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-09 | 33 | -182/+864 |
| |\ \ \ \ \ | |||||
| * | | | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapter | Vincent Breitmoser | 2015-03-30 | 4 | -393/+400 |
| * | | | | | | even more linked id ui work | Vincent Breitmoser | 2015-03-29 | 5 | -28/+29 |
| * | | | | | | more (subtle) ui work | Vincent Breitmoser | 2015-03-26 | 2 | -9/+38 |
| * | | | | | | more linked id ui fine tuning | Vincent Breitmoser | 2015-03-26 | 1 | -0/+2 |
| * | | | | | | some linked id ui fine tuning | Vincent Breitmoser | 2015-03-26 | 5 | -27/+34 |
| * | | | | | | secret/public distinction in LinkedIdView | Vincent Breitmoser | 2015-03-24 | 6 | -25/+18 |
| * | | | | | | work on cookie scanning during creation | Vincent Breitmoser | 2015-03-24 | 11 | -153/+150 |
| * | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-24 | 84 | -1005/+1533 |
| |\ \ \ \ \ \ |