Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-28 | 3 | -32/+59 |
|\ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | ||||
| * | Fix result handling in account settings | Dominik Schürmann | 2014-08-21 | 1 | -13/+10 |
| | | |||||
| * | return some more results | Dominik Schürmann | 2014-08-20 | 1 | -0/+12 |
| | | |||||
| * | API: Allow ACTION_SIGN_AND_ENCRYPT with no key ids or user ids extras, fix ↵ | Dominik Schürmann | 2014-08-16 | 1 | -19/+37 |
| | | | | | | | | pre-selection of key ids (no revoked or expired ones, also select duplicates), refactor text using spannables | ||||
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-14 | 2 | -23/+59 |
|\| | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java | ||||
| * | API: User interaction when account keys are deleted | Dominik Schürmann | 2014-08-13 | 2 | -23/+59 |
| | | |||||
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-06 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java extern/openpgp-api-lib settings.gradle | ||||
| * | Optimize imports | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-01 | 1 | -6/+7 |
|\| | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java | ||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-30 | 1 | -2/+0 |
| |\ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java | ||||
| | * | some more work on supertoast and result parcel stuff | Vincent Breitmoser | 2014-07-27 | 1 | -7/+4 |
| | | | |||||
| * | | Create key with fragments | Dominik Schürmann | 2014-07-30 | 1 | -5/+8 |
| |/ | |||||
* / | Fixes | Dominik Schürmann | 2014-07-17 | 1 | -0/+8 |
|/ | |||||
* | Remove old edit button, rename activities | Dominik Schürmann | 2014-07-03 | 1 | -5/+5 |
| | |||||
* | Added new button style and converted account_settings and the ↵ | Daniel Albert | 2014-06-29 | 1 | -4/+3 |
| | | | | select_secret_key_layout to use it | ||||
* | wrapped-key-ring: use CachedKeyRing where possible | Vincent Breitmoser | 2014-05-21 | 1 | -2/+4 |
| | |||||
* | Add applications section to help | Dominik Schürmann | 2014-05-07 | 1 | -2/+2 |
| | |||||
* | Start app menu item for registered apps | Dominik Schürmann | 2014-05-07 | 1 | -4/+24 |
| | |||||
* | Optimize imports | Dominik Schürmann | 2014-04-15 | 2 | -2/+1 |
| | |||||
* | Removing remaining uses of Id, closing one of the oldest bugs #9 | Dominik Schürmann | 2014-04-14 | 1 | -2/+1 |
| | |||||
* | Update license header for 2014 | Dominik Schürmann | 2014-04-13 | 4 | -4/+4 |
| | |||||
* | Refactor ProviderHelper to be non-static using a constructor based on ↵ | Dominik Schürmann | 2014-04-11 | 4 | -19/+19 |
| | | | | context (first commit to get context out of pgp classes) | ||||
* | split getMasterKeyId for the remaining use cases | Vincent Breitmoser | 2014-04-11 | 1 | -1/+2 |
| | | | | Closes #549 | ||||
* | Introduce ProviderHelper.NotFoundException, remove dead code | Dominik Schürmann | 2014-04-08 | 1 | -2/+8 |
| | |||||
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 8 | -0/+1262 |