aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
Commit message (Expand)AuthorAgeFilesLines
* work on divert-to-key and other keyring stuffVincent Breitmoser2015-01-256-16/+114
* allow explicit re-certification in SaveKeyringParcelVincent Breitmoser2015-01-242-1/+8
* move key stripping into ChangeSubkey, support divert-to-cardVincent Breitmoser2015-01-245-39/+56
* only respect most recent signature for key flagsVincent Breitmoser2015-01-192-12/+42
* always show revoked user ids last!Vincent Breitmoser2015-01-191-4/+4
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-192-1/+9
|\
| * No setContentView in onCreate for KeyListActivityVincent2015-01-161-2/+0
| * show notification if KeyListActivity is spawned with an EXTRA_RESULTVincent Breitmoser2015-01-162-1/+11
* | Disable sharing chooser blacklisting for lollipopDominik Schürmann2015-01-193-3/+6
|/
* Style tabs, add missing drawablesDominik Schürmann2015-01-1520-573/+38
* Fix drawable sizesDominik Schürmann2015-01-1419-0/+0
* Yubikey numkey by default to trueDominik Schürmann2015-01-142-1/+4
* Toolbar for settingsDominik Schürmann2015-01-1413-19/+56
* Integrate QR Code library instead of requiring the app to be installed, also ...Dominik Schürmann2015-01-142-2/+7
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-141-1/+1
|\
| * fix ambiguous column name in advanced key infoVincent Breitmoser2015-01-141-1/+1
* | Reorganize folders of graphics sourcesDominik Schürmann2015-01-1437-1/+1
|/
* 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-1318-180/+242
* | Set minSdk to 14Dominik Schürmann2015-01-131-4/+1
|/
* 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