aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix cleartext signatures internallyDominik Schürmann2015-01-271-5/+4
|
* Update api libDominik Schürmann2015-01-271-0/+0
|
* Fix nullpointer in ImportKeysActivityDominik Schürmann2015-01-271-13/+24
|
* Merge branch 'detached-sigs-api' into developmentDominik Schürmann2015-01-2716-200/+449
|\
| * Support verification of detached signaturesDominik Schürmann2015-01-273-98/+223
| |
| * Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-2713-57/+187
| |\ | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
| * | Temporary nav drawer fixesDominik Schürmann2015-01-279-20/+54
| | |
| * | Fixes for detached signaturesDominik Schürmann2015-01-262-11/+36
| | |
| * | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-26652-3346/+5071
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * | | Update safeslinger libDominik Schürmann2015-01-121-0/+0
| | | |
| * | | No output stream for detached signatures, makes no sense to pipe it throughDominik Schürmann2015-01-082-2/+1
| | | |
| * | | Experimental API support for detached signatures (not tested)Dominik Schürmann2015-01-086-44/+118
| | | |
* | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-271-0/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | development
| * | | update openpgp-api-lib for charset supportVincent Breitmoser2015-01-271-0/+0
| | | |
* | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-2712-57/+188
|\| | | | |_|/ |/| | | | | development
| * | backend support for charset in ascii-armored streamsVincent Breitmoser2015-01-278-4/+120
| | |
| * | remove unused NonPgpPartExceptionVincent Breitmoser2015-01-261-12/+0
| | |
| * | move last parts of import logic from kis into operationVincent Breitmoser2015-01-265-41/+68
| | |
* | | 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 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-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 ↵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-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
| | | | | | | | due to security reasons
* | Increase minSdk to 15, according to statsDominik Schürmann2015-01-141-1/+1
| |
* | 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-14209-78/+596
|/ /
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-148-20/+169
|\ \ | | | | | | | | | development
| * | 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
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-28 04:47:48 +0000