| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge tag 'v3.2.1' into linked-identities | Vincent Breitmoser | 2015-05-11 | 4 | -39/+34 |
|\ |
|
| * | Cleanup | Dominik Schürmann | 2015-05-10 | 1 | -21/+0 |
| * | Fixes and clarifications to app signature (or better certificate) pinning | Dominik Schürmann | 2015-05-10 | 3 | -7/+6 |
| * | use TemporaryStorageProvider for Bluetooth Share | William Faulk | 2015-05-04 | 1 | -3/+6 |
| * | Apply patch from https://github.com/open-keychain/open-keychain/issues/1240 w... | Dominik Schürmann | 2015-05-04 | 1 | -8/+22 |
* | | linked-ids: rename RawLinkedIdentity to UriAttribute | Vincent Breitmoser | 2015-05-09 | 1 | -1/+1 |
* | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-15 | 3 | -50/+69 |
|\| |
|
| * | Query for duplicate user ids | Dominik Schürmann | 2015-03-15 | 2 | -1/+10 |
| * | change user_id primary key in database, use keyring rather than unified query... | Vincent Breitmoser | 2015-03-11 | 2 | -14/+17 |
| * | API 7 | Dominik Schürmann | 2015-03-10 | 1 | -49/+59 |
* | | remove notiion of nonce/identifier | Vincent Breitmoser | 2015-03-13 | 1 | -1/+3 |
* | | add linked id certs uri to KeychainProvider | Vincent Breitmoser | 2015-03-09 | 2 | -7/+15 |
* | | use loader in LinkedIdViewFragment | Vincent Breitmoser | 2015-03-09 | 2 | -1/+16 |
* | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-08 | 2 | -3/+2 |
|\| |
|
| * | Remove advanced preferences, move compression as menu item in encrypt activit... | Dominik Schürmann | 2015-03-05 | 1 | -2/+1 |
| * | Debug options | Dominik Schürmann | 2015-03-05 | 1 | -1/+1 |
* | | work on LinkedIdViewFragment | Vincent Breitmoser | 2015-03-05 | 1 | -6/+0 |
* | | do a TON of UI work | Vincent Breitmoser | 2015-03-05 | 3 | -20/+30 |
* | | work more on separation of linked identities and resources, initial ui work | Vincent Breitmoser | 2015-03-04 | 1 | -0/+5 |
* | | NON-WORKING Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-02 | 4 | -49/+185 |
|\| |
|
| * | save revocation instead of self-cert for revoked uids | Vincent Breitmoser | 2015-02-26 | 1 | -12/+19 |
| * | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 3 | -14/+14 |
| * | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-01-31 | 4 | -8/+127 |
| |\ |
|
| | * | Rename app setting classes for consistency | Dominik Schürmann | 2015-01-30 | 1 | -1/+0 |
| | * | Fix saving of allowed keys | Dominik Schürmann | 2015-01-30 | 1 | -11/+5 |
| | * | Merge branch 'ligi/fix/add_ability_to_compile_with_java8' of https://github.c... | Dominik Schürmann | 2015-01-30 | 1 | -1/+1 |
| | |\ |
|
| | | * | Add explicit casting to be able to compile with java8 | ligi | 2015-01-29 | 1 | -1/+1 |
| | * | | Saving of allowed keys | Dominik Schürmann | 2015-01-29 | 4 | -10/+70 |
| | * | | Introduce allowed keys table per API client | Dominik Schürmann | 2015-01-29 | 3 | -4/+70 |
| | |/ |
|
| * / | prevent recursive consolidate | Vincent Breitmoser | 2015-01-31 | 1 | -4/+8 |
| |/ |
|
| * | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 2 | -20/+20 |
| * | always show revoked user ids last! | Vincent Breitmoser | 2015-01-19 | 1 | -4/+4 |
| * | actually import user attributes (though they are not shown anywhere yet) | Vincent Breitmoser | 2015-01-14 | 2 | -12/+121 |
| * | make user_ids table typed, with attribute_data support | Vincent Breitmoser | 2015-01-14 | 4 | -62/+94 |
* | | actually import user attributes (though they are not shown anywhere yet) | Vincent Breitmoser | 2015-01-14 | 2 | -12/+121 |
* | | make user_ids table typed, with attribute_data support | Vincent Breitmoser | 2015-01-13 | 4 | -62/+94 |
|/ |
|
* | minor stuff | Vincent Breitmoser | 2015-01-03 | 2 | -0/+2 |
* | throw exception if no data is found in getGenericData | Vincent Breitmoser | 2015-01-02 | 1 | -0/+3 |
* | add PIN as a SecretKeyType | Vincent Breitmoser | 2014-12-30 | 1 | -0/+5 |
* | Changelog 3.1.1 | Dominik Schürmann | 2014-10-30 | 1 | -1/+1 |
* | Always use INTEGER instead of BOOLEAN in database to avoid confusion | Dominik Schürmann | 2014-10-29 | 1 | -12/+10 |
* | fix consolidate if no secret key are present | Vincent Breitmoser | 2014-10-26 | 1 | -2/+6 |
* | prevent cancel dring consolidate, move logic into progressable | Vincent Breitmoser | 2014-10-26 | 1 | -0/+3 |
* | Retry canonicalization with pubkey self certs if first attempt failed | Vincent Breitmoser | 2014-10-26 | 1 | -4/+16 |
* | change the way merging is logged | Vincent Breitmoser | 2014-10-25 | 1 | -0/+4 |
* | integrate download from keyserver into key import operation | Vincent Breitmoser | 2014-10-23 | 1 | -6/+6 |
* | fix logging in consolidate, part 2 | Vincent Breitmoser | 2014-10-11 | 1 | -11/+14 |
* | fix logging in consolidate, part 1 | Vincent Breitmoser | 2014-10-11 | 1 | -43/+47 |
* | move around package structure a bit | Vincent Breitmoser | 2014-10-10 | 1 | -5/+5 |
* | move operations into ops package, introduce BaseOperation class | Vincent Breitmoser | 2014-10-10 | 1 | -3/+3 |