aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-241-64/+22
|\
| * More cleanupDominik Schürmann2015-04-151-3/+1
| * Fix certify with CryptoInputParcelDominik Schürmann2015-03-251-1/+1
| * Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-241-9/+6
| |\
| * \ Merge remote-tracking branch 'origin/development' into v/crypto-input-parcelVincent Breitmoser2015-03-211-2/+2
| |\ \
| * \ \ Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-201-1/+3
| |\ \ \
| * | | | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-201-64/+22
* | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-091-9/+5
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | shifted multi-threading to own serviceAdithya Abraham Philip2015-03-231-9/+5
| | |_|/ | |/| |
* | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-241-8/+9
|\| | |
| * | | Reworked Notify classManoj Khanna2015-03-201-2/+2
| | |/ | |/|
| * | New Passphrase class for safer passphrase handling in memoryDominik Schürmann2015-03-191-5/+6
| |/
| * object oriented split user idDominik Schürmann2015-03-161-1/+1
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-151-1/+1
|\|
| * Merge pull request #1117 from danielnelz/developmentDominik Schürmann2015-03-121-1/+1
| |\
| | * Created enum MessageStatus in KeychainIntentServiceHandler and enum IOTypedanielnelz2015-03-091-1/+1
* | | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-03-101-1/+0
|\| |
| * | Add additional email addresses in create keyDominik Schürmann2015-03-101-1/+0
| |/
* / work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-041-1/+1
|/
* Material Design: Full screen dialogsDominik Schürmann2015-01-261-13/+6
* lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-251-4/+1
* work on divert-to-key and other keyring stuffVincent Breitmoser2015-01-251-1/+1
* move key stripping into ChangeSubkey, support divert-to-cardVincent Breitmoser2015-01-241-5/+7
* make user_ids table typed, with attribute_data supportVincent Breitmoser2015-01-141-1/+2
* Clearup after lockpattern experimentsDominik Schürmann2015-01-061-25/+25
* Passphrase wizard testsDominik Schürmann2015-01-061-22/+25
* introduce new ChangeUnlockParcel packet for extended passphrase changing capa...Vincent Breitmoser2014-12-291-3/+8
* Use passphrase dialog activity instead of passphrase dialogDominik Schürmann2014-10-251-23/+32
* move around package structure a bitVincent Breitmoser2014-10-101-5/+3
* Replace many PgpGeneralExceptions with PgpKeyNotFoundExceptionDominik Schürmann2014-10-091-2/+3
* Revert "Replace PgpGeneralException with NotFoundException where appropriate"Dominik Schürmann2014-10-091-0/+3
* Replace PgpGeneralException with NotFoundException where appropriateDominik Schürmann2014-10-091-3/+0
* DecryptTextActivity reworkDominik Schürmann2014-09-231-1/+1
* passphrasecache: cache by master key, introduce preference for cache by subkeyVincent Breitmoser2014-09-231-1/+1
* Fix custom key configuration for primary user idsDominik Schürmann2014-09-211-5/+17
* Feature to change key configuration in create keyDominik Schürmann2014-09-211-29/+80
* package reordering: merge util and helper, there were no real difference; cre...Dominik Schürmann2014-09-171-1/+1
* work on OperationResultParcelVincent Breitmoser2014-09-141-7/+7
* promote all result parcels to top level classes in their own packageVincent Breitmoser2014-09-131-4/+4
* add ui support for stripping subkeysVincent Breitmoser2014-09-111-0/+8
* introduce SingletonResult for... singleton resultsVincent Breitmoser2014-09-081-6/+2
* Properly handle uneditable key types in EditKeyFragmentVincent Breitmoser2014-09-081-9/+39
* Work on Yubikey decryptionDominik Schürmann2014-09-081-0/+1
* make EditKeyFragment work with new PassphraseDialogVincent Breitmoser2014-09-071-40/+40
* add cancel support to edit key actionVincent Breitmoser2014-08-311-4/+6
* Fix nullpointer when revoking keysDominik Schürmann2014-08-211-1/+2
* Fixes for expiry UIDominik Schürmann2014-08-181-2/+2
* Fix expiry when adding subkeysDominik Schürmann2014-08-161-1/+0
* handle modify and save errors in KeychainIntentResultVincent Breitmoser2014-08-141-8/+7
* Better error handling for passphrase cache if key is missingDominik Schürmann2014-08-131-2/+8
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 13:12:48 +0000