aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | introduce PromoteKeyOperation to create dummy secret from public keysVincent Breitmoser2015-01-258-1/+208
| | | | | | |
| | * | | | | work on divert-to-key and other keyring stuffVincent Breitmoser2015-01-256-16/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - allow modifySecretKeyRing operation without passphrase, but a only restricted subset of operations (ie, s2k strip/divert) - pass byte array with serial number to key edit operation to initialize divert-to-card key - update spongycastle to support serial numbers in iv for divert-to-card
| | * | | | | 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 ↵Dominik Schürmann2015-01-192-1/+9
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | development
| | | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #1029 Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
| | * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | due to security reasons
| | * | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-141-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | development
| | | * | | | 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 ↵Dominik Schürmann2015-01-144-5/+30
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | development
| | | * | | | 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 ↵Dominik Schürmann2015-01-1417-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
| | | * | | | 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-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
| | |\ \ \ \ | | | | | | | | | | | | | | 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
| | | | | | |
| * | | | | | 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
| |/ / / / /
* | | | | | small language fixVincent Breitmoser2015-01-162-15/+19
| | | | | |
* | | | | | linked id ui work dns/twitterVincent Breitmoser2015-01-165-14/+19
| | | | | |
* | | | | | dns resource is parametrized by fqdn, class and typeVincent Breitmoser2015-01-162-5/+34
| | | | | |
* | | | | | show notification if KeyListActivity is spawned with an EXTRA_RESULTVincent Breitmoser2015-01-162-1/+9
| | | | | |
* | | | | | affirmation -> linked identityVincent Breitmoser2015-01-1529-206/+178
| | | | | |
* | | | | | work on dns resource, working (dummy) verificationVincent Breitmoser2015-01-1410-79/+686
| | | | | |
* | | | | | fix ambiguous column name in advanced key infoVincent Breitmoser2015-01-141-1/+1
| | | | | |
* | | | | | small fixes to user attribute handlingVincent Breitmoser2015-01-144-3/+28
| | | | | |