Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Adithya Abraham Philip | 2015-06-30 | 1 | -6/+8 |
|\ | |||||
| * | earlier error on empty clipboard | Vincent Breitmoser | 2015-06-30 | 1 | -0/+1 |
| | | |||||
| * | Create key wizard for blank YubiKey | Dominik Schürmann | 2015-06-29 | 1 | -3/+4 |
| | | |||||
| * | cleanup share fragment, fix sharing of fingerprint | Vincent Breitmoser | 2015-06-29 | 1 | -1/+1 |
| | | |||||
| * | Fix strings for transifex | Dominik Schürmann | 2015-06-29 | 1 | -2/+2 |
| | | |||||
* | | migrated Keybase verification | Adithya Abraham Philip | 2015-06-27 | 1 | -0/+9 |
|/ | |||||
* | Language: Remember instead of caching | Dominik Schürmann | 2015-06-26 | 1 | -8/+8 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-26 | 1 | -3/+6 |
|\ | |||||
| * | Notification: follow design guidelines, fix #1313 | Dominik Schürmann | 2015-06-24 | 1 | -3/+6 |
| | | |||||
* | | fix original file deletion (and instrumentation) | Vincent Breitmoser | 2015-06-23 | 1 | -1/+1 |
| | | |||||
* | | implement deletion of files | Vincent Breitmoser | 2015-06-23 | 1 | -5/+9 |
| | | |||||
* | | implement saving of files | Vincent Breitmoser | 2015-06-23 | 1 | -0/+2 |
| | | |||||
* | | instrument: adapt to new decrypt file dialog, and some minor fixes | Vincent Breitmoser | 2015-06-23 | 1 | -1/+1 |
| | | |||||
* | | move select file logic into EncryptDecryptOverviewFragment | Vincent Breitmoser | 2015-06-22 | 1 | -4/+3 |
| | | |||||
* | | don't expose dataset for FileAdapter in encrypt view, small improvements to ↵ | Vincent Breitmoser | 2015-06-22 | 1 | -1/+2 |
| | | | | | | | | error handling | ||||
* | | multi-decrypt: use indeterminate progress only | Vincent Breitmoser | 2015-06-22 | 1 | -0/+1 |
| | | |||||
* | | drop clipboard backwards compatibility for api level < 11 | Vincent Breitmoser | 2015-06-20 | 1 | -1/+3 |
| | | |||||
* | | more work on decrypt fragment ux | Vincent Breitmoser | 2015-06-20 | 1 | -0/+4 |
| | | |||||
* | | handle empty filename in decrypt list | Vincent Breitmoser | 2015-06-19 | 1 | -0/+1 |
| | | |||||
* | | handle EXTRA_TEXT in decrypt activity | Vincent Breitmoser | 2015-06-19 | 1 | -2/+3 |
| | | |||||
* | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-18 | 1 | -0/+1 |
|\| | |||||
| * | more stable nullable behavior in OperationLog | Vincent Breitmoser | 2015-06-18 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-17 | 1 | -0/+1 |
|\| | |||||
| * | fix rest of resource leaks (#1351) | Vincent Breitmoser | 2015-06-17 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'v/instrument' into v/multi-decrypt | Vincent Breitmoser | 2015-06-17 | 1 | -0/+11 |
|\| | | | | | | | | | | | | | Conflicts: .travis.yml OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java | ||||
| * | Merge pull request #1338 from josecastillo/development | Vincent | 2015-06-12 | 1 | -0/+11 |
| |\ | | | | | | | Improved smart card error handling | ||||
| | * | Replace AssertionErrors with snackbar notifications, fix style issues. | Joey Castillo | 2015-06-11 | 1 | -8/+11 |
| | | | |||||
| | * | Improved smart card error handling | Joey Castillo | 2015-06-10 | 1 | -0/+8 |
| | | | |||||
* | | | WIP! Merge branch 'v/eventbus' into v/multi-decrypt | Vincent Breitmoser | 2015-06-07 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java | ||||
| * | | eventbus: initial attempt, replace messenger hack with eventbus communication | Vincent Breitmoser | 2015-06-06 | 1 | -0/+1 |
| |/ | |||||
* | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-06 | 1 | -0/+10 |
|\| | | | | | | | | | | | | | | | | | this also fixes weird-bug Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java OpenKeychain/src/main/res/values/strings.xml | ||||
| * | Merge branch 'v/sticky-prefs' | Vincent Breitmoser | 2015-06-03 | 1 | -0/+8 |
| |\ | |||||
| | * | implement sticky preferences | Vincent Breitmoser | 2015-05-31 | 1 | -0/+8 |
| | | | |||||
| * | | prevent keybase key replacing keyserver key | Adithya Abraham Philip | 2015-05-31 | 1 | -0/+1 |
| |/ | |||||
* / | multi-decrypt: working context menu | Vincent Breitmoser | 2015-06-03 | 1 | -0/+1 |
|/ | |||||
* | prevent NaN dialog on import with no selected keys | Adithya Abraham Philip | 2015-05-31 | 1 | -0/+1 |
| | |||||
* | better error handling for bad encrypted data checksum | Vincent Breitmoser | 2015-05-30 | 1 | -0/+1 |
| | |||||
* | warn on signature earlier than key creation, err on significantly earlier | Vincent Breitmoser | 2015-05-28 | 1 | -0/+1 |
| | |||||
* | don't show allowed key list if no key exists, and some minor ↵ | Vincent Breitmoser | 2015-05-28 | 1 | -1/+1 |
| | | | | PgpDecryptVerify changes | ||||
* | Fix language based on feedback from transifex | Dominik Schürmann | 2015-05-21 | 1 | -1/+1 |
| | |||||
* | Improve strings | Dominik Schürmann | 2015-05-19 | 1 | -24/+24 |
| | |||||
* | check fingerprint length after scanning qr code | Vincent Breitmoser | 2015-05-17 | 1 | -1/+2 |
| | | | | Fixes #1281 | ||||
* | apply promote operation to specific subkeys present on yubikey only | Vincent Breitmoser | 2015-05-17 | 1 | -0/+3 |
| | |||||
* | Moving blank smart card messages to strings.xml | Joey Castillo | 2015-05-13 | 1 | -0/+2 |
| | |||||
* | Add check for exporting two keys to same smart card slot. | Joey Castillo | 2015-05-13 | 1 | -0/+2 |
| | |||||
* | Moving keytocard process into PgpKeyOperation. | Joey Castillo | 2015-05-13 | 1 | -0/+3 |
| | |||||
* | Adding NFC Key to Card operation, accessible from Edit Key activity. | Joey Castillo | 2015-05-12 | 1 | -0/+4 |
| | |||||
* | Fix Bluetooth share without breaking others | William Faulk | 2015-05-04 | 1 | -0/+1 |
| | |||||
* | Merge branch 'development' of https://github.com/Hiperzone/open-keychain ↵ | Dominik Schürmann | 2015-05-04 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | into Hiperzone-development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java | ||||
| * | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Daniel Ramos | 2015-04-26 | 1 | -7/+8 |
| |\ | | | | | | | | | | into development |