| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | Fix in-app help for backup codes | Dominik Schürmann | 2016-04-12 | 1 | -1/+1 | |
| | * | Revert usage of masked-edittext, back to plain edittexts for backup codes | Dominik Schürmann | 2016-04-12 | 8 | -188/+1604 | |
| * | | Fix strings | Dominik Schürmann | 2016-04-12 | 1 | -3/+3 | |
| |/ | ||||||
| * | Merge pull request #1772 from runnerway/importkey-encrypted | Vincent | 2016-04-12 | 4 | -10/+136 | |
| |\ | ||||||
| | * | Handle encrypted files while importing keys | Andrea Torlaschi | 2016-03-27 | 4 | -10/+136 | |
| * | | Merge pull request #1828 from nmikhailov/holder_text_fix | Dominik Schürmann | 2016-04-12 | 1 | -1/+1 | |
| |\ \ | ||||||
| | * | | Add missing keyholder string param | Nikita Mikhailov | 2016-04-11 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Merge branch 'kepuss-okhttp3' | Dominik Schürmann | 2016-04-09 | 13 | -124/+165 | |
| |\ \ | ||||||
| | * | | Use cert pinning only if available | Dominik Schürmann | 2016-04-09 | 7 | -41/+36 | |
| | * | | Okhttp3 cleanups, docs, and fix timeouts for default client | Dominik Schürmann | 2016-04-09 | 5 | -29/+41 | |
| | * | | Update keybase submodule | Dominik Schürmann | 2016-04-09 | 1 | -0/+0 | |
| | * | | KeyBaseLib response Client | Michal Kepkowski | 2016-04-08 | 2 | -10/+10 | |
| | * | | cleaning | Michal Kepkowski | 2016-04-06 | 2 | -8/+6 | |
| | * | | Merge branch 'master' into okhttp3 | Michal Kepkowski | 2016-04-06 | 52 | -913/+990 | |
| | |\ \ | |/ / |/| | | ||||||
| * | | | Merge pull request #1804 from vhazali/tint-linked-contact-picture-in-toolbar | Vincent | 2016-04-06 | 2 | -0/+4 | |
| |\ \ \ | ||||||
| | * | | | Used a constant instead of magic number for colour | Victor Hazali | 2016-04-04 | 2 | -1/+3 | |
| | * | | | Fixes #1298 | Victor Hazali | 2016-03-30 | 1 | -0/+2 | |
| | | |/ | |/| | ||||||
| * | | | Merge pull request #1818 from 007durgesh219/Issue#1468 | Vincent | 2016-04-06 | 2 | -10/+0 | |
| |\ \ \ | ||||||
| | * | | | Fix Unusable signing key not properly disabled, Issue #1468 | Durgesh | 2016-04-05 | 2 | -10/+0 | |
| |/ / / | ||||||
| * | | | Merge pull request #1808 from vhazali/warn-when-stripping-master-key | Vincent | 2016-04-04 | 2 | -5/+31 | |
| |\ \ \ | ||||||
| | * | | | setTitle now uses resource id directly | Victor Hazali | 2016-04-01 | 1 | -1/+1 | |
| | * | | | Corrected warning message | Victor Hazali | 2016-04-01 | 1 | -1/+1 | |
| | * | | | Corrected capitalisation of subkey | Victor Hazali | 2016-03-30 | 1 | -2/+2 | |
| | * | | | Refactored switch statements to use constants | Victor Hazali | 2016-03-30 | 1 | -5/+9 | |
| | * | | | Extracted method | Victor Hazali | 2016-03-30 | 1 | -16/+20 | |
| | * | | | Merge commit '05accb49066a2693cfc1c92e29ad10112f957495' into warn-when-stripp... | Victor Hazali | 2016-03-30 | 2 | -1/+19 | |
| | |\ \ \ | | |/ / | |/| | | ||||||
| | | * | | Alert for Stripping Subkeys. | tdjogi010@gmail.com | 2016-03-02 | 2 | -1/+19 | |
| * | | | | Merge pull request #1796 from AlexFJW/LimitCreateKeyOptions | Vincent | 2016-04-04 | 14 | -485/+362 | |
| |\ \ \ \ | ||||||
| | * | | | | Redesigned subkey creation dialog and changed default key type created to RSA... | Alex Fong | 2016-04-01 | 14 | -485/+362 | |
| * | | | | | Merge pull request #1810 from ecki/patch-1 | Vincent | 2016-04-03 | 1 | -1/+1 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Fix link to open-keychain/bouncycastle fork | Bernd | 2016-04-02 | 1 | -1/+1 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #1764 from 007durgesh219/Issue#506 | Vincent | 2016-04-01 | 10 | -191/+273 | |
| |\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| | * | | | | Fix Display Key in UploadKeyActivity, Issue #506 | Durgesh | 2016-03-31 | 8 | -23/+45 | |
| | * | | | | Display Key moved to Fragment | Durgesh | 2016-03-29 | 5 | -173/+233 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #1776 from open-keychain/interval-fix | Adithya Abraham Philip | 2016-03-24 | 4 | -12/+63 | |
| |\ \ \ \ | ||||||
| | * | | | | change sync interval on change in code | Adithya Abraham Philip | 2016-03-24 | 4 | -12/+63 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #1785 from advaita13/wifi-only-fix | Vincent | 2016-03-24 | 9 | -22/+119 | |
| |\ \ \ \ | ||||||
| | * | | | | Final commit | Advaita | 2016-03-23 | 9 | -22/+119 | |
| * | | | | | Merge pull request #1782 from fiaxh/share_key_mime | Dominik Schürmann | 2016-03-24 | 1 | -1/+1 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Set MIME application/pgp-keys when sending a key | fiaxh | 2016-03-14 | 1 | -1/+1 | |
| * | | | | | | use new TokenAutoComplete 2.0.7, fixes #1636 | Vincent Breitmoser | 2016-03-23 | 3 | -13/+2 | |
| * | | | | | | fix build instructions in readme | Vincent Breitmoser | 2016-03-23 | 1 | -1/+1 | |
| * | | | | | | get rid of code path for pin and notation data handling | Vincent Breitmoser | 2016-03-23 | 9 | -157/+75 | |
| * | | | | | | Fix CertifyKeyActivity back button on action bar not working #1758 | Durgesh | 2016-03-22 | 1 | -0/+11 | |
| | |_|/ / / |/| | | | | ||||||
| * | | | | | update null-check for duplicates, and add matching indexes to name and email ... | Vincent Breitmoser | 2016-03-16 | 2 | -7/+13 | |
| * | | | | | Version 3.9.4 | Dominik Schürmann | 2016-03-15 | 1 | -2/+2 | |
| * | | | | | small update to duplicate detection | Vincent Breitmoser | 2016-03-15 | 1 | -2/+5 | |
| * | | | | | Merge pull request #1777 from fjodorver/master | Vincent | 2016-03-15 | 1 | -2/+2 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Updated HAS_DUPLICATE_USER_ID in KeychainProvider to use name and email addre... | fjodor | 2016-03-10 | 1 | -2/+2 | |
| * | | | | | | fix ridiculous database migration bug introduced by d6e4936fa54dc3577296dbada... | Vincent Breitmoser | 2016-03-15 | 1 | -9/+7 | |
| | |_|/ / / |/| | | | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |