Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-04-26 | 54 | -238/+1111 |
|\ | | | | | | | | | | | | | 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 | 16 | -16/+162 |
| | | |||||
| * | Switch to new support lib version 22.1 | Dominik Schürmann | 2015-04-25 | 13 | -52/+30 |
| | | |||||
| * | Update in-app contributor list | Dominik Schürmann | 2015-04-25 | 1 | -3/+22 |
| | | |||||
| * | 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 |
| | | |||||
| * | Update lib section in about | Dominik Schürmann | 2015-04-25 | 1 | -2/+2 |
| | | |||||
| * | Remove old navigation drawer dependency | Dominik Schürmann | 2015-04-25 | 3 | -12/+1 |
| | | |||||
| * | Merge pull request #1220 from vectorijk/SwitchToMaterialDrawer | Dominik Schürmann | 2015-04-25 | 4 | -20/+192 |
| |\ | | | | | | | Switch to MaterialDrawer library | ||||
| | * | Fix #1197 Switch to MaterialDrawer library | vectorijk | 2015-04-24 | 2 | -46/+89 |
| | | | |||||
| | * | Introduce and Switch to mikepenz/MaterialDrawer | vectorijk | 2015-04-24 | 4 | -25/+154 |
| | | | |||||
| * | | fix encrypt activity layout | Vincent Breitmoser | 2015-04-24 | 2 | -3/+4 |
| | | | |||||
| * | | revamp decrypt ui | Vincent Breitmoser | 2015-04-24 | 7 | -230/+391 |
| |/ | |||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-04-22 | 8 | -30/+449 |
| |\ | | | | | | | | | | development | ||||
| | * | Fixed Snackbar behind layout | Manoj Khanna | 2015-04-22 | 5 | -29/+29 |
| | | | | | | | | | | | | Surrounded string with quotes | ||||
| | * | keyserver verification on addition | Adithya Abraham Philip | 2015-04-22 | 4 | -1/+420 |
| | | | |||||
| * | | Update changelog | Dominik Schürmann | 2015-04-22 | 1 | -6/+8 |
| |/ | |||||
| * | 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 | 10 | -52/+212 |
| |\ | | | | | | | | | | 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 | 8 | -37/+167 |
| | | | |||||
| * | | 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 | 11 | -33/+65 |
| | | |||||
* | | change HttpsEditText to generic PrefixEditText | Vincent Breitmoser | 2015-04-25 | 5 | -10/+27 |
| | | |||||
* | | fix encrypt activity layout | Vincent Breitmoser | 2015-04-24 | 2 | -3/+4 |
| | | |||||
* | | revamp decrypt ui | Vincent Breitmoser | 2015-04-24 | 7 | -230/+391 |
| | | |||||
* | | 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 | 6 | -80/+38 |
| | | |||||
* | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-24 | 236 | -4752/+6846 |
|\| | | | | | | | | | | | | | | | | | | | | | 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 | 11 | -67/+59 |
| | | |||||
| * | 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 |
| | | |||||
| * | Update libs | Dominik Schürmann | 2015-04-14 | 1 | -6/+6 |
| | | |||||
| * | Pull from transifex | Dominik Schürmann | 2015-04-14 | 110 | -1110/+1555 |
| | | |||||
| * | Update html-textview, fix build | Dominik Schürmann | 2015-04-14 | 1 | -2/+2 |
| | | |||||
| * | 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 | 3 | -39/+119 |
| |\ | | | | | | | 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 | 3 | -12/+25 |
| | | | |||||
| | * | 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 | 7 | -100/+325 |
| | | |