aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix unit tests for ChangeUnlockParcelVincent Breitmoser2014-12-306-16/+24
|
* Revert "Remove restriction for max parallel forks for gradle tests"Vincent Breitmoser2014-12-301-1/+1
| | | | | | | This reverts commit ce34192dbbff388c0ccd384fba15cd95075a14ca. Conflicts: build.gradle
* introduce handling of notation direct key signatures, and experimental pin ↵Vincent Breitmoser2014-12-3013-24/+126
| | | | notation packet
* introduce new ChangeUnlockParcel packet for extended passphrase changing ↵Vincent Breitmoser2014-12-2910-81/+189
| | | | capabilities
* Cleanup UncachedKeyringTestDominik Schürmann2014-12-292-7/+7
|
* Remove restriction for max parallel forks for gradle testsDominik Schürmann2014-12-281-6/+0
|
* Remove necessity to prepare tests via shell scriptDominik Schürmann2014-12-283-35/+3
|
* Fix test for future creation timestamps to account for loosen timestamp checkDominik Schürmann2014-12-282-5/+7
|
* Allow for creation date to be in the future up to one day to account for ↵Dominik Schürmann2014-12-281-4/+9
| | | | diverging clocks on different systems for fresh keys
* Fix crash on first time wizardDominik Schürmann2014-12-281-2/+2
|
* New icon for Lollipop releaseDominik Schürmann2014-12-1430-0/+1989
|
* Update plugin to 1.0Dominik Schürmann2014-12-123-1/+1
|
* Merge branch 'master' into developmentDominik Schürmann2014-12-053-0/+0
|\
| * Add passhrase attacking screens for wikiDominik Schürmann2014-12-053-0/+0
| |
* | Fix travisDominik Schürmann2014-12-051-1/+1
| |
* | Fix travisDominik Schürmann2014-12-051-1/+1
| |
* | Fix travisDominik Schürmann2014-12-041-3/+3
| |
* | Update target and support libs to SDK 21, fixing compile issuesDominik Schürmann2014-12-044-8/+6
| |
* | Switch from mavenCentral to jcenterDominik Schürmann2014-12-041-2/+2
| |
* | Fix jacocoDominik Schürmann2014-12-041-24/+23
| |
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-12-041-3/+3
|\ \ | | | | | | | | | development
| * \ Merge pull request #1011 from cketti/fix_k9_referencesDominik Schürmann2014-11-271-3/+3
| |\ \ | | | | | | | | Fix spelling of 'K-9 Mail' in FAQ
| | * | Fix spelling of 'K-9 Mail' in FAQcketti2014-11-261-3/+3
| |/ /
* | | Merge branch 'master' into developmentDominik Schürmann2014-12-0415-43/+42
|\ \ \ | |/ / |/| |
| * | Update to com.novoda:gradle-android-test-plugin:0.10.0, no snapshot version ↵Dominik Schürmann2014-12-042-36/+35
| | | | | | | | | | | | anymore, jacoco disabled for now
| * | Set version to 3.2beta1Dominik Schürmann2014-12-041-3/+3
| | |
| * | Update for Android Studio 1.0 RCDominik Schürmann2014-12-049-0/+0
| | |
| * | Update for Android Studio 1.0 RCDominik Schürmann2014-12-043-4/+4
| |/
* | more cleanupDominik Schürmann2014-11-211-14/+9
| |
* | NFC activity designDominik Schürmann2014-11-214-19/+14
| |
* | Minor code cleanupDominik Schürmann2014-11-217-12/+11
| |
* | Update keybase and minidns libsDominik Schürmann2014-11-042-0/+0
|/
* Version 3.1.2Dominik Schürmann2014-11-021-2/+2
|
* Pull from transifexDominik Schürmann2014-11-0223-17/+182
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-11-021-18/+39
|\ | | | | | | development
| * export secret and public keys in separate armored blocksVincent Breitmoser2014-10-311-9/+24
| |
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2014-10-3032-116/+490
| |\ | | | | | | | | | development
| * | forgot a thing for secret key exportVincent Breitmoser2014-10-301-18/+24
| | |
* | | ChangelogDominik Schürmann2014-11-022-0/+8
| |/ |/|
* | Version 3.1.1Dominik Schürmann2014-10-301-2/+2
| |
* | Revert "Version 3.1.1"Dominik Schürmann2014-10-301-2/+2
| | | | | | | | This reverts commit 8461f953f6da9c3c4929d42abbc7cfd992e21167.
* | Version 3.1.1Dominik Schürmann2014-10-301-2/+2
| |
* | Pull from transifexDominik Schürmann2014-10-3027-101/+467
| |
* | Changelog 3.1.1Dominik Schürmann2014-10-303-1/+11
| |
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-10-304-102/+28
|\| | | | | | | development
| * Fix to preselect certification key if only one is availableVincent Breitmoser2014-10-291-1/+1
| | | | | | | | Closes #981
| * remove unused ExchangeKeySpinner classVincent Breitmoser2014-10-291-100/+0
| |
| * Close stream on key export to avoid partial write (see #986)Vincent Breitmoser2014-10-291-0/+7
| |
| * retrofit getBlob method of matrixcursor for android 2.3Vincent Breitmoser2014-10-271-1/+20
| |
* | Always use INTEGER instead of BOOLEAN in database to avoid confusionDominik Schürmann2014-10-291-12/+10
|/