Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | linked-ids: rename "cookie" to "token" | Vincent Breitmoser | 2015-05-09 | 1 | -6/+6 |
| | |||||
* | small ui niceties | Vincent Breitmoser | 2015-04-27 | 1 | -5/+5 |
| | |||||
* | display creation dates for ambiguous user ids | Vincent Breitmoser | 2015-04-27 | 1 | -1/+1 |
| | |||||
* | add distinct status for messages signed by "your" key | Vincent Breitmoser | 2015-04-27 | 1 | -0/+1 |
| | |||||
* | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-04-26 | 3 | -10/+18 |
|\ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java OpenKeychain/src/main/res/menu/decrypt_menu.xml | ||||
| * | Switch to new support lib version 22.1 | Dominik Schürmann | 2015-04-25 | 1 | -1/+1 |
| | | |||||
| * | Remove old navigation drawer dependency | Dominik Schürmann | 2015-04-25 | 2 | -9/+1 |
| | | |||||
| * | revamp decrypt ui | Vincent Breitmoser | 2015-04-24 | 1 | -7/+8 |
| | | |||||
| * | Fixed Snackbar behind layout | Manoj Khanna | 2015-04-22 | 1 | -0/+1 |
| | | | | | | | | Surrounded string with quotes | ||||
| * | keyserver verification on addition | Adithya Abraham Philip | 2015-04-22 | 1 | -0/+12 |
| | | |||||
| * | support for handling keyserver urls from browser, added documentation | Adithya Abraham Philip | 2015-04-20 | 1 | -0/+3 |
| | | |||||
* | | update uris and cookie patterns, plus some stylings | Vincent Breitmoser | 2015-04-25 | 1 | -6/+7 |
| | | |||||
* | | change HttpsEditText to generic PrefixEditText | Vincent Breitmoser | 2015-04-25 | 1 | -0/+4 |
| | | |||||
* | | revamp decrypt ui | Vincent Breitmoser | 2015-04-24 | 1 | -7/+8 |
| | | |||||
* | | use CryptoOperationFragment for linked id fragments, and some warning cleanup | Vincent Breitmoser | 2015-04-24 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-24 | 1 | -62/+78 |
|\| | | | | | | | | | | | | | | | | | | | | | Conflicts: Graphics/update-drawables.sh OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| * | Rename advanced to extended | Dominik Schürmann | 2015-03-31 | 1 | -7/+7 |
| | | |||||
| * | From passphrase to password | Dominik Schürmann | 2015-03-31 | 1 | -47/+47 |
| | | |||||
| * | Simplify passphrase dialog design | Dominik Schürmann | 2015-03-31 | 1 | -1/+1 |
| | | |||||
| * | fix Encrypt* with RequiredInputParcel | Vincent Breitmoser | 2015-03-30 | 1 | -1/+0 |
| | | |||||
| * | Fix strings with email address | Dominik Schürmann | 2015-03-29 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-29 | 1 | -0/+1 |
| |\ | |||||
| * \ | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-24 | 1 | -25/+12 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java | ||||
| * | | | further improve yubikey error handling | Vincent Breitmoser | 2015-03-23 | 1 | -0/+1 |
| | | | | |||||
| * | | | nicer handling of nfc errors | Vincent Breitmoser | 2015-03-23 | 1 | -0/+1 |
| | | | | |||||
| * | | | enable nfc in import dialog as well | Vincent Breitmoser | 2015-03-22 | 1 | -1/+2 |
| | | | | |||||
| * | | | finish ui flow for yubikey import | Vincent Breitmoser | 2015-03-22 | 1 | -6/+8 |
| | | | | |||||
| * | | | actually promote to divert, pass yubikey's AID | Vincent Breitmoser | 2015-03-22 | 1 | -1/+3 |
| | | | | |||||
| * | | | improve status reporting in yubikey dialogue | Vincent Breitmoser | 2015-03-22 | 1 | -0/+4 |
| | | | | |||||
| * | | | move yubikey import into viewkeyfragment | Vincent Breitmoser | 2015-03-22 | 1 | -0/+2 |
| | | | | |||||
| * | | | add edit key unit test for no-op | Vincent Breitmoser | 2015-03-20 | 1 | -0/+1 |
| | | | | |||||
| * | | | fix unit tests (for real) | Vincent Breitmoser | 2015-03-20 | 1 | -2/+4 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-03-20 | 1 | -3/+5 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java | ||||
| * | | | | support yubikeys in (some) edit key operations | Vincent Breitmoser | 2015-03-20 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | yubikey certifications! | Vincent Breitmoser | 2015-03-18 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | minor ui and wording changes | Vincent Breitmoser | 2015-04-09 | 1 | -4/+4 |
| | | | | | |||||
* | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-09 | 1 | -25/+13 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| * | | | | -Fixed a situation where additional emails could be duplicated when creating ↵ | Daniel Ramos | 2015-03-27 | 1 | -0/+1 |
| | |_|/ | |/| | | | | | | | | | | a new key -If CreateKeyEmailFragment view is recreated, the array of additional emails won't be repopulated again if its not null, avoiding new reallocations. -if CreateKeyEmailFragment view is recreated, the email adapter wont be recreated if its not null, avoiding new reallocations. | ||||
| * | | | 3.2beta3 | Dominik Schürmann | 2015-03-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | translation fixes | Dominik Schürmann | 2015-03-23 | 1 | -20/+0 |
| | | | | |||||
| * | | | Fix language problems reported by yahoe.001 on transifex | Dominik Schürmann | 2015-03-23 | 1 | -4/+9 |
| | | | | |||||
| * | | | introduced multi-threading | Adithya Abraham Philip | 2015-03-23 | 1 | -0/+2 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor | ||||
* | | | even more linked id ui work | Vincent Breitmoser | 2015-03-29 | 1 | -0/+1 |
| | | | |||||
* | | | more (subtle) ui work | Vincent Breitmoser | 2015-03-26 | 1 | -8/+8 |
| | | | |||||
* | | | some linked id ui fine tuning | Vincent Breitmoser | 2015-03-26 | 1 | -1/+9 |
| | | | |||||
* | | | secret/public distinction in LinkedIdView | Vincent Breitmoser | 2015-03-24 | 1 | -0/+9 |
| | | | |||||
* | | | work on cookie scanning during creation | Vincent Breitmoser | 2015-03-24 | 1 | -0/+7 |
| | | | |||||
* | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-24 | 1 | -4/+8 |
|\| | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| * | | Manage my keys wizard | Dominik Schürmann | 2015-03-19 | 1 | -3/+5 |
| |/ | |||||
| * | Allow for hidden recipients in encrypt methods | Dominik Schürmann | 2015-03-16 | 1 | -0/+1 |
| | |