| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | | Okhttp3 cleanups, docs, and fix timeouts for default client | Dominik Schürmann | 2016-04-09 | 1 | -1/+1 |
* | | | | KeyBaseLib response Client | Michal Kepkowski | 2016-04-08 | 1 | -1/+1 |
* | | | | Merge branch 'master' into okhttp3 | Michal Kepkowski | 2016-04-06 | 20 | -578/+608 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Merge pull request #1804 from vhazali/tint-linked-contact-picture-in-toolbar | Vincent | 2016-04-06 | 1 | -0/+3 |
| |\ \ \ |
|
| | * | | | Used a constant instead of magic number for colour | Victor Hazali | 2016-04-04 | 1 | -1/+2 |
| | * | | | Fixes #1298 | Victor Hazali | 2016-03-30 | 1 | -0/+2 |
| | |/ / |
|
| * | | | 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 | 1 | -5/+28 |
| |\ \ \ |
|
| | * | | | setTitle now uses resource id directly | Victor Hazali | 2016-04-01 | 1 | -1/+1 |
| | * | | | 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 | 1 | -1/+16 |
| | |\ \ \
| | | |/ /
| | |/| | |
|
| | | * | | Alert for Stripping Subkeys. | tdjogi010@gmail.com | 2016-03-02 | 1 | -1/+16 |
| * | | | | Merge pull request #1796 from AlexFJW/LimitCreateKeyOptions | Vincent | 2016-04-04 | 5 | -351/+263 |
| |\ \ \ \ |
|
| | * | | | | Redesigned subkey creation dialog and changed default key type created to RSA... | Alex Fong | 2016-04-01 | 5 | -351/+263 |
| * | | | | | Fix Display Key in UploadKeyActivity, Issue #506 | Durgesh | 2016-03-31 | 6 | -21/+39 |
| * | | | | | Display Key moved to Fragment | Durgesh | 2016-03-29 | 3 | -171/+224 |
| | |/ / /
| |/| | | |
|
| * | | | | change sync interval on change in code | Adithya Abraham Philip | 2016-03-24 | 1 | -4/+12 |
| * | | | | Merge pull request #1785 from advaita13/wifi-only-fix | Vincent | 2016-03-24 | 1 | -3/+3 |
| |\ \ \ \ |
|
| | * | | | | Final commit | Advaita | 2016-03-23 | 1 | -3/+3 |
| | |/ / / |
|
| * | | | | 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 | 2 | -11/+0 |
| * | | | | get rid of code path for pin and notation data handling | Vincent Breitmoser | 2016-03-23 | 3 | -6/+4 |
| * | | | | Fix CertifyKeyActivity back button on action bar not working #1758 | Durgesh | 2016-03-22 | 1 | -0/+11 |
| |/ / / |
|
| * | | | Merge pull request #1780 from AlexFJW/backup-code-selection | Dominik Schürmann | 2016-03-12 | 1 | -0/+25 |
| |\ \ \ |
|
| | * | | | Provisional backup-code text selection fix | Alex Fong | 2016-03-12 | 1 | -0/+25 |
* | | | | | okhttp3 | Michal Kepkowski | 2016-03-14 | 1 | -10/+5 |
|/ / / / |
|
* / / / | Fix display of keyserver item in dark theme | fiaxh | 2016-03-10 | 1 | -3/+4 |
|/ / / |
|
* | | | Fix NullPointerException in ImportKeysListFragment.checkAndRequestReadPermiss... | Durgesh | 2016-03-08 | 1 | -1/+1 |
* | | | Open keyboard for backup code | Dominik Schürmann | 2016-03-08 | 1 | -22/+31 |
* | | | Revert "Use non-breaking spaces for backup code MaskedEditText" | Dominik Schürmann | 2016-03-08 | 1 | -7/+2 |
* | | | Fix code style and documentation in BaseSecurityTokenNfcActivity | Dominik Schürmann | 2016-03-08 | 2 | -40/+45 |
* | | | Fix documentation of nfcGenerateOnCardKey | Dominik Schürmann | 2016-03-08 | 1 | -3/+1 |
* | | | Fix comment in nfcGenerateOnCardKey | Dominik Schürmann | 2016-03-08 | 1 | -1/+1 |
* | | | Add nfcGenerateOnCardKey by Joey Castillo before it gets lost | Dominik Schürmann | 2016-03-08 | 1 | -0/+42 |
* | | | Merge pull request #1747 from runnerway/fix-alreadyadded | Dominik Schürmann | 2016-03-06 | 1 | -2/+2 |
|\ \ \ |
|
| * | | | Remove uri from pending even when already added | Andrea Torlaschi | 2016-03-04 | 1 | -2/+2 |
| | |/
| |/| |
|
* | | | Merge pull request #1750 from 007durgesh219/Issue#1746 | Dominik Schürmann | 2016-03-05 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Fix Dark theme no longer works in main screen on android 5, Issue#1746 | Durgesh | 2016-03-05 | 1 | -1/+1 |
| |/ / |
|
* / / | Always check read permission | Andrea Torlaschi | 2016-03-02 | 1 | -1/+8 |
|/ / |
|
* | | handle openpgp4fpr intent filter as import rather than certify (see #1661) | Vincent Breitmoser | 2016-03-02 | 1 | -1/+4 |
* | | nfc: disable broadcomWorkaround for TagDispatcher to reduce delay (see #1734) | Vincent Breitmoser | 2016-03-02 | 1 | -1/+1 |
* | | Fix backup code comparison | Andrea Torlaschi | 2016-03-02 | 1 | -5/+6 |
|/ |
|
* | Merge pull request #1727 from open-keychain/mime-fallback | Vincent | 2016-02-23 | 3 | -1/+28 |
|\ |
|
| * | ditch isLikelyText flag, set mimeType to text/plain in that case | Vincent Breitmoser | 2016-02-23 | 1 | -1/+1 |
| * | displaytext: add "View Log" option, move "Copy to clipboard" into overflow menu | Vincent Breitmoser | 2016-02-22 | 2 | -1/+16 |
| * | decrypt: always show "View in OpenKeychain" as intent chooser option iff isLi... | Vincent Breitmoser | 2016-02-22 | 1 | -0/+12 |
* | | Remove AspectRatioImageView | unyoungwax | 2016-02-23 | 1 | -138/+0 |
|/ |
|
* | Extend documentation, proper method naming, use of deprecated method annotation | Dominik Schürmann | 2016-02-22 | 3 | -1/+13 |