| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | | | | | | | | | | | handle empty filename in decrypt list | Vincent Breitmoser | 2015-06-19 | 2 | -1/+6 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | handle EXTRA_TEXT in decrypt activity | Vincent Breitmoser | 2015-06-19 | 2 | -23/+61 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | save instance state in DecryptListFragment | Vincent Breitmoser | 2015-06-19 | 2 | -26/+146 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | rename activities to match new purpose | Vincent Breitmoser | 2015-06-18 | 7 | -25/+31 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-18 | 2 | -9/+22 | |
| |\| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | more stable nullable behavior in OperationLog | Vincent Breitmoser | 2015-06-18 | 2 | -9/+22 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | fix ToolableViewAnimator (againl) | Vincent Breitmoser | 2015-06-18 | 1 | -1/+8 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | handle multiple input URIs and Intent.SEND_MULTIPLE | Vincent Breitmoser | 2015-06-18 | 6 | -54/+96 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | fix typo in excluder activity name | Vincent Breitmoser | 2015-06-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | minor code style fixes | Vincent Breitmoser | 2015-06-18 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | fix small oversight in ToolableViewAnimator | Vincent Breitmoser | 2015-06-18 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-17 | 9 | -80/+102 | |
| |\| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | fix rest of resource leaks (#1351) | Vincent Breitmoser | 2015-06-17 | 7 | -65/+79 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | fix a couple of resource leaks (#1351) | Vincent Breitmoser | 2015-06-17 | 2 | -15/+23 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge branch 'v/instrument' into v/multi-decrypt | Vincent Breitmoser | 2015-06-17 | 29 | -473/+398 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .travis.yml OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java | |||||
| | * | | | | | | | | | | | | | | | fix filesize reporting in decrypt operation | Vincent Breitmoser | 2015-06-17 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | instrument: use contrib drawer methods, respect passphrase cache | Vincent Breitmoser | 2015-06-17 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | nicer preview of decrypt_text_fragment layout | Vincent Breitmoser | 2015-06-17 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | fix nullpointer in ViewKeyFragment | Vincent Breitmoser | 2015-06-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | fix returned text of cleartext verify | Vincent Breitmoser | 2015-06-17 | 1 | -4/+5 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | use KeyAdapter in KeySpinner | Vincent Breitmoser | 2015-06-17 | 10 | -259/+146 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | improve preview of ViewKeyActivity layout | Vincent Breitmoser | 2015-06-17 | 1 | -1/+10 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | fix symmetric text decryption | Vincent Breitmoser | 2015-06-17 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | preliminary EditKeyTest | Vincent Breitmoser | 2015-06-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | return actual last log entry, including from sublogentryparcels | Vincent Breitmoser | 2015-06-17 | 1 | -1/+5 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | fix recursive log in modifySecretKeyRing | Vincent Breitmoser | 2015-06-17 | 2 | -8/+3 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | instrument: change handling in PassphraseDialogActivity to work with espresso | Vincent Breitmoser | 2015-06-17 | 1 | -76/+32 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | instrument: work on instrumentation tests | Vincent Breitmoser | 2015-06-17 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | add extra to disregard first-time dialog to main activity | Vincent Breitmoser | 2015-06-17 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | instrument: add helper method for snackbar checking | Vincent Breitmoser | 2015-06-17 | 1 | -16/+7 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | (minor) layout changes | Vincent Breitmoser | 2015-06-17 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | add ToolableViewAnimator | Vincent Breitmoser | 2015-06-17 | 2 | -0/+65 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Merge pull request #1338 from josecastillo/development | Vincent | 2015-06-12 | 3 | -23/+169 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved smart card error handling | |||||
| | | * | | | | | | | | | | | | | | | Replace AssertionErrors with snackbar notifications, fix style issues. | Joey Castillo | 2015-06-11 | 2 | -50/+51 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | Improved smart card error handling | Joey Castillo | 2015-06-10 | 3 | -23/+168 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | some bugfixes for new CryptoOperationFragment | Vincent Breitmoser | 2015-06-11 | 3 | -70/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into v/eventbus | Vincent Breitmoser | 2015-06-11 | 7 | -21/+18 | |
| | |\| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | fix status icon alignment | Vincent Breitmoser | 2015-06-14 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | (minor) layout changes | Vincent Breitmoser | 2015-06-13 | 2 | -3/+2 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | add ToolableViewAnimator | Vincent Breitmoser | 2015-06-11 | 4 | -9/+78 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-11 | 7 | -21/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Fix debug/release build separation | Dominik Schürmann | 2015-06-11 | 2 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Temporary fix for testDebug | Dominik Schürmann | 2015-06-10 | 1 | -4/+2 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Use authority res strings | Dominik Schürmann | 2015-06-10 | 1 | -5/+2 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Allow debug build besides release build | Dominik Schürmann | 2015-06-10 | 7 | -15/+17 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | multi-decrypt: switch to cardview | Vincent Breitmoser | 2015-06-10 | 1 | -9/+15 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | fix progress for decrypt | Vincent Breitmoser | 2015-06-10 | 3 | -14/+37 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Merge branch 'v/eventbus' into v/multi-decrypt | Vincent Breitmoser | 2015-06-10 | 21 | -253/+269 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java | |||||
| | * | | | | | | | | | | | | | | | | backport CryptoOperationFragment changes without eventbus | Vincent Breitmoser | 2015-06-10 | 19 | -244/+237 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into v/eventbus | Vincent Breitmoser | 2015-06-10 | 3 | -5/+32 | |
| | |\| | | | | | | | | | | | | | | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |