aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Always revoke subkeys with a revocation signature.KB Sriram2016-01-154-12/+310
* Merge pull request #1686 from fidesmo/feature-handle-not-installed-nfc-appletVincent2016-01-154-1/+202
|\
| * Handle not installed PGP appletTheo Franzén2016-01-154-1/+202
|/
* Lowercase ttl stringsDominik Schürmann2016-01-141-7/+7
* forgot to commit a file to previous commit (thanks travis)Vincent Breitmoser2016-01-131-0/+10
* add debug option to use dummy backup code (fixes #1675)Vincent Breitmoser2016-01-131-1/+51
* Merge pull request #1614 from fidesmo/feature-introduce-nfc-handling-via-nordpolDominik Schürmann2016-01-133-61/+34
|\
| * Use new version of Nordpol from jcenterPetter Arvidsson2016-01-123-6/+5
| * Use Nordpol for BaseNfcActivityPetter Arvidsson2016-01-124-61/+35
* | Version 3.8.2Dominik Schürmann2016-01-131-2/+2
* | Pull from transifexDominik Schürmann2016-01-1334-44/+318
* | fix symmetric decryption with backup code (fixes #1677)Vincent Breitmoser2016-01-131-5/+6
|/
* Version 3.8.1Dominik Schürmann2016-01-121-2/+2
* fix symmetric decryption (fixes #1672)Vincent Breitmoser2016-01-121-2/+2
* Add facebook key import to changelogDominik Schürmann2016-01-121-0/+1
* Version 3.8Dominik Schürmann2016-01-111-2/+2
* Pull from transifexDominik Schürmann2016-01-1125-0/+300
* Fix singleTop definitionsDominik Schürmann2016-01-112-25/+9
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2016-01-111-2/+15
|\
| * Merge pull request #1666 from open-keychain/file-import-fixDominik Schürmann2016-01-111-2/+15
| |\
| | * fixed file import issue due to onResumeFragmentsAdithya Abraham Philip2016-01-091-2/+15
* | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2016-01-114-5/+13
|\| |
| * | passphrasecache: update defaults, add "forever" settingVincent Breitmoser2016-01-114-5/+13
* | | Changelog 3.8Dominik Schürmann2016-01-111-0/+12
|/ /
* | update build instructions in readmeVincent Breitmoser2016-01-111-4/+4
* | keycreate: animate layout when revert button is pushedVincent Breitmoser2016-01-111-1/+2
* | keycreate: add button to revert to default key configurationVincent Breitmoser2016-01-112-42/+116
* | advstart: simplify layout, and give the icon some spaceVincent Breitmoser2016-01-111-11/+10
* | Remove old screenshots, move api demo screenshotsDominik Schürmann2016-01-118-0/+0
* | Pull from transifexDominik Schürmann2016-01-1169-714/+2063
* | Move edit key configuration to menuDominik Schürmann2016-01-114-70/+53
* | Error out when editing a stripped keyDominik Schürmann2016-01-111-1/+6
* | Add transifex advanced resourceDominik Schürmann2016-01-111-0/+5
* | Advanced screen, warning fragmentDominik Schürmann2016-01-1172-17/+121
* | Use tor icon for settings screenDominik Schürmann2016-01-1168-1/+14
* | Use more generic 'Security Token' where possible, add sutitle to create key w...Dominik Schürmann2016-01-1057-727/+753
|/
* Merge pull request #1597 from open-keychain/inline-ttlDominik Schürmann2016-01-0622-257/+756
|\
| * inline-ttl: remove "default" settingVincent Breitmoser2016-01-066-126/+7
| * add method to skip cachingVincent Breitmoser2016-01-065-93/+70
| * inline-ttl: some layout fine tuningVincent Breitmoser2016-01-062-1/+3
| * some code cleanup in PreferencesVincent Breitmoser2016-01-061-10/+16
| * inline-ttl: support "screen off" in preferenceVincent Breitmoser2016-01-064-14/+17
| * passcache: add support for clear on screen lock (ttl == 0)Vincent Breitmoser2016-01-061-36/+70
| * inline-ttl: use ttl preference in ttl spinnerVincent Breitmoser2016-01-063-32/+25
| * inline-ttl: save changes in ttl settingsVincent Breitmoser2016-01-062-25/+60
| * inline-ttl: create ttl choice customization setting activityVincent Breitmoser2016-01-0614-73/+541
| * passdialog: seconds field and some minor layout issuesVincent Breitmoser2016-01-063-3/+4
| * passphraseactivity: add inline spinner to password dialogVincent Breitmoser2016-01-066-29/+130
| * passdialog: switch to ViewAnimatorVincent Breitmoser2016-01-052-16/+14
|/
* (fix accidental use of api level 23 method)Vincent Breitmoser2016-01-051-5/+10