aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-144-5/+30
|\
| * small fixes to user attribute handlingVincent Breitmoser2015-01-144-3/+28
| * 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
* Launcher icon fixesDominik Schürmann2015-01-1411-20/+7
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-1417-102/+698
|\
| * 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
| * hack to make WrappedUserAttribute serializableVincent Breitmoser2015-01-131-0/+90
| * support addition of user attributesVincent Breitmoser2015-01-134-3/+60
| * 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-1319-180/+243
* | Set minSdk to 14Dominik Schürmann2015-01-132-7/+4
|/
* Merge pull request #1023 from adithyaphilip/developmentDominik Schürmann2015-01-121-7/+28
|\
| * fixed crash when file scheme is passed, broadened deletion scopeAbraham Philip2015-01-091-7/+28
* | Test new iconDominik Schürmann2015-01-076-0/+0
* | 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 dev...Dominik Schürmann2015-01-0631-256/+621
|\|
| * 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-038-144/+272
| * deal with non-existent user ids during import (#994)Vincent Breitmoser2015-01-023-9/+13
| * 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-022-26/+19
| * fix and test for bad certificate version numbers (#1012)Vincent Breitmoser2015-01-021-7/+13
| * extend canonicalize to strip local certificates on exportVincent Breitmoser2015-01-0212-71/+123
| * small improvements regarding pin tests and loggingVincent Breitmoser2015-01-013-1/+10
| * add empty notation data packet only if necessaryVincent Breitmoser2015-01-011-16/+35
| * tests: add multi key encryption/decryption test, new way for fake passphrase ...Vincent Breitmoser2015-01-012-2/+2
| * fix small merge conflict oversightVincent Breitmoser2014-12-301-3/+0
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-12-3022-62/+125
| |\
| * | some small notation data fixesVincent Breitmoser2014-12-302-10/+10
| * | add PIN as a SecretKeyTypeVincent Breitmoser2014-12-308-5/+38
| * | fix unit tests for ChangeUnlockParcelVincent Breitmoser2014-12-301-0/+3
| * | introduce handling of notation direct key signatures, and experimental pin no...Vincent Breitmoser2014-12-3013-24/+126
* | | Passphrase wizard testsDominik Schürmann2015-01-0613-22/+1891
| |/ |/|
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-12-295-65/+173
|\|
| * introduce new ChangeUnlockParcel packet for extended passphrase changing capa...Vincent Breitmoser2014-12-295-65/+173
* | New work on PIN and lock pattern UIDominik Schürmann2014-12-2921-61/+126
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 13:13:20 +0000