Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | #1042 replaced some int constants with enums | Daniel Nelz | 2015-03-04 | 1 | -2/+3 |
| | | | | | Created enum FragAction in CreateKeyActivity.java and enum State in KeyFormattingUtils.java and replaced int constants with them | ||||
* | Merge keybase-proof branch | Dominik Schürmann | 2015-02-27 | 1 | -1/+17 |
|\ | |||||
| * | In the ImportKeysList display, arrange for Keybase UserIDs to sort below the ↵ | Tim Bray | 2014-11-18 | 1 | -1/+17 |
| | | | | | | | | rest. Also mention Keybase stuff other than Twitter/GitHub/Website | ||||
* | | First work on new key view toolbar | Dominik Schürmann | 2015-02-25 | 1 | -2/+2 |
| | | |||||
* | | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 1 | -2/+2 |
|/ | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-25 | 1 | -1/+10 |
|\ | | | | | | | development | ||||
| * | remove unnecessary (and buggy) BufferedInputStream wrapping | Vincent Breitmoser | 2014-10-25 | 1 | -1/+10 |
| | | |||||
* | | Fix color in import list | Dominik Schürmann | 2014-10-25 | 1 | -6/+8 |
|/ | |||||
* | consistency for import UI | Dominik Schürmann | 2014-10-16 | 1 | -5/+27 |
| | |||||
* | fix nullpointer on button push while data is still loading | Vincent Breitmoser | 2014-10-03 | 1 | -0/+3 |
| | | | | fixes #934 | ||||
* | actually use iterator interface for ParcelableFileCache in activities | Vincent Breitmoser | 2014-10-03 | 1 | -8/+3 |
| | |||||
* | Merge user ids in import list for better display | Dominik Schürmann | 2014-09-21 | 1 | -17/+32 |
| | |||||
* | Beautify key id (thanks to Tim Bray) | Dominik Schürmann | 2014-09-19 | 1 | -1/+1 |
| | |||||
* | Use key icons in import, prettify items | Dominik Schürmann | 2014-09-18 | 1 | -4/+19 |
| | |||||
* | package reordering: merge util and helper, there were no real difference; ↵ | Dominik Schürmann | 2014-09-17 | 1 | -1/+1 |
| | | | | created ui.util for everything related to formatting | ||||
* | add ecc support | Vincent Breitmoser | 2014-08-24 | 1 | -2/+2 |
| | |||||
* | Edit key: subkey adding, not finished | Dominik Schürmann | 2014-08-04 | 1 | -1/+1 |
| | |||||
* | fix nullpointerexception in importkeyactivity | Vincent Breitmoser | 2014-06-28 | 1 | -0/+4 |
| | |||||
* | Work on Qr code import | Dominik Schürmann | 2014-06-20 | 1 | -1/+1 |
| | |||||
* | Clean up keyimport.ImportKeysListEntry | Tim Bray | 2014-06-05 | 1 | -9/+8 |
| | |||||
* | Merge pull request #645 from timbray/master | Dominik Schürmann | 2014-06-05 | 1 | -6/+2 |
|\ | | | | | Don't show full fingerprint in key search result lists | ||||
| * | Don't show full fingerprint in key search results | Tim Bray | 2014-06-05 | 1 | -6/+2 |
| | | |||||
* | | neatness refactoring | Vincent Breitmoser | 2014-06-04 | 1 | -2/+2 |
|/ | |||||
* | wrapped-key-ring: move key data around in ParcelableKeyRing instead of ↵ | Vincent Breitmoser | 2014-06-02 | 1 | -1/+2 |
| | | | | ImportKeysListEntry | ||||
* | Add highlighting to keyserver/keybase search | Thialfihar | 2014-05-16 | 1 | -3/+5 |
| | |||||
* | Rename fingerPrint to fingerprint | Thialfihar | 2014-05-14 | 1 | -2/+2 |
| | |||||
* | Don't guess keybase key algorithm and size | Thialfihar | 2014-05-14 | 1 | -1/+6 |
| | | | | | Once keybase reports them, we can display them. Until then we simply don't know and shouldn't lie about it. | ||||
* | Move logic classes for import into own sub-package | Dominik Schürmann | 2014-05-06 | 1 | -0/+1 |
| | |||||
* | New key view design, using Android flat buttons and Android icons | Dominik Schürmann | 2014-05-05 | 1 | -2/+1 |
| | |||||
* | More code cleanup | Dominik Schürmann | 2014-04-19 | 1 | -3/+3 |
| | |||||
* | Fix ViewHolder in ImportKeysAdapter | Dominik Schürmann | 2014-04-15 | 1 | -24/+28 |
| | |||||
* | Update license header for 2014 | Dominik Schürmann | 2014-04-13 | 1 | -1/+1 |
| | |||||
* | Prettify more layouts | Dominik Schürmann | 2014-04-11 | 1 | -5/+5 |
| | |||||
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 1 | -0/+186 |