aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Expand)AuthorAgeFilesLines
* Fix nullpointer in ImportKeysActivityDominik Schürmann2015-01-271-13/+24
* Support verification of detached signaturesDominik Schürmann2015-01-272-98/+223
* Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-2710-57/+131
|\
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-2710-57/+132
| |\
| | * backend support for charset in ascii-armored streamsVincent Breitmoser2015-01-276-4/+65
| | * remove unused NonPgpPartExceptionVincent Breitmoser2015-01-261-12/+0
| | * move last parts of import logic from kis into operationVincent Breitmoser2015-01-264-41/+67
* | | Temporary nav drawer fixesDominik Schürmann2015-01-275-18/+27
* | | Fixes for detached signaturesDominik Schürmann2015-01-262-11/+36
* | | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-26112-1853/+2324
|\| |
| * | Material Design DrawerDominik Schürmann2015-01-266-29/+88
| |/
| * Material Design: Full screen dialogsDominik Schürmann2015-01-2612-181/+136
| * 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-257-1/+201
| * work on divert-to-key and other keyring stuffVincent Breitmoser2015-01-255-16/+112
| * 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-155-567/+25
| * Yubikey numkey by default to trueDominik Schürmann2015-01-142-1/+4
| * Toolbar for settingsDominik Schürmann2015-01-144-14/+41
| * Integrate QR Code library instead of requiring the app to be installed, also ...Dominik Schürmann2015-01-141-2/+6
| * fix ambiguous column name in advanced key infoVincent Breitmoser2015-01-141-1/+1
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-143-5/+29
| |\
| | * small fixes to user attribute handlingVincent Breitmoser2015-01-143-3/+27
| | * fix log entry for addition of user attributesVincent Breitmoser2015-01-141-3/+3
| * | Fix SearchViewDominik Schürmann2015-01-141-20/+4
| |/
| * Fix Toolbars in decrypt activitiesDominik Schürmann2015-01-142-6/+12
| * Launcher icon fixesDominik Schürmann2015-01-142-8/+7
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-1416-101/+662
| |\
| | * actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-147-16/+185
| | * 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-133-3/+57
| | * 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-124-0/+350
| * | Refactor BaseActivityDominik Schürmann2015-01-1326-62/+85
| * | Use Toolbar and new BaseActivityDominik Schürmann2015-01-1316-50/+91
| * | Start working on Material DesignDominik Schürmann2015-01-138-55/+88
| |/
| * 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
* | | No output stream for detached signatures, makes no sense to pipe it throughDominik Schürmann2015-01-081-2/+1
* | | Experimental API support for detached signatures (not tested)Dominik Schürmann2015-01-085-44/+118
|/ /
* | Clearup after lockpattern experimentsDominik Schürmann2015-01-062-31/+26
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 18:26:50 +0000