Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | first steps toward yubikey activity | Vincent Breitmoser | 2015-03-21 | 1 | -0/+2 |
| | | | | | - move BaseActivity into new package - extract BaseNfcActivity from NfcOperationsActivity | ||||
* | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 1 | -3/+0 |
| | |||||
* | Refactor BaseActivity | Dominik Schürmann | 2015-01-13 | 1 | -2/+2 |
| | |||||
* | Use Toolbar and new BaseActivity | Dominik Schürmann | 2015-01-13 | 1 | -5/+3 |
| | |||||
* | Rename multi certify files to certify | Dominik Schürmann | 2014-10-26 | 1 | -0/+42 |
| | |||||
* | Remove old certify activity | Dominik Schürmann | 2014-10-25 | 1 | -38/+0 |
| | |||||
* | use LoaderFragment for CertifyActivity | Vincent Breitmoser | 2014-08-31 | 1 | -374/+2 |
| | |||||
* | Copyright (C) 2014 Vincent Breitmoser | Vincent Breitmoser | 2014-08-21 | 1 | -0/+1 |
| | |||||
* | return some more results | Dominik Schürmann | 2014-08-20 | 1 | -2/+2 |
| | |||||
* | Fixes and temporary fixes for returning results | Dominik Schürmann | 2014-08-20 | 1 | -8/+16 |
| | |||||
* | Scroll fixes for certify activity | Dominik Schürmann | 2014-08-19 | 1 | -0/+15 |
| | |||||
* | Do not allow self certifying | mar-v-in | 2014-08-14 | 1 | -1/+1 |
| | |||||
* | Add and use CertifyKeySpinner | mar-v-in | 2014-08-14 | 1 | -18/+14 |
| | |||||
* | Better error handling for passphrase cache if key is missing | Dominik Schürmann | 2014-08-13 | 1 | -1/+8 |
| | |||||
* | Certifying instead of signing | Dominik Schürmann | 2014-08-01 | 1 | -7/+6 |
| | |||||
* | Fixes for upload | Dominik Schürmann | 2014-07-31 | 1 | -1/+1 |
| | |||||
* | Create key: work on upload | Dominik Schürmann | 2014-07-30 | 1 | -1/+3 |
| | |||||
* | Merge branch 'ditch-appmsg' | Vincent Breitmoser | 2014-07-29 | 1 | -8/+10 |
|\ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java | ||||
| * | use SuperToast instead of AppMsg in code, part 1 | Vincent Breitmoser | 2014-07-07 | 1 | -8/+10 |
| | | |||||
* | | Use new icons in other key related activites, delete old icons | Dominik Schürmann | 2014-07-28 | 1 | -7/+17 |
|/ | |||||
* | new edit key: diff for existing user ids | Dominik Schürmann | 2014-06-22 | 1 | -1/+0 |
| | |||||
* | Rename adapter | Dominik Schürmann | 2014-06-22 | 1 | -4/+4 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-14 | 1 | -15/+24 |
|\ | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java OpenKeychain/src/main/res/values/strings.xml | ||||
| * | Use flat buttons where appropriate | Dominik Schürmann | 2014-05-08 | 1 | -6/+4 |
| | | |||||
| * | Better handling of actionbars back | Dominik Schürmann | 2014-05-07 | 1 | -7/+19 |
| | | |||||
| * | Clarify language | Dominik Schürmann | 2014-05-06 | 1 | -1/+1 |
| | | |||||
| * | New key view design, using Android flat buttons and Android icons | Dominik Schürmann | 2014-05-05 | 1 | -2/+2 |
| | | |||||
* | | wrapped-key-ring: get rid of bc objects in key editor | Vincent Breitmoser | 2014-05-04 | 1 | -2/+0 |
| | | |||||
* | | wrapped-key-ring: more work on passphrase caching and certification | Vincent Breitmoser | 2014-05-04 | 1 | -47/+16 |
|/ | |||||
* | Fix more strings | Dominik Schürmann | 2014-04-19 | 1 | -2/+2 |
| | |||||
* | Fix upload of keys, closes #581 | Dominik Schürmann | 2014-04-18 | 1 | -1/+3 |
| | |||||
* | Refactor ProviderHelper to be non-static using a constructor based on ↵ | Dominik Schürmann | 2014-04-11 | 1 | -6/+7 |
| | | | | context (first commit to get context out of pgp classes) | ||||
* | Prettify more layouts, fix edit and encrypt intents from key view | Dominik Schürmann | 2014-04-09 | 1 | -1/+1 |
| | |||||
* | Use NotFoundException in more places | Dominik Schürmann | 2014-04-08 | 1 | -9/+12 |
| | |||||
* | Futher Toast replacements in CertifyKeyActivity | Daniel Haß | 2014-04-07 | 1 | -8/+9 |
| | |||||
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 1 | -0/+388 |