| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | | | | | | | | | Fixing rotate crashes in create key | Dominik Schürmann | 2015-05-10 | 2 | -9/+5 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Fix crash with v3 key fingerprints | Dominik Schürmann | 2015-05-10 | 1 | -1/+10 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Cleanup | Dominik Schürmann | 2015-05-10 | 1 | -21/+0 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Reformat manifest | Dominik Schürmann | 2015-05-10 | 1 | -23/+23 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Add dontnote to proguard | Dominik Schürmann | 2015-05-10 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Workaround for Samsung Android 4.2 bug | Dominik Schürmann | 2015-05-10 | 2 | -0/+33 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Use snackbar lib from maven repo | Dominik Schürmann | 2015-05-10 | 4 | -5/+2 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Fixes and clarifications to app signature (or better certificate) pinning | Dominik Schürmann | 2015-05-10 | 4 | -38/+50 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Add self-encrypt for old API | Dominik Schürmann | 2015-05-10 | 1 | -0/+14 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge pull request #1270 from adithyaphilip/linked-contact-crash | Dominik Schürmann | 2015-05-09 | 3 | -1/+52 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed sync on key import, crash for 'me' linked contact | |||||
| | * | | | | | | | | | | | | | | fixed sync on key import, 'me' linked contact crash | Adithya Abraham Philip | 2015-05-08 | 3 | -1/+52 | |
| |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Update contrib section in README | Dominik Schürmann | 2015-05-08 | 1 | -5/+9 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Version 3.2 | Dominik Schürmann | 2015-05-06 | 24 | -25/+25 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Add screenshots | Dominik Schürmann | 2015-05-06 | 8 | -2/+2 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Pull from transifex | Dominik Schürmann | 2015-05-06 | 10 | -141/+163 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Update function graphic | Dominik Schürmann | 2015-05-06 | 2 | -584/+92 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-05-06 | 2 | -6/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | development | |||||
| | * | | | | | | | | | | | | | | check for fingerprint of any subkey (arguable?) | Vincent Breitmoser | 2015-05-06 | 2 | -6/+18 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Update openpgp-api lib | Dominik Schürmann | 2015-05-06 | 1 | -0/+0 | |
| |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Fix import of keyring with pub+sec key with same key id | Dominik Schürmann | 2015-05-06 | 2 | -62/+80 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Rename for consistency | Dominik Schürmann | 2015-05-06 | 2 | -5/+4 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Renaming for consisitency | Dominik Schürmann | 2015-05-06 | 2 | -11/+10 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Move error overlay into generalized DecryptFragment, better error handling ↵ | Dominik Schürmann | 2015-05-06 | 5 | -117/+181 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in DecryptTextActivity | |||||
| * | | | | | | | | | | | | | | Remove reference to deleted API Demo | Dominik Schürmann | 2015-05-06 | 1 | -6/+0 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Switch to new library repos | Dominik Schürmann | 2015-05-06 | 11 | -11/+12 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-05-05 | 3 | -9/+54 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | development | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #1235 from wfaulk/replacement_extra | Dominik Schürmann | 2015-05-04 | 3 | -9/+54 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Bluetooth share without breaking others | |||||
| | | * | | | | | | | | | | | | | | revert unneeded changes for short key ID | William Faulk | 2015-05-04 | 1 | -27/+3 | |
| | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | revert unneeded changes for old temp Bluetooth share file | William Faulk | 2015-05-04 | 1 | -13/+0 | |
| | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | use single file extension | William Faulk | 2015-05-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | use TemporaryStorageProvider for Bluetooth Share | William Faulk | 2015-05-04 | 2 | -32/+18 | |
| | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | Use FILE_EXTENSION constants | William Faulk | 2015-05-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | Use primary user ID for filename instead of short key ID | William Faulk | 2015-05-04 | 1 | -2/+5 | |
| | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | Wrap EXTRA_REPLACEMENT_EXTRAS section so it only runs on Lollipop or greater | William Faulk | 2015-05-04 | 1 | -42/+44 | |
| | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | Fix Bluetooth share without breaking others | William Faulk | 2015-05-04 | 4 | -9/+100 | |
| | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Cleanup manifest | Dominik Schürmann | 2015-05-05 | 1 | -15/+16 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | 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 | 4 | -37/+27 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Fix cancel/skip in create key wizard | Dominik Schürmann | 2015-05-04 | 3 | -52/+35 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Display notify above keyboard in CreateKeyEmailFragment | Dominik Schürmann | 2015-05-04 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Fix email pattern | Dominik Schürmann | 2015-05-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge branch 'Hiperzone-development' into development | Dominik Schürmann | 2015-05-04 | 3 | -50/+94 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | Use more simple email validation regex | Dominik Schürmann | 2015-05-04 | 1 | -7/+8 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Merge branch 'development' of https://github.com/Hiperzone/open-keychain ↵ | Dominik Schürmann | 2015-05-04 | 3 | -51/+94 | |
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -12/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commits: [ef54e68] -code style fixing | |||||
| | * | | | | | | | | | | | | | | -Removed unneeded view references from the fragment class since they are not ↵ | Daniel Ramos | 2015-04-26 | 1 | -7/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | used outside of createView. -cleanup | |||||
| | * | | | | | | | | | | | | | | -removed unneeded code from previous commits. I tested on a KitKat(4.4.2) ↵ | Daniel Ramos | 2015-04-26 | 1 | -3/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and Lollipop (5.1) phone and everything seems to be preserved as expected. | |||||
| | * | | | | | | | | | | | | | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Daniel Ramos | 2015-04-26 | 43 | -462/+791 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into development | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into ↵ | Daniel Ramos | 2015-04-24 | 5 | -44/+92 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'feature/emailImprovements' into localdev | Daniel Ramos | 2015-04-24 | 6 | -45/+97 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |