Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #796 from open-keychain/develop | Dominik Schürmann | 2014-08-28 | 6 | -75/+153 |
|\ | | | | | ECC support | ||||
| * | add ecc support | Vincent Breitmoser | 2014-08-24 | 6 | -79/+153 |
| | | |||||
| * | Add ECDH and ECDSA values | Dominik Schürmann | 2014-08-21 | 1 | -0/+4 |
| | | |||||
* | | Fix NullPointerException in ImportKeysActivity | Dominik Schürmann | 2014-08-28 | 1 | -1/+3 |
| | | |||||
* | | Cleanup FoldableLinearLayout | Dominik Schürmann | 2014-08-27 | 1 | -6/+4 |
| | | |||||
* | | Add info about device with intent chooser bug | Dominik Schürmann | 2014-08-21 | 1 | -1/+1 |
|/ | |||||
* | Disable custom intent chooser | Dominik Schürmann | 2014-08-21 | 1 | -53/+54 |
| | |||||
* | Fix nullpointer when revoking keys | Dominik Schürmann | 2014-08-21 | 1 | -1/+2 |
| | |||||
* | Fix result handling in account settings | Dominik Schürmann | 2014-08-21 | 1 | -3/+3 |
| | |||||
* | Copyright (C) 2014 Vincent Breitmoser | Vincent Breitmoser | 2014-08-21 | 8 | -0/+8 |
| | |||||
* | small change to make android studio recognize a honeycomb-only block | Vincent Breitmoser | 2014-08-20 | 1 | -2/+4 |
| | |||||
* | move key deletion into KeychainIntentHandler | Vincent Breitmoser | 2014-08-20 | 2 | -39/+54 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 3 | -11/+7 |
|\ | |||||
| * | Notify duration, cleanup | Dominik Schürmann | 2014-08-20 | 1 | -4/+2 |
| | | |||||
| * | Fix nullpointer in first time activity | Dominik Schürmann | 2014-08-20 | 1 | -1/+3 |
| | | |||||
| * | return some more results | Dominik Schürmann | 2014-08-20 | 1 | -6/+2 |
| | | |||||
* | | close actionmode in keylist on loading events (avoid inconsistent state) | Vincent Breitmoser | 2014-08-20 | 1 | -0/+10 |
|/ | |||||
* | progress dialog design fix | Dominik Schürmann | 2014-08-20 | 2 | -9/+7 |
| | |||||
* | return some more results | Dominik Schürmann | 2014-08-20 | 6 | -35/+41 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-20 | 2 | -45/+51 |
|\ | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | consolidate: implement (mostly) recovery mode | Vincent Breitmoser | 2014-08-20 | 2 | -45/+51 |
| | | |||||
* | | Fixes and temporary fixes for returning results | Dominik Schürmann | 2014-08-20 | 3 | -13/+24 |
|/ | |||||
* | Fix mime types, #781 | mar-v-in | 2014-08-19 | 1 | -1/+1 |
| | |||||
* | ConsolidateDialogActivity | Dominik Schürmann | 2014-08-19 | 1 | -41/+26 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-19 | 1 | -0/+117 |
|\ | |||||
| * | add OpenDialogActivity (stub) | Vincent Breitmoser | 2014-08-19 | 1 | -0/+117 |
| | | |||||
* | | Scroll fixes for certify activity | Dominik Schürmann | 2014-08-19 | 1 | -0/+15 |
|/ | |||||
* | Add license headers | Dominik Schürmann | 2014-08-19 | 3 | -0/+51 |
| | |||||
* | Add subkey: at least one flag should be selected! | Dominik Schürmann | 2014-08-18 | 1 | -53/+74 |
| | |||||
* | Fixes for expiry UI | Dominik Schürmann | 2014-08-18 | 5 | -69/+101 |
| | |||||
* | Merge pull request #772 from mar-v-in/issue-729 | Vincent | 2014-08-17 | 3 | -97/+22 |
|\ | | | | | Remove NoSwipeWrapContentViewPager | ||||
| * | Work-around rendering bug when switching back to asymmetric with multiple ↵ | mar-v-in | 2014-08-17 | 1 | -14/+2 |
| | | | | | | | | recipients selected | ||||
| * | Remove NoSwipeWrapContentViewPager | mar-v-in | 2014-08-17 | 2 | -83/+20 |
| | | |||||
* | | consolidate: working implementation, lacking ui | Vincent Breitmoser | 2014-08-17 | 1 | -0/+60 |
| | | |||||
* | | parametrize FileImportCache for filename | Vincent Breitmoser | 2014-08-17 | 1 | -1/+2 |
| | | |||||
* | | Fixing date picker issues | Dominik Schürmann | 2014-08-16 | 2 | -22/+47 |
| | | |||||
* | | Fix flags UI in add subkey dialog | Dominik Schürmann | 2014-08-16 | 2 | -5/+44 |
| | | |||||
* | | Fix expiry when adding subkeys | Dominik Schürmann | 2014-08-16 | 3 | -6/+5 |
| | | |||||
* | | Always return a SaveKeyringResult from saving | Dominik Schürmann | 2014-08-16 | 1 | -3/+1 |
| | | |||||
* | | fix keys with no expiry in ui code | Vincent Breitmoser | 2014-08-14 | 2 | -2/+2 |
| | | |||||
* | | Pass through of master key id in SaveKeyringResult | Dominik Schürmann | 2014-08-14 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #767 from mar-v-in/issue-763 | Dominik Schürmann | 2014-08-14 | 6 | -162/+350 |
|\ | | | | | Use dropdown in CertifyActivity | ||||
| * | Do not allow self certifying | mar-v-in | 2014-08-14 | 3 | -4/+20 |
| | | |||||
| * | Fix KeySpinner on cursor change | mar-v-in | 2014-08-14 | 1 | -1/+6 |
| | | |||||
| * | Add and use CertifyKeySpinner | mar-v-in | 2014-08-14 | 2 | -18/+62 |
| | | |||||
| * | add OnKeyChangedListener to KeySpinner | mar-v-in | 2014-08-14 | 2 | -11/+41 |
| | | |||||
| * | factor KeySpinner out | mar-v-in | 2014-08-14 | 4 | -136/+229 |
| | | |||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-14 | 1 | -8/+7 |
|\ \ | |||||
| * | | handle modify and save errors in KeychainIntentResult | Vincent Breitmoser | 2014-08-14 | 1 | -8/+7 |
| | | | |||||
* | | | hacky fix to prevent key list from scrolling to top when opening nav drawer | Dominik Schürmann | 2014-08-14 | 1 | -7/+15 |
|/ / |