aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-26652-3346/+5071
|\
| * Material Design DrawerDominik Schürmann2015-01-2635-29/+101
| * Material Design: Full screen dialogsDominik Schürmann2015-01-2657-273/+209
| * specify our usage of java 1.7 in build filesVincent Breitmoser2015-01-251-0/+5
| * lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-2588-838/+757
| * introduce PromoteKeyOperation to create dummy secret from public keysVincent Breitmoser2015-01-259-1/+334
| * work on divert-to-key and other keyring stuffVincent Breitmoser2015-01-258-18/+165
| * allow explicit re-certification in SaveKeyringParcelVincent Breitmoser2015-01-243-2/+10
| * move key stripping into ChangeSubkey, support divert-to-cardVincent Breitmoser2015-01-247-41/+58
| * forgot another test case in prev. commitVincent Breitmoser2015-01-191-1/+2
| * fix unit test for new key flag behaviorVincent Breitmoser2015-01-191-2/+2
| * 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-1522-573/+43
| * Fix drawable sizesDominik Schürmann2015-01-1420-3/+3
| * Yubikey numkey by default to trueDominik Schürmann2015-01-142-1/+4
| * Toolbar for settingsDominik Schürmann2015-01-1414-20/+58
| * Integrate QR Code library instead of requiring the app to be installed, also ...Dominik Schürmann2015-01-145-6/+17
| * Increase minSdk to 15, according to statsDominik Schürmann2015-01-141-1/+1
| * 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-14209-78/+596
| |/
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-148-20/+169
| |\
| | * 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 dev...Dominik Schürmann2015-01-1418-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
| | * update spongycastle with more public methods for WrappedUserAttributeVincent Breitmoser2015-01-131-0/+0
| | * 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-1320-180/+247
| * | Set minSdk to 14Dominik Schürmann2015-01-133-7/+4
| |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 12:12:27 +0000