| Commit message (Expand) | Author | Age | Files | Lines |
* | Resolve crashes on Android 2.3 due to ActionBarCompat conversion | Dominik Schürmann | 2014-02-02 | 11 | -226/+218 |
* | Switch from ActionBarSherlock to ActionBarCompat | Dominik Schürmann | 2014-02-02 | 42 | -424/+154 |
* | update hasPassphrase for subkey only keyrings | Ashley Hughes | 2014-02-02 | 1 | -2/+16 |
* | allow passphrases to be removed | Ashley Hughes | 2014-02-02 | 1 | -2/+4 |
* | Merge branch 'edit-fixes' | Ashley Hughes | 2014-02-02 | 2 | -0/+8 |
|\ |
|
| * | fix select key-signing keys | Ashley Hughes | 2014-02-02 | 2 | -0/+8 |
* | | importing progress dialog language fixed | Dominik Schürmann | 2014-02-01 | 1 | -5/+6 |
* | | importing progress dialog language fixed | Dominik Schürmann | 2014-02-01 | 2 | -2/+1 |
* | | Cleanup | Dominik Schürmann | 2014-02-01 | 3 | -6/+1 |
* | | Update NFC help | Dominik Schürmann | 2014-02-01 | 2 | -3/+3 |
* | | Fix scanning of fingerprint qr code, whole qr code scanning still broken | Dominik Schürmann | 2014-02-01 | 3 | -28/+34 |
|/ |
|
* | Fix QR Code URI | Dominik Schürmann | 2014-02-01 | 2 | -7/+4 |
* | Update from transifex | Dominik Schürmann | 2014-02-01 | 1 | -1/+1 |
* | Reworking import, testing needed... | Dominik Schürmann | 2014-02-01 | 17 | -932/+431 |
* | Fix loader init | Dominik Schürmann | 2014-02-01 | 2 | -25/+42 |
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-02-01 | 1 | -1/+1 |
|\ |
|
| * | fix disable editing for subkey keys | Ashley Hughes | 2014-02-01 | 1 | -1/+1 |
* | | search works | Dominik Schürmann | 2014-02-01 | 12 | -96/+206 |
|/ |
|
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-02-01 | 5 | -89/+60 |
|\ |
|
| * | Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain | Ashley Hughes | 2014-02-01 | 11 | -210/+324 |
| |\ |
|
| * \ | create new keys without lots of extra certification | Ashley Hughes | 2014-02-01 | 5 | -89/+60 |
| |\ \ |
|
| | * | | wrong types being created | Ashley Hughes | 2014-02-01 | 1 | -2/+2 |
| | * | | create keys with minimal keyrings being constructed in between | Ashley Hughes | 2014-01-31 | 3 | -8/+25 |
| | * | | default keys gen | Ashley Hughes | 2014-01-31 | 1 | -12/+8 |
| | * | | generate single key | Ashley Hughes | 2014-01-31 | 2 | -21/+9 |
| | * | | builds, but intents are not called or handled correctly | Ashley Hughes | 2014-01-30 | 1 | -6/+9 |
| | * | | save work | Ashley Hughes | 2014-01-30 | 2 | -44/+12 |
* | | | | rename KeyServerUploadActivity to UploadKeyActivity | Dominik Schürmann | 2014-02-01 | 3 | -4/+4 |
| |_|/
|/| | |
|
* | | | Started working on integration of keyserver query into import activity | Dominik Schürmann | 2014-02-01 | 11 | -210/+324 |
|/ / |
|
* | | save fingerprint on save | Dominik Schürmann | 2014-02-01 | 1 | -0/+2 |
* | | No bouncy castle objects in key view | Dominik Schürmann | 2014-02-01 | 7 | -36/+25 |
* | | Fix layout, add API notes to README, register fingerprint URIs, some reformat... | Dominik Schürmann | 2014-02-01 | 18 | -678/+648 |
* | | Fix display of long user ids in key view | Dominik Schürmann | 2014-01-31 | 1 | -10/+10 |
* | | Allow state loss on dismissal of progress dialogs, fixes #217 | Dominik Schürmann | 2014-01-31 | 2 | -24/+28 |
* | | Fix and simplify user id parsing | Dominik Schürmann | 2014-01-31 | 6 | -55/+51 |
* | | update from transifex | Dominik Schürmann | 2014-01-31 | 19 | -54/+141 |
|/ |
|
* | bouncycastle uses the Date class, based off of UTC. Force all GregorianCalend... | Ashley Hughes | 2014-01-30 | 4 | -27/+15 |
* | binding signatures have the same creation time | Ashley Hughes | 2014-01-30 | 1 | -1/+6 |
* | change key expiry | Ashley Hughes | 2014-01-30 | 2 | -26/+29 |
* | add some changelog items | Dominik Schürmann | 2014-01-29 | 1 | -1/+10 |
* | language fix | Dominik Schürmann | 2014-01-29 | 18 | -22/+21 |
* | Fix transifex config and pull translations | Dominik Schürmann | 2014-01-29 | 20 | -320/+459 |
* | small language changes | Dominik Schürmann | 2014-01-29 | 1 | -2/+2 |
* | show unknown in ViewKey if user id is not set | Dominik Schürmann | 2014-01-29 | 1 | -2/+7 |
* | Give expiry dates to PgpKeyOperation | Dominik Schürmann | 2014-01-29 | 5 | -17/+43 |
* | Use intent data instead of IDs for upload and sign, fixes #205 | Dominik Schürmann | 2014-01-29 | 4 | -40/+43 |
* | save keyring in-place, fixes #228, #203 | Dominik Schürmann | 2014-01-29 | 3 | -198/+232 |
* | small code restructures | Dominik Schürmann | 2014-01-29 | 1 | -5/+5 |
* | show import secret key userID | Ashley Hughes | 2014-01-28 | 1 | -1/+2 |
* | exporting secret keys means exporting public, no need to do so twice | Ashley Hughes | 2014-01-28 | 1 | -25/+22 |