| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | Launcher icon fixes | Dominik Schürmann | 2015-01-14 | 11 | -20/+7 | |
| | | | | | | | ||||||
| | * | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-14 | 17 | -102/+698 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | development | |||||
| | | * | | | | | actually import user attributes (though they are not shown anywhere yet) | Vincent Breitmoser | 2015-01-14 | 8 | -16/+202 | |
| | | | | | | | | ||||||
| | | * | | | | | make user_ids table typed, with attribute_data support | Vincent Breitmoser | 2015-01-14 | 9 | -88/+120 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java | |||||
| | | * | | | | | hack to make WrappedUserAttribute serializable | Vincent Breitmoser | 2015-01-13 | 1 | -0/+90 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java | |||||
| | | * | | | | | support addition of user attributes | Vincent Breitmoser | 2015-01-13 | 4 | -3/+60 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/res/values/strings.xml | |||||
| | | * | | | | | add support for user attributes in merge() routine | Vincent Breitmoser | 2015-01-13 | 1 | -2/+28 | |
| | | | | | | | | ||||||
| | | * | | | | | remove LinkedIdentity (committed earlier by accident) | Vincent Breitmoser | 2015-01-13 | 1 | -160/+0 | |
| | | | | | | | | ||||||
| | | * | | | | | add support for user attributes (during canonicalization) | Vincent Breitmoser | 2015-01-12 | 5 | -1/+366 | |
| | | | | | | | | ||||||
| | * | | | | | | Refactor BaseActivity | Dominik Schürmann | 2015-01-13 | 26 | -62/+85 | |
| | | | | | | | | ||||||
| | * | | | | | | Use Toolbar and new BaseActivity | Dominik Schürmann | 2015-01-13 | 43 | -878/+1190 | |
| | | | | | | | | ||||||
| | * | | | | | | Green | Dominik Schürmann | 2015-01-13 | 227 | -45/+164 | |
| | | | | | | | | ||||||
| | * | | | | | | Start working on Material Design | Dominik Schürmann | 2015-01-13 | 19 | -180/+243 | |
| | | | | | | | | ||||||
| | * | | | | | | Set minSdk to 14 | Dominik Schürmann | 2015-01-13 | 2 | -7/+4 | |
| | |/ / / / / | ||||||
| | * | | | | | Merge pull request #1023 from adithyaphilip/development | Dominik Schürmann | 2015-01-12 | 1 | -7/+28 | |
| | |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | Issue #954 - fixed crash when file scheme is passed, broadened deletion scope | |||||
| | | * | | | | fixed crash when file scheme is passed, broadened deletion scope | Abraham Philip | 2015-01-09 | 1 | -7/+28 | |
| | | | | | | | ||||||
| * | | | | | | No output stream for detached signatures, makes no sense to pipe it through | Dominik Schürmann | 2015-01-08 | 1 | -2/+1 | |
| | | | | | | | ||||||
| * | | | | | | Experimental API support for detached signatures (not tested) | Dominik Schürmann | 2015-01-08 | 5 | -44/+118 | |
| |/ / / / / | ||||||
| * | | | | | Test new icon | Dominik Schürmann | 2015-01-07 | 6 | -0/+0 | |
| | | | | | | ||||||
| * | | | | | OpenPGP instead of PGP | Dominik Schürmann | 2015-01-07 | 1 | -5/+5 | |
| | | | | | | ||||||
| * | | | | | PIn not pin passphrase | Dominik Schürmann | 2015-01-07 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | OpenPGP not PGP | Dominik Schürmann | 2015-01-07 | 2 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Clearup after lockpattern experiments | Dominik Schürmann | 2015-01-06 | 2 | -31/+26 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-06 | 31 | -256/+621 | |
| |\| | | | | | | | | | | | | | | | | | | | development | |||||
| | * | | | | minor stuff | Vincent Breitmoser | 2015-01-03 | 3 | -3/+6 | |
| | | | | | | ||||||
| | * | | | | make certify routines more robust (#1016) | Vincent Breitmoser | 2015-01-03 | 4 | -0/+14 | |
| | | | | | | ||||||
| | * | | | | add more descriptive string about non-mdc encrypted data | Vincent Breitmoser | 2015-01-03 | 3 | -1/+3 | |
| | | | | | | ||||||
| | * | | | | encapsulate high level edit key into new operation class | Vincent Breitmoser | 2015-01-03 | 8 | -144/+272 | |
| | | | | | | ||||||
| | * | | | | deal with non-existent user ids during import (#994) | Vincent Breitmoser | 2015-01-02 | 3 | -9/+13 | |
| | | | | | | ||||||
| | * | | | | throw exception if no data is found in getGenericData | Vincent Breitmoser | 2015-01-02 | 1 | -0/+3 | |
| | | | | | | ||||||
| | * | | | | get rid of RuntimeException control flow in UncachedKeyRing.fromStream | Vincent Breitmoser | 2015-01-02 | 2 | -26/+19 | |
| | | | | | | ||||||
| | * | | | | fix and test for bad certificate version numbers (#1012) | Vincent Breitmoser | 2015-01-02 | 1 | -7/+13 | |
| | | | | | | | | | | | | | | | | | | | | | closes #1012 | |||||
| | * | | | | extend canonicalize to strip local certificates on export | Vincent Breitmoser | 2015-01-02 | 12 | -71/+123 | |
| | | | | | | ||||||
| | * | | | | small improvements regarding pin tests and logging | Vincent Breitmoser | 2015-01-01 | 3 | -1/+10 | |
| | | | | | | ||||||
| | * | | | | add empty notation data packet only if necessary | Vincent Breitmoser | 2015-01-01 | 1 | -16/+35 | |
| | | | | | | ||||||
| | * | | | | tests: add multi key encryption/decryption test, new way for fake passphrase ↵ | Vincent Breitmoser | 2015-01-01 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | cache | |||||
| | * | | | | fix small merge conflict oversight | Vincent Breitmoser | 2014-12-30 | 1 | -3/+0 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-12-30 | 22 | -62/+125 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/res/values/strings.xml | |||||
| | * | | | | | some small notation data fixes | Vincent Breitmoser | 2014-12-30 | 2 | -10/+10 | |
| | | | | | | | ||||||
| | * | | | | | add PIN as a SecretKeyType | Vincent Breitmoser | 2014-12-30 | 8 | -5/+38 | |
| | | | | | | | ||||||
| | * | | | | | fix unit tests for ChangeUnlockParcel | Vincent Breitmoser | 2014-12-30 | 1 | -0/+3 | |
| | | | | | | | ||||||
| | * | | | | | introduce handling of notation direct key signatures, and experimental pin ↵ | Vincent Breitmoser | 2014-12-30 | 13 | -24/+126 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | notation packet | |||||
| * | | | | | | Passphrase wizard tests | Dominik Schürmann | 2015-01-06 | 13 | -22/+1891 | |
| | |/ / / / |/| | | | | ||||||
| * | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-12-29 | 5 | -65/+173 | |
| |\| | | | | | | | | | | | | | | | | | | | development | |||||
| | * | | | | introduce new ChangeUnlockParcel packet for extended passphrase changing ↵ | Vincent Breitmoser | 2014-12-29 | 5 | -65/+173 | |
| | | | | | | | | | | | | | | | | | | | | | capabilities | |||||
| * | | | | | New work on PIN and lock pattern UI | Dominik Schürmann | 2014-12-29 | 21 | -61/+126 | |
| | | | | | | ||||||
| * | | | | | Add android-lockpattern library | Dominik Schürmann | 2014-12-29 | 1 | -0/+1 | |
| |/ / / / | ||||||
| * | | | | Allow for creation date to be in the future up to one day to account for ↵ | Dominik Schürmann | 2014-12-28 | 1 | -4/+9 | |
| | | | | | | | | | | | | | | | | | diverging clocks on different systems for fresh keys | |||||
| * | | | | Fix crash on first time wizard | Dominik Schürmann | 2014-12-28 | 1 | -2/+2 | |
| | |_|/ |/| | | ||||||
| * | | | Update target and support libs to SDK 21, fixing compile issues | Dominik Schürmann | 2014-12-04 | 4 | -8/+6 | |
| | | | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/OpenKeychain