Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | modifySecretKey: err out on revocation of nonexistent user id | Vincent Breitmoser | 2014-08-16 | 1 | -0/+1 | |
| | | ||||||
* | | API: Allow ACTION_SIGN_AND_ENCRYPT with no key ids or user ids extras, fix ↵ | Dominik Schürmann | 2014-08-16 | 2 | -7/+8 | |
|/ | | | | pre-selection of key ids (no revoked or expired ones, also select duplicates), refactor text using spannables | |||||
* | Merge pull request #767 from mar-v-in/issue-763 | Dominik Schürmann | 2014-08-14 | 3 | -9/+5 | |
|\ | | | | | Use dropdown in CertifyActivity | |||||
| * | Add and use CertifyKeySpinner | mar-v-in | 2014-08-14 | 1 | -8/+4 | |
| | | ||||||
| * | factor KeySpinner out | mar-v-in | 2014-08-14 | 2 | -1/+1 | |
| | | ||||||
* | | merge: check fingerprints on merge operation! (this needs a testcase!) | Vincent Breitmoser | 2014-08-14 | 1 | -1/+1 | |
| | | ||||||
* | | change keybase hint following pull request #755 | Dominik Schürmann | 2014-08-14 | 12 | -19/+19 | |
| | | ||||||
* | | Automcomplete names and emails in keyserver tab | Dominik Schürmann | 2014-08-14 | 1 | -1/+1 | |
|/ | ||||||
* | move v3 key import prevention into canonicalization method | Dominik Schürmann | 2014-08-14 | 1 | -1/+1 | |
| | ||||||
* | Do not import v3 keys, they are insecure! | Dominik Schürmann | 2014-08-14 | 1 | -1/+2 | |
| | ||||||
* | Remove support for v3 sig generation | Dominik Schürmann | 2014-08-14 | 2 | -10/+3 | |
| | ||||||
* | Dont write version header by default | Dominik Schürmann | 2014-08-14 | 7 | -15/+15 | |
| | ||||||
* | Add user info dialog | Dominik Schürmann | 2014-08-13 | 1 | -0/+8 | |
| | ||||||
* | Move certify action down into actions section | Dominik Schürmann | 2014-08-13 | 1 | -12/+12 | |
| | ||||||
* | API: User interaction when account keys are deleted | Dominik Schürmann | 2014-08-13 | 2 | -2/+3 | |
| | ||||||
* | passphrase instead of pass phrase | Dominik Schürmann | 2014-08-07 | 1 | -2/+2 | |
| | ||||||
* | Pull from transifex | Dominik Schürmann | 2014-08-07 | 75 | -2811/+1509 | |
| | ||||||
* | Readd missing string | Dominik Schürmann | 2014-08-07 | 1 | -0/+1 | |
| | ||||||
* | ModernPGP infos | Dominik Schürmann | 2014-08-06 | 1 | -1/+1 | |
| | ||||||
* | Update changelog and about | Dominik Schürmann | 2014-08-06 | 2 | -89/+104 | |
| | ||||||
* | Use CompressionAlgorithmTags instead of homebrew constants | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 | |
| | ||||||
* | Increase maximum custom RSA size | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 | |
| | ||||||
* | Edit key: key flags | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 | |
| | ||||||
* | Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry ↵ | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 | |
| | | | | selection for adding new subkeys | |||||
* | More work on add subkey dialog design | Dominik Schürmann | 2014-08-05 | 2 | -4/+9 | |
| | ||||||
* | Work on add subkey dialog design | Dominik Schürmann | 2014-08-05 | 2 | -73/+88 | |
| | ||||||
* | Better handling of user id revocation in UI code | Dominik Schürmann | 2014-08-05 | 1 | -0/+5 | |
| | ||||||
* | Refactor expiry dialog | Dominik Schürmann | 2014-08-05 | 2 | -1/+17 | |
| | ||||||
* | KeychainContract: use longs instead of String, other fixes | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 | |
| | ||||||
* | Pull from transifex | Dominik Schürmann | 2014-08-04 | 43 | -1143/+1131 | |
| | ||||||
* | Fixing lint complaints, removing unused resources | Dominik Schürmann | 2014-08-04 | 31 | -79/+3 | |
| | ||||||
* | Even more smaller nitpicks | Dominik Schürmann | 2014-08-04 | 1 | -0/+1 | |
| | ||||||
* | Fix debug backup/restore methods | Dominik Schürmann | 2014-08-04 | 1 | -1/+0 | |
| | ||||||
* | Remove old edit key stuff | Dominik Schürmann | 2014-08-04 | 3 | -309/+0 | |
| | ||||||
* | Edit key: subkey adding, not finished | Dominik Schürmann | 2014-08-04 | 6 | -236/+136 | |
| | ||||||
* | button language in encrypt | Dominik Schürmann | 2014-08-04 | 1 | -2/+1 | |
| | ||||||
* | Smaller UI fixes | Dominik Schürmann | 2014-08-04 | 3 | -30/+31 | |
| | ||||||
* | Merge pull request #728 from mar-v-in/improve-file-more | Dominik Schürmann | 2014-08-04 | 26 | -255/+367 | |
|\ | | | | | Improve file encrypt | |||||
| * | Minor cleanup | mar-v-in | 2014-08-02 | 2 | -1/+2 | |
| | | ||||||
| * | Fix focusing with To field | mar-v-in | 2014-08-02 | 1 | -0/+2 | |
| | | ||||||
| * | Encrypt UI (drop downs) | mar-v-in | 2014-08-01 | 2 | -14/+35 | |
| | | ||||||
| * | Merge branch 'master' into improve-file-more | mar-v-in | 2014-08-01 | 1 | -1/+1 | |
| |\ | ||||||
| * \ | Merge branch 'master' into improve-file-more | mar-v-in | 2014-08-01 | 10 | -51/+99 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java | |||||
| * | | | Fix string resources | mar-v-in | 2014-07-31 | 2 | -5/+6 | |
| | | | | ||||||
| * | | | Fix merge | mar-v-in | 2014-07-31 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 136 | -672/+1008 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java | |||||
| * | | | | - add multi select for storage api (kitkat) | mar-v-in | 2014-07-31 | 4 | -30/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | - UI fixes - refactoring | |||||
| * | | | | Load of rework on EncryptActivity, still some TODOs | mar-v-in | 2014-07-20 | 3 | -13/+43 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-06 | 36 | -483/+1601 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/res/layout/encrypt_content.xml | |||||
| * | | | | | Many changes to file ... and still incomplete | mar-v-in | 2014-07-06 | 24 | -237/+261 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Multi file - Reworked UI |