| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-24 | 1 | -7/+12 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java | ||||
| | * | Pull from transifex | Dominik Schürmann | 2015-03-23 | 1 | -4/+4 |
| | | | |||||
| | * | Use markdown for in-app help | Dominik Schürmann | 2015-03-23 | 1 | -7/+12 |
| | | | |||||
| * | | first steps toward yubikey activity | Vincent Breitmoser | 2015-03-21 | 1 | -0/+2 |
| |/ | | | | | - move BaseActivity into new package - extract BaseNfcActivity from NfcOperationsActivity | ||||
| * | Simplified language: Confirm keys | Dominik Schürmann | 2015-03-04 | 1 | -15/+4 |
| | | |||||
| * | Style tabs, add missing drawables | Dominik Schürmann | 2015-01-15 | 1 | -9/+11 |
| | | |||||
| * | Refactor BaseActivity | Dominik Schürmann | 2015-01-13 | 1 | -2/+2 |
| | | |||||
| * | Use Toolbar and new BaseActivity | Dominik Schürmann | 2015-01-13 | 1 | -3/+6 |
| | | |||||
| * | Move SlidingTabLayout and SlidingTabStrip into appropriate subpackage | Dominik Schürmann | 2014-06-06 | 1 | -1/+1 |
| | | |||||
| * | neatness refactoring | Vincent Breitmoser | 2014-06-04 | 1 | -1/+0 |
| | | |||||
| * | ui: use SlidingTabLayout in help activity | Vincent Breitmoser | 2014-05-07 | 1 | -20/+30 |
| | | |||||
| * | FIx nfc button | Dominik Schürmann | 2014-04-18 | 1 | -6/+13 |
| | | |||||
| * | Optimize imports | Dominik Schürmann | 2014-04-15 | 1 | -0/+1 |
| | | |||||
| * | add web of trust help entry | Vincent Breitmoser | 2014-04-15 | 1 | -3/+8 |
| | | |||||
| * | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 1 | -0/+79 |
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |