aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add ignore = dirty to submodules configDominik Schürmann2016-02-091-0/+2
* Merge pull request #1715 from open-keychain/bouncyDominik Schürmann2016-02-0992-375/+371
|\
| * Exclude robolectric's transitive bouncycastle dependencyDominik Schürmann2016-02-091-1/+3
| * Remove leftovers from spongycastleDominik Schürmann2016-02-095-10/+5
| * Replace spongycastle with bouncycastleDominik Schürmann2016-02-0989-362/+362
| * Add bouncycastle submoduleDominik Schürmann2016-02-092-0/+3
| * Remove spongycastle submoduleDominik Schürmann2016-02-092-4/+0
|/
* Merge pull request #1713 from open-keychain/unlink-contactDominik Schürmann2016-02-065-8/+36
|\
| * delete linked contacts on turning off contact syncAdithya Abraham Philip2016-02-065-8/+36
|/
* Fix number keypad preferenceDominik Schürmann2016-02-041-1/+1
* import: handle FileNotFoundException (fixes #1688)Vincent Breitmoser2016-02-0117-83/+88
* Merge pull request #1706 from open-keychain/keyserverservice-fixDominik Schürmann2016-01-302-10/+26
|\
| * prevent rare KeyserverSyncAdapterService crashAdithya Abraham Philip2016-01-272-10/+26
|/
* Merge pull request #1683 from eighthave/masterDominik Schürmann2016-01-263-0/+115
|\
| * after receiving panic trigger and locking app, remove from historyHans-Christoph Steiner2016-01-133-0/+56
| * respond to generic panic trigger Intent by clearing passphrasesHans-Christoph Steiner2016-01-132-0/+59
* | Merge pull request #1693 from kbsriram/subkey-revocation-fixVincent2016-01-204-12/+310
|\ \
| * | Always revoke subkeys with a revocation signature.KB Sriram2016-01-154-12/+310
* | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2016-01-204-1/+202
|\| |
| * | 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
| |/ /
* / / No PendingIntent for RESULT_NO_SIGNATURE, RESULT_INVALID_SIGNATUREDominik Schürmann2016-01-201-7/+20
|/ /
* / 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-14 16:03:01 +0000