| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Better handle user_id sidecases while splitting | fiaxh | 2016-04-12 | 3 | -5/+45 |
| | | |||||
| * | Use email field to match email in KeychainProvider | fiaxh | 2016-04-12 | 1 | -4/+4 |
| | | | | | fixes #1699 | ||||
| * | Merge pull request #1810 from ecki/patch-1 | Vincent | 2016-04-03 | 1 | -1/+1 |
| |\ | | | | | Fix link to open-keychain/bouncycastle fork | ||||
| | * | 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 |
| |\ | | | | | Display Key in UploadKeyActivity Issue #506 | ||||
| | * | 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 |
| |/ | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com> | ||||
| * | Merge pull request #1776 from open-keychain/interval-fix | Adithya Abraham Philip | 2016-03-24 | 4 | -12/+63 |
| |\ | | | | | Update Keyserver Sync if Sync Interval Changed | ||||
| | * | 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 |
| |\ | | | | | Sync only when unmetered internet is available #1670 | ||||
| | * | Final commit | Advaita | 2016-03-23 | 9 | -22/+119 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 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 |
| | | | | | | | | | | | | | 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 | ||||
| * | | | 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 #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 | ||||
| * | | | Version 3.9.3 | Dominik Schürmann | 2016-03-15 | 1 | -2/+2 |
| | |/ |/| | |||||
| * | | 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. | ||||
| * | | | 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 | 2 | -20/+26 |
| | | | | |||||
| * | | | Update okhttp2, tokenautomcomplete, zxing | Dominik Schürmann | 2016-03-10 | 1 | -16/+16 |
| | | | | |||||
| * | | | Merge pull request #1774 from fiaxh/keyserver_select_dark | Dominik Schürmann | 2016-03-10 | 1 | -3/+4 |
| |\ \ \ | |_|/ |/| | | Fix display of keyserver item in dark theme in SettingsKeyserverActivity | ||||
| | * | | Fix display of keyserver item in dark theme | fiaxh | 2016-03-10 | 1 | -3/+4 |
| |/ / | |||||
| * | | Merge pull request #1769 from 007durgesh219/Issue#1766 | Dominik Schürmann | 2016-03-08 | 1 | -1/+1 |
| |\ \ | | | | | | | Fix NullPointerException in ImportKeysListFragment.checkAndRequestReadPermission, #1766 | ||||
| | * | | 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 |
| | | | |||||
| * | | Make it a style to reduce code duplication | Dominik Schürmann | 2016-03-08 | 6 | -148/+25 |
| | | | |||||
| * | | Add more responsive text sizes | Dominik Schürmann | 2016-03-08 | 2 | -1/+74 |
| | | | |||||
| * | | Using new size qualifiers | Dominik Schürmann | 2016-03-08 | 4 | -3/+74 |
| | | | |||||
| * | | Revert "Use non-breaking spaces for backup code MaskedEditText" | Dominik Schürmann | 2016-03-08 | 3 | -11/+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 'kepuss-okHttpLinkedToken' | Dominik Schürmann | 2016-03-07 | 5 | -84/+81 |
| |\ \ | |||||
| | * | | Merge branch 'okHttpLinkedToken' of https://github.com/kepuss/open-keychain ↵ | Dominik Schürmann | 2016-03-07 | 5 | -84/+81 |
| |/| | | | | | | | | | | | into kepuss-okHttpLinkedToken | ||||
| | * | | dependency removed | Michal Kepkowski | 2016-03-05 | 1 | -2/+0 |
| | | | | |||||
| | * | | okHttp | Michal Kepkowski | 2016-03-04 | 4 | -82/+81 |
| | | | | |||||
| * | | | Version 3.9.2 | Dominik Schürmann | 2016-03-07 | 1 | -2/+2 |
| | | | | |||||
| * | | | fix get key ids by removing another leftover | Dominik Schürmann | 2016-03-07 | 1 | -1/+0 |
| | | | | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |