Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-09-24 | 10 | -169/+247 | |
| |\ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java | |||||
| * | | fix signing in OK with yubikeys | Vincent Breitmoser | 2014-09-24 | 2 | -15/+26 | |
| | | | ||||||
| * | | fix nullpointer in previous swipetorefresh fix | Vincent Breitmoser | 2014-09-23 | 1 | -5/+9 | |
| | | | ||||||
* | | | DecryptFiles: Reset state for new file decrytion | Dominik Schürmann | 2014-09-24 | 1 | -1/+3 | |
| |/ |/| | ||||||
* | | Fix yubikey file decryption | Dominik Schürmann | 2014-09-24 | 3 | -20/+12 | |
| | | ||||||
* | | Yubikey text decryption working | Dominik Schürmann | 2014-09-24 | 2 | -2/+2 | |
| | | ||||||
* | | Yubikey decryption | Dominik Schürmann | 2014-09-24 | 4 | -80/+34 | |
| | | ||||||
* | | DecryptFilesActivity | Dominik Schürmann | 2014-09-24 | 3 | -14/+21 | |
| | | ||||||
* | | Implement buttons in DecryptTextFragment | Dominik Schürmann | 2014-09-23 | 5 | -65/+150 | |
| | | ||||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-23 | 1 | -0/+3 | |
|\| | ||||||
| * | missed a secondary preference initialization | Vincent Breitmoser | 2014-09-23 | 1 | -0/+3 | |
| | | ||||||
* | | DecryptTextActivity rework | Dominik Schürmann | 2014-09-23 | 5 | -54/+93 | |
|/ | ||||||
* | disable pull to refresh in upper right corner | Vincent Breitmoser | 2014-09-23 | 2 | -1/+26 | |
| | | | | | | | | While at the top of the list, the scroll bar handle is in the top right corner. Previously, dragging the handle from this position was difficult because touch events were intercepted by the pull to refresh handler. Closes #858 | |||||
* | passphrasecache: cache by master key, introduce preference for cache by subkey | Vincent Breitmoser | 2014-09-23 | 5 | -13/+29 | |
| | ||||||
* | Hack to fix #805 | Dominik Schürmann | 2014-09-22 | 2 | -4/+57 | |
| | ||||||
* | Fix possible nullpointer in ImportKeysFileFragment | Dominik Schürmann | 2014-09-21 | 1 | -1/+1 | |
| | ||||||
* | Fix custom key configuration for primary user ids | Dominik Schürmann | 2014-09-21 | 4 | -10/+36 | |
| | ||||||
* | Fix LogDisplayFragment | Dominik Schürmann | 2014-09-21 | 1 | -10/+4 | |
| | ||||||
* | Feature to change key configuration in create key | Dominik Schürmann | 2014-09-21 | 5 | -47/+152 | |
| | ||||||
* | Small UI fixes | Dominik Schürmann | 2014-09-21 | 2 | -4/+3 | |
| | ||||||
* | Merge user ids in import list for better display | Dominik Schürmann | 2014-09-21 | 1 | -17/+32 | |
| | ||||||
* | key spinner fixes | Dominik Schürmann | 2014-09-21 | 2 | -27/+44 | |
| | ||||||
* | settings code cleanup | Dominik Schürmann | 2014-09-21 | 1 | -18/+14 | |
| | ||||||
* | New key flags icons, subkey adapter redesign, support authanticate flag in ↵ | Dominik Schürmann | 2014-09-20 | 2 | -24/+63 | |
| | | | | database | |||||
* | no monospace for key ids | Dominik Schürmann | 2014-09-20 | 4 | -21/+13 | |
| | ||||||
* | Beautify key id (thanks to Tim Bray) | Dominik Schürmann | 2014-09-19 | 8 | -15/+71 | |
| | ||||||
* | Remove certificate validation code from ViewCertActivity, they are already ↵ | Dominik Schürmann | 2014-09-19 | 1 | -26/+0 | |
| | | | | validated by import | |||||
* | Use key icons in import, prettify items | Dominik Schürmann | 2014-09-18 | 1 | -4/+19 | |
| | ||||||
* | Stop refreshing after all keys have been updated | Dominik Schürmann | 2014-09-18 | 1 | -4/+4 | |
| | ||||||
* | Swipe-to-refresh fixes | Dominik Schürmann | 2014-09-18 | 1 | -1/+2 | |
| | ||||||
* | Swipe-to-refresh fixes | Dominik Schürmann | 2014-09-18 | 2 | -27/+23 | |
| | ||||||
* | Fix sign via API | Dominik Schürmann | 2014-09-18 | 1 | -1/+1 | |
| | ||||||
* | Use key icons in spinners | Dominik Schürmann | 2014-09-17 | 5 | -40/+115 | |
| | ||||||
* | package reordering: merge util and helper, there were no real difference; ↵ | Dominik Schürmann | 2014-09-17 | 46 | -110/+783 | |
| | | | | created ui.util for everything related to formatting | |||||
* | PassphraseDialogActivity usage in Remote API | Dominik Schürmann | 2014-09-17 | 1 | -19/+29 | |
| | ||||||
* | Fix cleartext verify | Dominik Schürmann | 2014-09-17 | 1 | -0/+7 | |
| | ||||||
* | Passphrase handling in encrypt | Dominik Schürmann | 2014-09-17 | 4 | -35/+77 | |
| | ||||||
* | Result parcel refactorings (WIP) | Dominik Schürmann | 2014-09-17 | 8 | -155/+187 | |
| | ||||||
* | Dont copy encrypted file to clipboard (dont know how that code ended up there) | Dominik Schürmann | 2014-09-17 | 1 | -6/+1 | |
| | ||||||
* | Work on new result handling (WIP) | Dominik Schürmann | 2014-09-17 | 4 | -60/+102 | |
| | ||||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-09-15 | 15 | -625/+538 | |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/res/values-de/strings.xml | |||||
| * | Pull from transifex | Dominik Schürmann | 2014-09-15 | 1 | -1/+1 | |
| | | ||||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-15 | 16 | -473/+214 | |
| |\ | ||||||
| | * | Change shuffle to rotate, and when merging ImportKeysList entries, if either ↵ | Tim Bray | 2014-09-13 | 1 | -3/+3 | |
| | | | | | | | | | | | | side is revoked/expired, the merge reflects that | |||||
| | * | Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs | Tim Bray | 2014-09-13 | 9 | -433/+175 | |
| | | | ||||||
| * | | New decrypt activity design (WIP), saner UTF8 decoding (replacing ↵ | Dominik Schürmann | 2014-09-15 | 5 | -132/+303 | |
| | | | | | | | | | | | | non-decodable characters) | |||||
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-14 | 2 | -4/+17 | |
| |\ \ | ||||||
| * \ \ | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-14 | 2 | -4/+8 | |
| |\ \ \ | ||||||
| * | | | | First work on decrypt | Dominik Schürmann | 2014-09-14 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | move LogLevel info into LogType enum | Vincent Breitmoser | 2014-09-15 | 1 | -4/+4 | |
| |_|_|/ |/| | | |