Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Launcher icon fixes | Dominik Schürmann | 2015-01-14 | 15 | -295/+16 | |
| | | ||||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-14 | 18 | -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 | |||||
| * | | update spongycastle with more public methods for WrappedUserAttribute | Vincent Breitmoser | 2015-01-13 | 1 | -0/+0 | |
| | | | ||||||
| * | | 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 | 20 | -180/+247 | |
| | | | ||||||
* | | | Set minSdk to 14 | Dominik Schürmann | 2015-01-13 | 3 | -7/+4 | |
|/ / | ||||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-12 | 1 | -7/+28 | |
|\ \ | | | | | | | | | | development | |||||
| * \ | 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 | |
| | | | ||||||
* | | | Update safeslinger lib | Dominik Schürmann | 2015-01-12 | 1 | -0/+0 | |
|/ / | ||||||
* | | Test new icon | Dominik Schürmann | 2015-01-07 | 10 | -3603/+3868 | |
| | | ||||||
* | | 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 | 41 | -339/+1418 | |
|\| | | | | | | | development | |||||
| * | tests: add a couple of CertifyOperation test cases | Vincent Breitmoser | 2015-01-03 | 1 | -0/+238 | |
| | | ||||||
| * | 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 | 14 | -167/+294 | |
| | | ||||||
| * | deal with non-existent user ids during import (#994) | Vincent Breitmoser | 2015-01-02 | 3 | -9/+13 | |
| | | ||||||
| * | tests: add multiple keys with signature test case | Vincent Breitmoser | 2015-01-02 | 1 | -0/+75 | |
| | | ||||||
| * | 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 | 4 | -33/+24 | |
| | | ||||||
| * | fix and test for bad certificate version numbers (#1012) | Vincent Breitmoser | 2015-01-02 | 4 | -7/+47 | |
| | | | | | | | | closes #1012 | |||||
| * | tests: for export, check that a token local cert actually exists before export | Vincent Breitmoser | 2015-01-02 | 1 | -10/+22 | |
| | | ||||||
| * | tests: add test for key export | Vincent Breitmoser | 2015-01-02 | 1 | -0/+211 | |
| | | ||||||
| * | 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 | 4 | -6/+33 | |
| | | ||||||
| * | add empty notation data packet only if necessary | Vincent Breitmoser | 2015-01-01 | 1 | -16/+35 | |
| | | ||||||
| * | tests: be less verbose about inserting keyrings for encrypt/decrypt | Vincent Breitmoser | 2015-01-01 | 1 | -2/+15 | |
| | | ||||||
| * | tests: add multi key encryption/decryption test, new way for fake passphrase ↵ | Vincent Breitmoser | 2015-01-01 | 3 | -45/+125 | |
| | | | | | | | | cache | |||||
| * | fix unit tests (canonicalize after create) | Vincent Breitmoser | 2015-01-01 | 2 | -0/+5 | |
| | | ||||||
| * | 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 | 25 | -62/+129 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | 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 test case for PIN unlock | Vincent Breitmoser | 2014-12-30 | 1 | -2/+28 | |
| | | | ||||||
| * | | add PIN as a SecretKeyType | Vincent Breitmoser | 2014-12-30 | 8 | -5/+38 | |
| | | | ||||||
| * | | fix unit tests for ChangeUnlockParcel | Vincent Breitmoser | 2014-12-30 | 6 | -16/+24 | |
| | | | ||||||
| * | | Revert "Remove restriction for max parallel forks for gradle tests" | Vincent Breitmoser | 2014-12-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit ce34192dbbff388c0ccd384fba15cd95075a14ca. Conflicts: build.gradle |