Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Remove restriction for max parallel forks for gradle tests | Dominik Schürmann | 2014-12-28 | 1 | -6/+0 | |
| | ||||||
* | Remove necessity to prepare tests via shell script | Dominik Schürmann | 2014-12-28 | 3 | -35/+3 | |
| | ||||||
* | Fix test for future creation timestamps to account for loosen timestamp check | Dominik Schürmann | 2014-12-28 | 2 | -5/+7 | |
| | ||||||
* | Allow for creation date to be in the future up to one day to account for ↵ | Dominik Schürmann | 2014-12-28 | 1 | -4/+9 | |
| | | | | diverging clocks on different systems for fresh keys | |||||
* | Fix crash on first time wizard | Dominik Schürmann | 2014-12-28 | 1 | -2/+2 | |
| | ||||||
* | New icon for Lollipop release | Dominik Schürmann | 2014-12-14 | 30 | -0/+1989 | |
| | ||||||
* | Update plugin to 1.0 | Dominik Schürmann | 2014-12-12 | 3 | -1/+1 | |
| | ||||||
* | Merge branch 'master' into development | Dominik Schürmann | 2014-12-05 | 3 | -0/+0 | |
|\ | ||||||
| * | Add passhrase attacking screens for wiki | Dominik Schürmann | 2014-12-05 | 3 | -0/+0 | |
| | | ||||||
* | | Fix travis | Dominik Schürmann | 2014-12-05 | 1 | -1/+1 | |
| | | ||||||
* | | Fix travis | Dominik Schürmann | 2014-12-05 | 1 | -1/+1 | |
| | | ||||||
* | | Fix travis | Dominik Schürmann | 2014-12-04 | 1 | -3/+3 | |
| | | ||||||
* | | Update target and support libs to SDK 21, fixing compile issues | Dominik Schürmann | 2014-12-04 | 4 | -8/+6 | |
| | | ||||||
* | | Switch from mavenCentral to jcenter | Dominik Schürmann | 2014-12-04 | 1 | -2/+2 | |
| | | ||||||
* | | Fix jacoco | Dominik Schürmann | 2014-12-04 | 1 | -24/+23 | |
| | | ||||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-12-04 | 1 | -3/+3 | |
|\ \ | | | | | | | | | | development | |||||
| * \ | Merge pull request #1011 from cketti/fix_k9_references | Dominik Schürmann | 2014-11-27 | 1 | -3/+3 | |
| |\ \ | | | | | | | | | Fix spelling of 'K-9 Mail' in FAQ | |||||
| | * | | Fix spelling of 'K-9 Mail' in FAQ | cketti | 2014-11-26 | 1 | -3/+3 | |
| |/ / | ||||||
* | | | Merge branch 'master' into development | Dominik Schürmann | 2014-12-04 | 15 | -43/+42 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Update to com.novoda:gradle-android-test-plugin:0.10.0, no snapshot version ↵ | Dominik Schürmann | 2014-12-04 | 2 | -36/+35 | |
| | | | | | | | | | | | | anymore, jacoco disabled for now | |||||
| * | | Set version to 3.2beta1 | Dominik Schürmann | 2014-12-04 | 1 | -3/+3 | |
| | | | ||||||
| * | | Update for Android Studio 1.0 RC | Dominik Schürmann | 2014-12-04 | 9 | -0/+0 | |
| | | | ||||||
| * | | Update for Android Studio 1.0 RC | Dominik Schürmann | 2014-12-04 | 3 | -4/+4 | |
| |/ | ||||||
* | | more cleanup | Dominik Schürmann | 2014-11-21 | 1 | -14/+9 | |
| | | ||||||
* | | NFC activity design | Dominik Schürmann | 2014-11-21 | 4 | -19/+14 | |
| | | ||||||
* | | Minor code cleanup | Dominik Schürmann | 2014-11-21 | 7 | -12/+11 | |
| | | ||||||
* | | Update keybase and minidns libs | Dominik Schürmann | 2014-11-04 | 2 | -0/+0 | |
|/ | ||||||
* | Version 3.1.2 | Dominik Schürmann | 2014-11-02 | 1 | -2/+2 | |
| | ||||||
* | Pull from transifex | Dominik Schürmann | 2014-11-02 | 23 | -17/+182 | |
| | ||||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-11-02 | 1 | -18/+39 | |
|\ | | | | | | | development | |||||
| * | export secret and public keys in separate armored blocks | Vincent Breitmoser | 2014-10-31 | 1 | -9/+24 | |
| | | ||||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-30 | 32 | -116/+490 | |
| |\ | | | | | | | | | | development | |||||
| * | | forgot a thing for secret key export | Vincent Breitmoser | 2014-10-30 | 1 | -18/+24 | |
| | | | ||||||
* | | | Changelog | Dominik Schürmann | 2014-11-02 | 2 | -0/+8 | |
| |/ |/| | ||||||
* | | Version 3.1.1 | Dominik Schürmann | 2014-10-30 | 1 | -2/+2 | |
| | | ||||||
* | | Revert "Version 3.1.1" | Dominik Schürmann | 2014-10-30 | 1 | -2/+2 | |
| | | | | | | | | This reverts commit 8461f953f6da9c3c4929d42abbc7cfd992e21167. | |||||
* | | Version 3.1.1 | Dominik Schürmann | 2014-10-30 | 1 | -2/+2 | |
| | | ||||||
* | | Pull from transifex | Dominik Schürmann | 2014-10-30 | 27 | -101/+467 | |
| | | ||||||
* | | Changelog 3.1.1 | Dominik Schürmann | 2014-10-30 | 3 | -1/+11 | |
| | | ||||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-30 | 4 | -102/+28 | |
|\| | | | | | | | development | |||||
| * | Fix to preselect certification key if only one is available | Vincent Breitmoser | 2014-10-29 | 1 | -1/+1 | |
| | | | | | | | | Closes #981 | |||||
| * | remove unused ExchangeKeySpinner class | Vincent Breitmoser | 2014-10-29 | 1 | -100/+0 | |
| | | ||||||
| * | Close stream on key export to avoid partial write (see #986) | Vincent Breitmoser | 2014-10-29 | 1 | -0/+7 | |
| | | ||||||
| * | retrofit getBlob method of matrixcursor for android 2.3 | Vincent Breitmoser | 2014-10-27 | 1 | -1/+20 | |
| | | ||||||
* | | Always use INTEGER instead of BOOLEAN in database to avoid confusion | Dominik Schürmann | 2014-10-29 | 1 | -12/+10 | |
|/ | ||||||
* | Version 3.1 | Dominik Schürmann | 2014-10-26 | 1 | -2/+2 | |
| | ||||||
* | Pull from transifex | Dominik Schürmann | 2014-10-26 | 20 | -0/+220 | |
| | ||||||
* | Pull from transifex | Dominik Schürmann | 2014-10-26 | 56 | -878/+3333 | |
| | ||||||
* | Changelog 3.1 | Dominik Schürmann | 2014-10-26 | 2 | -0/+22 | |
| | ||||||
* | Fix crash with NotFoundException | Dominik Schürmann | 2014-10-26 | 1 | -3/+8 | |
| |