| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | Merge branch 'master' into okhttp3 | Michal Kepkowski | 2016-04-06 | 33 | -726/+852 | |
| |\ \ \ \ | | |/ / | |/| | | ||||||
| | * | | | Merge pull request #1804 from vhazali/tint-linked-contact-picture-in-toolbar | Vincent | 2016-04-06 | 1 | -0/+3 | |
| | |\ \ \ | | | | | | | | | | | tint linked contact picture in toolbar #1298 | |||||
| | | * | | | Used a constant instead of magic number for colour | Victor Hazali | 2016-04-04 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | Explicitly stated the blending mode | |||||
| | | * | | | 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 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com> | |||||
| | * | | | Merge pull request #1808 from vhazali/warn-when-stripping-master-key | Vincent | 2016-04-04 | 1 | -5/+28 | |
| | |\ \ \ | | | | | | | | | | | Warn when stripping master key #1554 | |||||
| | | * | | | 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 ↵ | Victor Hazali | 2016-03-30 | 1 | -1/+16 | |
| | | |\ \ \ | | | |/ / | | |/| | | | | | | | warn-when-stripping-master-key | |||||
| | | | * | | Alert for Stripping Subkeys. | tdjogi010@gmail.com | 2016-03-02 | 1 | -1/+16 | |
| | | | | | | ||||||
| | * | | | | Merge pull request #1796 from AlexFJW/LimitCreateKeyOptions | Vincent | 2016-04-04 | 6 | -352/+271 | |
| | |\ \ \ \ | | |_|_|/ | |/| | | | Refer to issue #1600 Limit create key options | |||||
| | | * | | | Redesigned subkey creation dialog and changed default key type created to ↵ | Alex Fong | 2016-04-01 | 6 | -352/+271 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RSA, 3072 bit. Added code to prevent removal of master subkey when modifying a new key. | |||||
| | * | | | | 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 | |
| | | |/ / | |/| | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com> | |||||
| | * | | | 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 | 6 | -22/+102 | |
| | |\ \ \ | | | | | | | | | | | Sync only when unmetered internet is available #1670 | |||||
| | | * | | | Final commit | Advaita | 2016-03-23 | 6 | -22/+102 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All changes included Improvements -Reformatted code wherever required -Only active wifi connections trigger events -Improve sync reliability -Removed extra permission Minor Changes -Refactored 2 variables for easier readbility -Wifi-Only-Sync is now enabled by default | |||||
| | * | | | | 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 | |||||
| | | * | | | | 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 | 7 | -113/+70 | |
| | | | | | | ||||||
| | * | | | | Fix CertifyKeyActivity back button on action bar not working #1758 | Durgesh | 2016-03-22 | 1 | -0/+11 | |
| | | |/ / | |/| | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com> | |||||
| | * | | | update null-check for duplicates, and add matching indexes to name and email ↵ | Vincent Breitmoser | 2016-03-16 | 2 | -7/+13 | |
| | | | | | | | | | | | | | | | | | columns | |||||
| | * | | | 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 #1745 | |||||
| | | * | | | Updated HAS_DUPLICATE_USER_ID in KeychainProvider to use name and email ↵ | fjodor | 2016-03-10 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | address instead of user id #1745 | |||||
| | * | | | | fix ridiculous database migration bug introduced by ↵ | Vincent Breitmoser | 2016-03-15 | 1 | -9/+7 | |
| | | |/ / | |/| | | | | | | | | | | d6e4936fa54dc3577296dbadaeb556178dcad2c3 | |||||
| | * | | | Merge pull request #1780 from AlexFJW/backup-code-selection | Dominik Schürmann | 2016-03-12 | 1 | -0/+25 | |
| | |\ \ \ | | | | | | | | | | | Provisional backup-code text selection fix | |||||
| | | * | | | Provisional backup-code text selection fix | Alex Fong | 2016-03-12 | 1 | -0/+25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For issue #1779, a provisional fix where selection is still possible, but more difficult. Preventing selection altogether is not possible due to the implementation in the Masked-Edittext dependency. To be updated when Masked-Edittext fixes this bug. | |||||
| * | | | | | OKhttp url factory | Michal Kepkowski | 2016-04-06 | 2 | -8/+26 | |
| | | | | | | ||||||
| * | | | | | okhttp3 | Michal Kepkowski | 2016-03-14 | 10 | -109/+127 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #1763 from fjodorver/master | Vincent | 2016-03-10 | 4 | -15/+38 | |
| |\ \ \ \ | | |/ / | |/| | | WIP: Save split user ids in database #1745 | |||||
| | * | | | Increased version DB and added a migration path from an old database format | fjodor | 2016-03-07 | 1 | -2/+5 | |
| | | | | | ||||||
| | * | | | Save split user ids in database #1745 | fjodor | 2016-03-07 | 4 | -13/+33 | |
| | | | | | | | | | | | | | | | | | Save split user ids in database | |||||
| * | | | | service: add opportunistic mode to encryption | Vincent Breitmoser | 2016-03-10 | 1 | -20/+26 | |
| | | | | | ||||||
| * | | | | Fix display of keyserver item in dark theme | fiaxh | 2016-03-10 | 1 | -3/+4 | |
| | |/ / |/| | | ||||||
| * | | | Fix NullPointerException in ↵ | Durgesh | 2016-03-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | ImportKeysListFragment.checkAndRequestReadPermission, #1766 Signed-off-by: Durgesh <007durgesh219@gmail.com> | |||||
| * | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0feb4d074ce284bfed17e82a3cbc218209aff14a. Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java | |||||
| * | | | 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 branch 'okHttpLinkedToken' of https://github.com/kepuss/open-keychain ↵ | Dominik Schürmann | 2016-03-07 | 4 | -82/+81 | |
| |\ \ \ | | | | | | | | | | | | | into kepuss-okHttpLinkedToken | |||||
| | * | | | okHttp | Michal Kepkowski | 2016-03-04 | 4 | -82/+81 | |
| | | | | | ||||||
| * | | | | fix get key ids by removing another leftover | Dominik Schürmann | 2016-03-07 | 1 | -1/+0 | |
| | | | | | ||||||
| * | | | | fix bug from leftover line in openpgpservice | Vincent Breitmoser | 2016-03-07 | 1 | -1/+0 | |
| | | | | | ||||||
| * | | | | Merge pull request #1757 from 007durgesh219/Issue#1752 | Dominik Schürmann | 2016-03-06 | 1 | -1/+7 | |
| |\ \ \ \ | | | | | | | | | | | Fix K-9 stable: OpenPGP: Unknown compression algorithm #1752 | |||||
| | * | | | | Fix K-9 stable: OpenPGP: Unknown compression algorithm #1752 | Durgesh | 2016-03-06 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com> | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |