Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix encrypt activity layout | Vincent Breitmoser | 2015-04-24 | 1 | -2/+1 |
* | revamp decrypt ui | Vincent Breitmoser | 2015-04-24 | 3 | -149/+347 |
* | don't show key spinner for a single entry | Vincent Breitmoser | 2015-04-24 | 2 | -1/+10 |
* | use CryptoOperationFragment for linked id fragments, and some warning cleanup | Vincent Breitmoser | 2015-04-24 | 4 | -76/+30 |
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-24 | 52 | -2299/+2855 |
|\ | |||||
| * | Use portrait mode for qr code scanning | Dominik Schürmann | 2015-04-15 | 1 | -10/+8 |
| * | More cleanup | Dominik Schürmann | 2015-04-15 | 9 | -324/+28 |
| * | Fix YubiKey naming, cleanup | Dominik Schürmann | 2015-04-15 | 7 | -53/+45 |
| * | Clean up NfcOperationActivity | Dominik Schürmann | 2015-04-15 | 1 | -8/+6 |
| * | Reformat nfcVerifyPIN | Dominik Schürmann | 2015-04-15 | 1 | -6/+6 |
| * | Consolidate PIN verify operation in nfcVerifyPIN method. | Joey Castillo | 2015-04-14 | 1 | -44/+28 |
| * | Move PIN verify inside sign/decrypt operation and set correct mode. | Joey Castillo | 2015-04-14 | 1 | -19/+45 |
| * | Merge pull request #1193 from adithyaphilip/auto-refresh-contacts | Dominik Schürmann | 2015-04-13 | 1 | -21/+85 |
| |\ | |||||
| | * | hide linked system contact card if no contact present | Adithya Abraham Philip | 2015-04-08 | 1 | -9/+23 |
| | * | linked system contact auto-refresh added, fixed contact image issue | Adithya Abraham Philip | 2015-04-08 | 1 | -20/+70 |
| * | | IMplement CryptoInputParcelCacheService | Dominik Schürmann | 2015-04-13 | 2 | -8/+4 |
| * | | Cache CryptoInputParcel in OpenPgpService | Dominik Schürmann | 2015-04-10 | 2 | -8/+10 |
| * | | Fix nullpointer with Intent API, fix clearing of encrypt file list, notify wh... | Dominik Schürmann | 2015-04-04 | 2 | -6/+7 |
| * | | fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename) | Vincent Breitmoser | 2015-04-01 | 5 | -105/+25 |
| * | | Prepare decrypt UI for input parcel | Dominik Schürmann | 2015-03-31 | 2 | -124/+58 |
| * | | Better check if file is already added | Dominik Schürmann | 2015-03-31 | 1 | -19/+42 |
| * | | Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychai... | Dominik Schürmann | 2015-03-31 | 3 | -2/+16 |
| |\ \ | |||||
| | * | | work on passphrase data flow | Vincent Breitmoser | 2015-03-31 | 3 | -2/+16 |
| * | | | Simplify passphrase dialog design | Dominik Schürmann | 2015-03-31 | 1 | -2/+3 |
| |/ / | |||||
| * | | Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychai... | Vincent Breitmoser | 2015-03-30 | 6 | -120/+332 |
| |\ \ | |||||
| | * | | Dont show slinger button in spinner | Dominik Schürmann | 2015-03-30 | 1 | -0/+2 |
| | * | | Use RecyclerView in EncryptFilesFragment | Dominik Schürmann | 2015-03-30 | 5 | -121/+331 |
| * | | | remove unused NfcActivity | Vincent Breitmoser | 2015-03-30 | 2 | -574/+5 |
| * | | | fix Encrypt* with RequiredInputParcel | Vincent Breitmoser | 2015-03-30 | 11 | -281/+48 |
| * | | | pass CryptoInputParcel independently for SignEncryptOperation | Vincent Breitmoser | 2015-03-30 | 3 | -15/+8 |
| |/ / | |||||
| * | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-30 | 4 | -392/+400 |
| |\| | |||||
| * | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-29 | 1 | -12/+36 |
| |\ \ | |||||
| * | | | Fixing crashes with new encrypt ui | Dominik Schürmann | 2015-03-29 | 3 | -32/+49 |
| * | | | Start reworking decrypt ui classes | Dominik Schürmann | 2015-03-27 | 3 | -172/+197 |
| * | | | Refactoring of EncryptTextActivity | Dominik Schürmann | 2015-03-27 | 8 | -400/+415 |
| * | | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-26 | 1 | -14/+76 |
| |\ \ \ | |||||
| * | | | | Start refactoring encrypt ui, EncryptFileActivity no longer crashing | Dominik Schürmann | 2015-03-26 | 6 | -506/+531 |
| * | | | | Fix certify with CryptoInputParcel | Dominik Schürmann | 2015-03-25 | 3 | -10/+6 |
| * | | | | Remove backward compat in CertifyKeyFragment | Dominik Schürmann | 2015-03-25 | 1 | -17/+1 |
| * | | | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-24 | 24 | -142/+299 |
| |\ \ \ \ | |||||
| * | | | | | further improve yubikey error handling | Vincent Breitmoser | 2015-03-23 | 2 | -18/+39 |
| * | | | | | nicer handling of nfc errors | Vincent Breitmoser | 2015-03-23 | 1 | -5/+8 |
| * | | | | | Merge branch 'development' into v/crypto-input-parcel | Vincent Breitmoser | 2015-03-22 | 1 | -14/+23 |
| |\ \ \ \ \ | |||||
| * | | | | | | enable nfc in import dialog as well | Vincent Breitmoser | 2015-03-22 | 3 | -5/+49 |
| * | | | | | | finish ui flow for yubikey import | Vincent Breitmoser | 2015-03-22 | 6 | -197/+329 |
| * | | | | | | actually promote to divert, pass yubikey's AID | Vincent Breitmoser | 2015-03-22 | 1 | -8/+9 |
| * | | | | | | improve status reporting in yubikey dialogue | Vincent Breitmoser | 2015-03-22 | 1 | -11/+102 |
| * | | | | | | move yubikey import into viewkeyfragment | Vincent Breitmoser | 2015-03-22 | 6 | -158/+259 |
| * | | | | | | split up wait/action yubikey fragments | Vincent Breitmoser | 2015-03-21 | 4 | -64/+137 |
| * | | | | | | work on ad-hoc yubikey import support | Vincent Breitmoser | 2015-03-21 | 3 | -18/+270 |