Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-15 | 10 | -84/+97 |
|\ | |||||
| * | Keys found on multiple servers are now imported from all of them | Tim Bray | 2014-09-13 | 2 | -11/+9 |
| | | |||||
| * | Change shuffle to rotate, and when merging ImportKeysList entries, if either ↵ | Tim Bray | 2014-09-13 | 1 | -2/+2 |
| | | | | | | | | side is revoked/expired, the merge reflects that | ||||
| * | Restore Yubikey setting, lost in fumble-fingered merge | Tim Bray | 2014-09-13 | 1 | -0/+7 |
| | | |||||
| * | Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs | Tim Bray | 2014-09-13 | 10 | -89/+94 |
| | | |||||
| * | work on OperationResultParcel | Vincent Breitmoser | 2014-09-14 | 1 | -2/+5 |
| | | |||||
* | | New decrypt activity design (WIP), saner UTF8 decoding (replacing ↵ | Dominik Schürmann | 2014-09-15 | 9 | -13/+150 |
| | | | | | | | | non-decodable characters) | ||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-14 | 1 | -1/+25 |
|\| | |||||
| * | add SignEncryptResult parcel (probably break stuff) | Vincent Breitmoser | 2014-09-14 | 1 | -1/+25 |
| | | |||||
* | | First work on decrypt | Dominik Schürmann | 2014-09-14 | 3 | -2/+2 |
|/ | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-13 | 1 | -1/+1 |
|\ | |||||
| * | add key id to trailing asym data log msg | Vincent Breitmoser | 2014-09-13 | 1 | -1/+1 |
| | | |||||
* | | Custom actionbar to indicate swipe down effect | Dominik Schürmann | 2014-09-13 | 2 | -0/+15 |
|/ | |||||
* | log warning on bad uid encoding | Vincent Breitmoser | 2014-09-13 | 1 | -0/+1 |
| | |||||
* | Merge branch 'result-parcels' | Vincent Breitmoser | 2014-09-13 | 1 | -0/+38 |
|\ | |||||
| * | some DecryptVerify log refinements | Vincent Breitmoser | 2014-09-13 | 1 | -2/+2 |
| | | |||||
| * | add a ton of logging to DecryptVerify | Vincent Breitmoser | 2014-09-13 | 1 | -0/+38 |
| | | |||||
* | | More smaller UI fixes | Dominik Schürmann | 2014-09-13 | 1 | -0/+1 |
| | | |||||
* | | Implemented Pull2Refresh in the KeyListFragment | Daniel Albert | 2014-09-12 | 1 | -75/+71 |
|/ | | | | | | Added KeyUpdateHelper and extended ProviderHelper for better fingerprint collection Added a class for handling the list in the swipe2refresh layout that prevents scrolling bugs Added Pull2Refresh to the KeyListFragment | ||||
* | add ui support for stripping subkeys | Vincent Breitmoser | 2014-09-11 | 1 | -0/+3 |
| | |||||
* | Changelog 2.9.2 | Dominik Schürmann | 2014-09-09 | 1 | -0/+6 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-08 | 1 | -0/+5 |
|\ | |||||
| * | introduce SingletonResult for... singleton results | Vincent Breitmoser | 2014-09-08 | 1 | -3/+3 |
| | | |||||
| * | Properly handle uneditable key types in EditKeyFragment | Vincent Breitmoser | 2014-09-08 | 1 | -0/+5 |
| | | | | | | | | | | | | | | More specifically, return an OperationResultParcel for stripped and divert-to-card keys, with an appropriate error message in the log. part of #828 | ||||
* | | Fix changelog versioning | Dominik Schürmann | 2014-09-08 | 1 | -1/+1 |
|/ | |||||
* | Pull from transifex | Dominik Schürmann | 2014-09-08 | 51 | -775/+1115 |
| | |||||
* | Changelog 2.10 | Dominik Schürmann | 2014-09-08 | 1 | -0/+14 |
| | |||||
* | Fix problems in strings.xml | Dominik Schürmann | 2014-09-07 | 1 | -31/+36 |
| | |||||
* | flag revoked, epired and unavailable keys in selection spinner | Vincent Breitmoser | 2014-09-07 | 1 | -10/+34 |
| | |||||
* | Remove table layout, use hint text for edit fields | Dominik Schürmann | 2014-09-07 | 2 | -83/+65 |
| | |||||
* | Put quotes around all strings, should fix transifex consistency problems, ↵ | Dominik Schürmann | 2014-09-07 | 1 | -646/+646 |
| | | | | also see http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to Escaping apostrophes and quotes) | ||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-07 | 2 | -18/+52 |
|\ | |||||
| * | add proper async check for correct passphrase to passphrasedialog | Vincent Breitmoser | 2014-09-07 | 2 | -18/+52 |
| | | |||||
* | | Two buttons to encrypt files and text, some fixes | Dominik Schürmann | 2014-09-07 | 2 | -13/+42 |
|/ | |||||
* | Better symmetric encryption layout | Dominik Schürmann | 2014-09-07 | 1 | -38/+23 |
| | |||||
* | More UI rework | Dominik Schürmann | 2014-09-07 | 6 | -108/+154 |
| | |||||
* | Fix width for encrypt to | Dominik Schürmann | 2014-09-07 | 1 | -1/+1 |
| | |||||
* | Remove file menu items from text activity | Dominik Schürmann | 2014-09-06 | 2 | -4/+19 |
| | |||||
* | Add experimental support for yubikey PINs, remove caching of empty passphrases | Dominik Schürmann | 2014-09-05 | 1 | -0/+1 |
| | |||||
* | Add yubikey default PIN preference | Dominik Schürmann | 2014-09-05 | 2 | -0/+9 |
| | |||||
* | Safeslinger: icon, about info | Dominik Schürmann | 2014-09-04 | 6 | -1/+3 |
| | |||||
* | Integrate safeslinger share | Dominik Schürmann | 2014-09-04 | 1 | -0/+17 |
| | |||||
* | Fix strings | Dominik Schürmann | 2014-09-02 | 1 | -2/+2 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2014-09-02 | 46 | -377/+1228 |
| | |||||
* | Catch security exception, known problem... | Dominik Schürmann | 2014-09-02 | 1 | -0/+1 |
| | |||||
* | cache key s2k type in database, for later use | Vincent Breitmoser | 2014-09-02 | 1 | -3/+8 |
| | |||||
* | rename EncryptMessageFragment -> EncryptTextFragment | Vincent Breitmoser | 2014-09-01 | 1 | -1/+1 |
| | |||||
* | split EncryptActivity into Encrypt{Text,File}Activity | Vincent Breitmoser | 2014-09-01 | 8 | -16/+49 |
| | |||||
* | remove "sign" and "verify" from drawer texts | Vincent Breitmoser | 2014-09-01 | 1 | -2/+2 |
| | |||||
* | small ui changes in encrypt | Vincent Breitmoser | 2014-09-01 | 3 | -11/+12 |
| |