Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix language based on feedback from transifex | Dominik Schürmann | 2015-05-21 | 1 | -1/+1 |
| | |||||
* | 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 |
| | |||||
* | Version 3.2 | Dominik Schürmann | 2015-05-06 | 23 | -23/+23 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2015-05-06 | 10 | -141/+163 |
| | |||||
* | Renaming for consisitency | Dominik Schürmann | 2015-05-06 | 1 | -5/+5 |
| | |||||
* | Move error overlay into generalized DecryptFragment, better error handling ↵ | Dominik Schürmann | 2015-05-06 | 1 | -76/+126 |
| | | | | in DecryptTextActivity | ||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-05-05 | 1 | -0/+1 |
|\ | | | | | | | development | ||||
| * | Fix Bluetooth share without breaking others | William Faulk | 2015-05-04 | 1 | -0/+1 |
| | | |||||
* | | Fix nullpointer in file decryption | Dominik Schürmann | 2015-05-05 | 1 | -1/+1 |
|/ | |||||
* | Fix revoked/expired state in decrypt activity | Dominik Schürmann | 2015-05-04 | 1 | -3/+3 |
| | |||||
* | 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 | ||||
| * | -removed unneeded inputType attribute from xml files (+1 squashed commits) | Daniel Ramos | 2015-04-30 | 2 | -2/+0 |
| | | | | | | | | | | | | Squashed commits: [ef54e68] -code style fixing | ||||
| * | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Daniel Ramos | 2015-04-26 | 24 | -226/+237 |
| |\ | | | | | | | | | | into development | ||||
| * \ | Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into ↵ | Daniel Ramos | 2015-04-24 | 3 | -0/+3 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java | ||||
| | * | | -Improved email sanity verifications when adding emails when creating a new Key | Daniel Ramos | 2015-04-14 | 3 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | -fixed a few NFC crashes -fixed a few instances when showing the keyboard would crash the Activity -fixed a case where adding new emails would crash the app if the user went back and forth between the Add Email fragment and the Add Name fragment. | ||||
* | | | | Fix yubikey strings | Dominik Schürmann | 2015-05-01 | 2 | -7/+7 |
| | | | | |||||
* | | | | Fix key creation string and display | Dominik Schürmann | 2015-04-30 | 1 | -2/+3 |
| | | | | |||||
* | | | | API: Allow selection of decryption keys when decryption fails | Dominik Schürmann | 2015-04-30 | 2 | -0/+39 |
| | | | | |||||
* | | | | display creation dates for ambiguous user ids | Vincent Breitmoser | 2015-04-27 | 2 | -3/+15 |
| | | | | |||||
* | | | | add distinct status for messages signed by "your" key | Vincent Breitmoser | 2015-04-27 | 1 | -0/+1 |
| |_|/ |/| | | |||||
* | | | UI fixes for Android < 5 | Dominik Schürmann | 2015-04-26 | 2 | -11/+13 |
| | | | |||||
* | | | Remove unused decrypt result layout | Dominik Schürmann | 2015-04-26 | 3 | -140/+0 |
| | | | |||||
* | | | Put decrypt result in toolbar, some ui fixes for decrypt | Dominik Schürmann | 2015-04-26 | 14 | -4/+149 |
| | | | |||||
* | | | Switch to new support lib version 22.1 | Dominik Schürmann | 2015-04-25 | 2 | -2/+2 |
| | | | |||||
* | | | Update in-app contributor list | Dominik Schürmann | 2015-04-25 | 1 | -3/+22 |
| | | | |||||
* | | | 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 | 2 | -9/+1 |
| | | | |||||
* | | | Merge pull request #1220 from vectorijk/SwitchToMaterialDrawer | Dominik Schürmann | 2015-04-25 | 2 | -0/+28 |
|\ \ \ | | | | | | | | | Switch to MaterialDrawer library | ||||
| * | | | Fix #1197 Switch to MaterialDrawer library | vectorijk | 2015-04-24 | 1 | -2/+4 |
| | | | | |||||
| * | | | Introduce and Switch to mikepenz/MaterialDrawer | vectorijk | 2015-04-24 | 2 | -0/+26 |
| |/ / | |||||
* | | | fix encrypt activity layout | Vincent Breitmoser | 2015-04-24 | 1 | -1/+3 |
| | | | |||||
* | | | revamp decrypt ui | Vincent Breitmoser | 2015-04-24 | 4 | -81/+44 |
|/ / | |||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-04-22 | 4 | -16/+57 |
|\ \ | | | | | | | | | | development | ||||
| * | | Fixed Snackbar behind layout | Manoj Khanna | 2015-04-22 | 3 | -16/+16 |
| | | | | | | | | | | | | Surrounded string with quotes | ||||
| * | | keyserver verification on addition | Adithya Abraham Philip | 2015-04-22 | 2 | -0/+41 |
| | | | |||||
* | | | Update changelog | Dominik Schürmann | 2015-04-22 | 1 | -6/+8 |
|/ / | |||||
* | | support for handling keyserver urls from browser, added documentation | Adithya Abraham Philip | 2015-04-20 | 1 | -0/+3 |
| | | |||||
* | | Fix YubiKey naming, cleanup | Dominik Schürmann | 2015-04-15 | 1 | -5/+5 |
|/ | |||||
* | Pull from transifex | Dominik Schürmann | 2015-04-14 | 110 | -1110/+1555 |
| | |||||
* | Merge pull request #1193 from adithyaphilip/auto-refresh-contacts | Dominik Schürmann | 2015-04-13 | 1 | -0/+1 |
|\ | | | | | 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 | 1 | -0/+1 |
| | | |||||
* | | 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 | 2 | -2/+1 |
| | | |||||
* | | Merge branch 'v/crypto-input-parcel' of ↵ | Vincent Breitmoser | 2015-03-30 | 3 | -63/+60 |
|\ \ | | | | | | | | | | | | | | | | | | | github.com:open-keychain/open-keychain into v/crypto-input-parcel Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java | ||||
| * | | Fix scrollbar | Dominik Schürmann | 2015-03-30 | 1 | -0/+1 |
| | | | |||||
| * | | Use RecyclerView in EncryptFilesFragment | Dominik Schürmann | 2015-03-30 | 3 | -63/+59 |
| | | | |||||
* | | | fix Encrypt* with RequiredInputParcel | Vincent Breitmoser | 2015-03-30 | 1 | -1/+0 |
|/ / | |||||
* | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-30 | 3 | -13/+23 |
|\| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java |