Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Use key icons in import, prettify items | Dominik Schürmann | 2014-09-18 | 5 | -10/+36 | |
| | ||||||
* | Fixes for nfc decrypt | Dominik Schürmann | 2014-09-18 | 3 | -9/+18 | |
| | ||||||
* | Fix nfc signing | Dominik Schürmann | 2014-09-18 | 2 | -2/+2 | |
| | ||||||
* | 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 | 2 | -3/+16 | |
| | ||||||
* | 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 | 73 | -262/+236 | |
| | | | | created ui.util for everything related to formatting | |||||
* | PassphraseDialogActivity usage in Remote API | Dominik Schürmann | 2014-09-17 | 3 | -45/+33 | |
| | ||||||
* | Fix cleartext verify | Dominik Schürmann | 2014-09-17 | 3 | -2/+21 | |
| | ||||||
* | Passphrase handling in encrypt | Dominik Schürmann | 2014-09-17 | 5 | -42/+80 | |
| | ||||||
* | Result parcel refactorings (WIP) | Dominik Schürmann | 2014-09-17 | 9 | -157/+189 | |
| | ||||||
* | fix encrypt/decrypt classes | Vincent Breitmoser | 2014-09-17 | 1 | -3/+0 | |
| | ||||||
* | 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 | 12 | -183/+308 | |
| | ||||||
* | Fix construction of algorithmID in Keybase result lists | Tim Bray | 2014-09-15 | 1 | -2/+2 | |
| | ||||||
* | minor fix for passphrase test | Vincent Breitmoser | 2014-09-15 | 1 | -1/+1 | |
| | ||||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-09-15 | 30 | -665/+884 | |
|\ | | | | | | | | | | | 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 | |
| | | ||||||
| * | Fix build | Dominik Schürmann | 2014-09-15 | 1 | -1/+0 | |
| | | ||||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-15 | 45 | -587/+571 | |
| |\ | ||||||
| | * | update for new plural origins on ImportKeyListEntry | Tim Bray | 2014-09-13 | 1 | -1/+1 | |
| | | | ||||||
| | * | Keys found on multiple servers are now imported from all of them | Tim Bray | 2014-09-13 | 5 | -27/+40 | |
| | | | ||||||
| | * | Change shuffle to rotate, and when merging ImportKeysList entries, if either ↵ | Tim Bray | 2014-09-13 | 3 | -5/+15 | |
| | | | | | | | | | | | | side is revoked/expired, the merge reflects that | |||||
| | * | Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs | Tim Bray | 2014-09-13 | 16 | -438/+407 | |
| | | | ||||||
| * | | New decrypt activity design (WIP), saner UTF8 decoding (replacing ↵ | Dominik Schürmann | 2014-09-15 | 9 | -139/+366 | |
| | | | | | | | | | | | | non-decodable characters) | |||||
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-14 | 7 | -213/+379 | |
| |\ \ | ||||||
| * \ \ | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-14 | 3 | -30/+34 | |
| |\ \ \ | ||||||
| * | | | | First work on decrypt | Dominik Schürmann | 2014-09-14 | 2 | -2/+3 | |
| | | | | | ||||||
* | | | | | move LogLevel info into LogType enum | Vincent Breitmoser | 2014-09-15 | 10 | -471/+461 | |
| |_|_|/ |/| | | | ||||||
* | | | | work on OperationResultParcel | Vincent Breitmoser | 2014-09-14 | 26 | -111/+101 | |
| | | | | ||||||
* | | | | pending results are a type of non-success | Vincent Breitmoser | 2014-09-14 | 6 | -10/+12 | |
| |_|/ |/| | | ||||||
* | | | (forgot a file for previous commit) | Vincent Breitmoser | 2014-09-14 | 1 | -0/+103 | |
| | | | ||||||
* | | | add SignEncryptResult parcel (probably break stuff) | Vincent Breitmoser | 2014-09-14 | 6 | -213/+276 | |
| |/ |/| | ||||||
* | | Temporary fix for #848, fixed pull2refresh bugs | Daniel Albert | 2014-09-13 | 3 | -30/+34 | |
|/ | ||||||
* | Hack to disable overscroll effect of swipe to update | Dominik Schürmann | 2014-09-13 | 2 | -15/+13 | |
| | ||||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-13 | 2 | -3/+10 | |
|\ | ||||||
| * | add key id to trailing asym data log msg | Vincent Breitmoser | 2014-09-13 | 1 | -3/+6 | |
| | | ||||||
| * | just skip foreign uid certifications during import for now | Vincent Breitmoser | 2014-09-13 | 1 | -0/+4 | |
| | | | | | | | | Related to #836, fix still pending | |||||
* | | Custom actionbar to indicate swipe down effect | Dominik Schürmann | 2014-09-13 | 1 | -0/+51 | |
|/ | ||||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-09-13 | 1 | -1/+7 | |
|\ | ||||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-13 | 2 | -0/+5 | |
| |\ | ||||||
| * | | Set literal data format tag to UTF8 when encrypting text | Dominik Schürmann | 2014-09-13 | 1 | -1/+7 | |
| | | | ||||||
* | | | move IS_REVOKED table prefix to the right places | Vincent Breitmoser | 2014-09-13 | 5 | -6/+9 | |
| |/ |/| | | | | | Fixes #849 | |||||
* | | very small fix, don't show name on encoding warning | Vincent Breitmoser | 2014-09-13 | 1 | -2/+1 | |
| | | ||||||
* | | log warning on bad uid encoding | Vincent Breitmoser | 2014-09-13 | 2 | -0/+6 | |
|/ | ||||||
* | Merge branch 'result-parcels' | Vincent Breitmoser | 2014-09-13 | 8 | -214/+344 | |
|\ | ||||||
| * | some DecryptVerify log refinements | Vincent Breitmoser | 2014-09-13 | 1 | -5/+13 | |
| | | ||||||
| * | add a ton of logging to DecryptVerify | Vincent Breitmoser | 2014-09-13 | 3 | -26/+128 | |
| | |