aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-148-20/+169
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | development
| * | | | | | involve user attributes in unit tests for merge and canonicalize!Vincent Breitmoser2015-01-143-15/+73
| | | | | | |
| * | | | | | small fixes to user attribute handlingVincent Breitmoser2015-01-144-3/+28
| | | | | | |
| * | | | | | add basic tests for addition of user attributesVincent Breitmoser2015-01-141-0/+66
| | | | | | |
| * | | | | | fix log entry for addition of user attributesVincent Breitmoser2015-01-141-3/+3
| | | | | | |
* | | | | | | Fix SearchViewDominik Schürmann2015-01-145-39/+48
|/ / / / / /
* | | | | | Better way to have dark toolbar and light themeDominik Schürmann2015-01-142-33/+3
| | | | | |
* | | | | | Fix Toolbars in decrypt activitiesDominik Schürmann2015-01-143-14/+30
| | | | | |
* | | | | | svg backup iconDominik Schürmann2015-01-141-0/+213
| | | | | |
* | | | | | Launcher icon fixesDominik Schürmann2015-01-1415-295/+16
| | | | | |
* | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-1418-102/+698
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | development
| * | | | | | actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-148-16/+202
| | | | | | |
| * | | | | | make user_ids table typed, with attribute_data supportVincent Breitmoser2015-01-149-88/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
| * | | | | | update spongycastle with more public methods for WrappedUserAttributeVincent Breitmoser2015-01-131-0/+0
| | | | | | |
| * | | | | | hack to make WrappedUserAttribute serializableVincent Breitmoser2015-01-131-0/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java
| * | | | | | support addition of user attributesVincent Breitmoser2015-01-134-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() routineVincent Breitmoser2015-01-131-2/+28
| | | | | | |
| * | | | | | remove LinkedIdentity (committed earlier by accident)Vincent Breitmoser2015-01-131-160/+0
| | | | | | |
| * | | | | | add support for user attributes (during canonicalization)Vincent Breitmoser2015-01-125-1/+366
| | | | | | |
* | | | | | | Refactor BaseActivityDominik Schürmann2015-01-1326-62/+85
| | | | | | |
* | | | | | | Use Toolbar and new BaseActivityDominik Schürmann2015-01-1343-878/+1190
| | | | | | |
* | | | | | | GreenDominik Schürmann2015-01-13227-45/+164
| | | | | | |
* | | | | | | Start working on Material DesignDominik Schürmann2015-01-1320-180/+247
| | | | | | |
* | | | | | | Set minSdk to 14Dominik Schürmann2015-01-133-7/+4
|/ / / / / /
* | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-121-7/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | development
| * \ \ \ \ \ Merge pull request #1023 from adithyaphilip/developmentDominik Schürmann2015-01-121-7/+28
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Issue #954 - fixed crash when file scheme is passed, broadened deletion scope
| | * | | | | fixed crash when file scheme is passed, broadened deletion scopeAbraham Philip2015-01-091-7/+28
| | | | | | |
* | | | | | | Update safeslinger libDominik Schürmann2015-01-121-0/+0
|/ / / / / /
* | | | | | Test new iconDominik Schürmann2015-01-0710-3603/+3868
| | | | | |
* | | | | | OpenPGP instead of PGPDominik Schürmann2015-01-071-5/+5
| | | | | |
* | | | | | PIn not pin passphraseDominik Schürmann2015-01-071-1/+1
| | | | | |
* | | | | | OpenPGP not PGPDominik Schürmann2015-01-072-2/+2
| | | | | |
* | | | | | Clearup after lockpattern experimentsDominik Schürmann2015-01-062-31/+26
| | | | | |
* | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-0641-339/+1418
|\| | | | | | | | | | | | | | | | | | | | | | | development
| * | | | | tests: add a couple of CertifyOperation test casesVincent Breitmoser2015-01-031-0/+238
| | | | | |
| * | | | | minor stuffVincent Breitmoser2015-01-033-3/+6
| | | | | |
| * | | | | make certify routines more robust (#1016)Vincent Breitmoser2015-01-034-0/+14
| | | | | |
| * | | | | add more descriptive string about non-mdc encrypted dataVincent Breitmoser2015-01-033-1/+3
| | | | | |
| * | | | | encapsulate high level edit key into new operation classVincent Breitmoser2015-01-0314-167/+294
| | | | | |
| * | | | | deal with non-existent user ids during import (#994)Vincent Breitmoser2015-01-023-9/+13
| | | | | |
| * | | | | tests: add multiple keys with signature test caseVincent Breitmoser2015-01-021-0/+75
| | | | | |
| * | | | | throw exception if no data is found in getGenericDataVincent Breitmoser2015-01-021-0/+3
| | | | | |
| * | | | | get rid of RuntimeException control flow in UncachedKeyRing.fromStreamVincent Breitmoser2015-01-024-33/+24
| | | | | |
| * | | | | fix and test for bad certificate version numbers (#1012)Vincent Breitmoser2015-01-024-7/+47
| | | | | | | | | | | | | | | | | | | | | | | | closes #1012
| * | | | | tests: for export, check that a token local cert actually exists before exportVincent Breitmoser2015-01-021-10/+22
| | | | | |
| * | | | | tests: add test for key exportVincent Breitmoser2015-01-021-0/+211
| | | | | |
| * | | | | extend canonicalize to strip local certificates on exportVincent Breitmoser2015-01-0212-71/+123
| | | | | |
| * | | | | small improvements regarding pin tests and loggingVincent Breitmoser2015-01-014-6/+33
| | | | | |
| * | | | | add empty notation data packet only if necessaryVincent Breitmoser2015-01-011-16/+35
| | | | | |
| * | | | | tests: be less verbose about inserting keyrings for encrypt/decryptVincent Breitmoser2015-01-011-2/+15
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-28 08:36:03 +0000