Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-04-26 | 27 | -183/+802 |
|\ | | | | | | | | | | | | | 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 | ||||
| * | Put decrypt result in toolbar, some ui fixes for decrypt | Dominik Schürmann | 2015-04-26 | 2 | -12/+13 |
| | | |||||
| * | Switch to new support lib version 22.1 | Dominik Schürmann | 2015-04-25 | 10 | -41/+19 |
| | | |||||
| * | Set different titles when changing in nav drawer | Dominik Schürmann | 2015-04-25 | 1 | -6/+10 |
| | | |||||
| * | Fix empty screen when clicking on encrypt in details view | Dominik Schürmann | 2015-04-25 | 1 | -5/+2 |
| | | |||||
| * | Merge pull request #1220 from vectorijk/SwitchToMaterialDrawer | Dominik Schürmann | 2015-04-25 | 1 | -20/+154 |
| |\ | | | | | | | Switch to MaterialDrawer library | ||||
| | * | Fix #1197 Switch to MaterialDrawer library | vectorijk | 2015-04-24 | 1 | -44/+85 |
| | | | |||||
| | * | Introduce and Switch to mikepenz/MaterialDrawer | vectorijk | 2015-04-24 | 1 | -25/+118 |
| | | | |||||
| * | | fix encrypt activity layout | Vincent Breitmoser | 2015-04-24 | 1 | -2/+1 |
| | | | |||||
| * | | revamp decrypt ui | Vincent Breitmoser | 2015-04-24 | 3 | -149/+347 |
| |/ | |||||
| * | Fixed Snackbar behind layout | Manoj Khanna | 2015-04-22 | 2 | -13/+13 |
| | | | | | | | | Surrounded string with quotes | ||||
| * | keyserver verification on addition | Adithya Abraham Philip | 2015-04-22 | 2 | -1/+379 |
| | | |||||
| * | corrected possible null pointer | Adithya Abraham Philip | 2015-04-22 | 1 | -1/+1 |
| | | |||||
| * | Simplify ImportKeysProxyActivity | Dominik Schürmann | 2015-04-21 | 1 | -29/+12 |
| | | |||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-04-21 | 8 | -52/+192 |
| |\ | | | | | | | | | | development | ||||
| | * | added log to QR code scan/import fail | Adithya Abraham Philip | 2015-04-21 | 1 | -12/+11 |
| | | | |||||
| | * | Fix for initialization failure when card returns FCI in data field. | Joey Castillo | 2015-04-20 | 1 | -1/+1 |
| | | | |||||
| | * | Track state of PIN verification on smart card; only verify when needed. | Joey Castillo | 2015-04-20 | 1 | -2/+33 |
| | | | |||||
| | * | support for handling keyserver urls from browser, added documentation | Adithya Abraham Philip | 2015-04-20 | 6 | -37/+147 |
| | | | |||||
| * | | Cleanup in HkpKeyserver | Dominik Schürmann | 2015-04-20 | 1 | -4/+3 |
| |/ | |||||
| * | Format KeyListFragment | Dominik Schürmann | 2015-04-18 | 1 | -10/+9 |
| | | |||||
| * | Temporarily fix devices without nfc | Dominik Schürmann | 2015-04-18 | 1 | -0/+6 |
| | | |||||
* | | update uris and cookie patterns, plus some stylings | Vincent Breitmoser | 2015-04-25 | 7 | -17/+53 |
| | | |||||
* | | change HttpsEditText to generic PrefixEditText | Vincent Breitmoser | 2015-04-25 | 2 | -6/+13 |
| | | |||||
* | | 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 | 97 | -3441/+4758 |
|\| | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | 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 | 10 | -62/+54 |
| | | |||||
| * | 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 |
| | | |||||
| * | Reformat comment in PassphraseCacheService | Dominik Schürmann | 2015-04-13 | 1 | -4/+5 |
| | | |||||
| * | Buffer ascii armored encryption/signatures | Dominik Schürmann | 2015-04-13 | 2 | -3/+4 |
| | | |||||
| * | Merge pull request #1193 from adithyaphilip/auto-refresh-contacts | Dominik Schürmann | 2015-04-13 | 2 | -39/+118 |
| |\ | | | | | | | Immediate display of contact card, fixed contact picture display issue, hides card if no contact | ||||
| | * | hide linked system contact card if no contact present | Adithya Abraham Philip | 2015-04-08 | 2 | -12/+24 |
| | | | |||||
| | * | linked system contact auto-refresh added, fixed contact image issue | Adithya Abraham Philip | 2015-04-08 | 2 | -38/+105 |
| | | | |||||
| * | | IMplement CryptoInputParcelCacheService | Dominik Schürmann | 2015-04-13 | 6 | -100/+321 |
| | | | |||||
| * | | Clearer var naming | Dominik Schürmann | 2015-04-12 | 1 | -8/+8 |
| | | | |||||
| * | | More simplifications to PassphraseCacheService | Dominik Schürmann | 2015-04-12 | 1 | -27/+21 |
| | | | |||||
| * | | Simplify PassphraseCacheService | Dominik Schürmann | 2015-04-12 | 1 | -16/+12 |
| | | | |||||
| * | | Cache CryptoInputParcel in OpenPgpService | Dominik Schürmann | 2015-04-10 | 4 | -24/+69 |
| | | | |||||
| * | | Remove unused AlgorithmNames | Dominik Schürmann | 2015-04-10 | 1 | -93/+0 |
| | | | |||||
| * | | Add license headers | Dominik Schürmann | 2015-04-10 | 3 | -0/+51 |
| | | | |||||
| * | | Externalize Parcelable caching | Dominik Schürmann | 2015-04-10 | 2 | -59/+106 |
| | | | |||||
| * | | Fix signing subkey selection in remote service | Dominik Schürmann | 2015-04-07 | 2 | -20/+52 |
| | | |