| Commit message (Expand) | Author | Age | Files | Lines |
* | passphrasecache: update defaults, add "forever" setting | Vincent Breitmoser | 2016-01-11 | 1 | -1/+6 |
* | Use more generic 'Security Token' where possible, add sutitle to create key w... | Dominik Schürmann | 2016-01-10 | 1 | -22/+23 |
* | add method to skip caching | Vincent Breitmoser | 2016-01-06 | 1 | -0/+4 |
* | inline-ttl: support "screen off" in preference | Vincent Breitmoser | 2016-01-06 | 1 | -7/+6 |
* | passcache: add support for clear on screen lock (ttl == 0) | Vincent Breitmoser | 2016-01-06 | 1 | -36/+70 |
* | inline-ttl: use ttl preference in ttl spinner | Vincent Breitmoser | 2016-01-06 | 1 | -5/+3 |
* | inline-ttl: create ttl choice customization setting activity | Vincent Breitmoser | 2016-01-06 | 1 | -2/+1 |
* | passphraseactivity: add inline spinner to password dialog | Vincent Breitmoser | 2016-01-06 | 1 | -6/+5 |
* | Follow notification style guidelines, dismiss permission notification on click | Dominik Schürmann | 2015-12-22 | 2 | -14/+9 |
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-12-21 | 2 | -43/+30 |
|\ |
|
| * | fixed key update preference not turning off | Adithya Abraham Philip | 2015-12-21 | 2 | -43/+30 |
* | | Make ContactHelper less static | Dominik Schürmann | 2015-12-21 | 1 | -1/+1 |
|/ |
|
* | added Facebook links support, reworked Preferences | Adithya Abraham Philip | 2015-12-06 | 1 | -1/+1 |
* | Fix strings, thanks to Alain-Olivier | Dominik Schürmann | 2015-11-23 | 2 | -31/+5 |
* | re-enable contact sync by default | Dominik Schürmann | 2015-11-23 | 1 | -6/+2 |
* | Disable contact sync by default on Android >= 6 | Dominik Schürmann | 2015-11-23 | 2 | -4/+32 |
* | Show notification when READ_CONTACTS permission is denied in sync service, hi... | Dominik Schürmann | 2015-11-23 | 1 | -6/+51 |
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-11-04 | 1 | -38/+84 |
|\ |
|
| * | changed KeyserverSyncAdapterService to work with START_REDELIVER_INTENT | Adithya Abraham Philip | 2015-10-31 | 1 | -38/+84 |
* | | bench: add benchmark operation for testing | Vincent Breitmoser | 2015-11-04 | 2 | -0/+57 |
|/ |
|
* | uploadop: clean up, add logging | Vincent Breitmoser | 2015-10-29 | 1 | -0/+1 |
* | Integrate yubikey reset method | Dominik Schürmann | 2015-10-16 | 1 | -1/+6 |
* | Remove default PIN setting | Dominik Schürmann | 2015-10-16 | 1 | -8/+0 |
* | Support backupVersion ASCII Armor header | Dominik Schürmann | 2015-10-15 | 1 | -2/+7 |
* | Cleanup, fix advanced sharing | Dominik Schürmann | 2015-10-15 | 2 | -13/+12 |
* | upload: re-add upload by bytes | Vincent Breitmoser | 2015-09-28 | 1 | -3/+19 |
* | export: support encrypted export, first version | Vincent Breitmoser | 2015-09-28 | 1 | -13/+8 |
* | upload: identify key by masterKeyId only | Vincent Breitmoser | 2015-09-26 | 1 | -6/+5 |
* | export: externalize upload into its own operation | Vincent Breitmoser | 2015-09-26 | 3 | -19/+67 |
* | remove "export to file" code path from export operation | Vincent Breitmoser | 2015-09-26 | 1 | -8/+0 |
* | preliminary working mime parsing in DecryptListFragment! (beware WIP, here be... | Vincent Breitmoser | 2015-09-16 | 1 | -0/+1 |
* | mime: create more general InputDataOperation, which for now and does basic mi... | Vincent Breitmoser | 2015-09-15 | 2 | -36/+34 |
* | Merge branch 'master' into mime4j | Vincent Breitmoser | 2015-09-14 | 5 | -18/+528 |
|\ |
|
| * | Fixes open-keychain/open-keychain#1515 | Kaladin Light | 2015-09-03 | 2 | -3/+3 |
| * | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 1 | -10/+6 |
| |\ |
|
| | * | Merge tag 'v3.2.1' into linked-identities | Vincent Breitmoser | 2015-05-11 | 1 | -11/+8 |
| | |\ |
|
| | * \ | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-24 | 7 | -88/+475 |
| | |\ \ |
|
| | * \ \ | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-09 | 4 | -23/+416 |
| | |\ \ \ |
|
| | * \ \ \ | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-24 | 4 | -31/+36 |
| | |\ \ \ \ |
|
| | * \ \ \ \ | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-15 | 2 | -48/+80 |
| | |\ \ \ \ \ |
|
| | * | | | | | | return key ids from PassphraseDialogActivity, accept null userids | Vincent Breitmoser | 2015-03-08 | 1 | -2/+2 |
| | * | | | | | | minor changes, add convertFingerprintToKeyId method | Vincent Breitmoser | 2015-03-08 | 1 | -10/+5 |
| | * | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-08 | 1 | -3/+11 |
| | |\ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ | NON-WORKING Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-02 | 6 | -306/+384 |
| | |\ \ \ \ \ \ \ |
|
| | * | | | | | | | | affirmation -> linked identity | Vincent Breitmoser | 2015-01-15 | 2 | -2/+0 |
| | * | | | | | | | | support addition of user attributes | Vincent Breitmoser | 2015-01-12 | 1 | -5/+6 |
| | * | | | | | | | | work on affirmations (begin rename to LinkedIdentity | Vincent Breitmoser | 2015-01-12 | 1 | -1/+6 |
| | * | | | | | | | | even more intermediate result | Vincent Breitmoser | 2015-01-12 | 1 | -0/+2 |
| * | | | | | | | | | Remove dead code | Dominik Schürmann | 2015-08-27 | 1 | -2/+2 |
| * | | | | | | | | | introduced constants for keyserver sync, fixed sync issue | Adithya Abraham Philip | 2015-08-20 | 2 | -30/+54 |