aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
Commit message (Expand)AuthorAgeFilesLines
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-061-760/+0
* Use dark icon in warning dialogs in edit keyDominik Schürmann2014-04-061-2/+2
* Use AppMsg in edit keyDominik Schürmann2014-04-051-8/+6
* Fix nfc, make edit activity like a modal dialog, move all menu actions into v...Dominik Schürmann2014-04-051-73/+28
* Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-041-30/+12
|\
| * Simplify PassphraseDialogFragment usageThialfihar2014-04-041-30/+12
* | db-overhaul: fix key export (and some export-related ui changes)Vincent Breitmoser2014-04-041-3/+2
* | db-overhaul: more work on new providerVincent Breitmoser2014-04-031-1/+2
* | ditch useless PgpKeyHelper.getMasterKey methodsVincent Breitmoser2014-04-031-5/+4
|/
* Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-031-96/+133
|\
| * Rename "canEdit" to "canBeEdited"Thialfihar2014-04-021-2/+2
| * Rename "pass phrase" to "passphrase"Thialfihar2014-04-021-20/+20
| * Spacing correctionsThialfihar2014-04-021-3/+2
| * Add missing and curly brackets and fix othersThialfihar2014-04-021-3/+5
| * Rearrange too long linesThialfihar2014-04-021-4/+5
| * Trivial spacing changes to conform to style guideThialfihar2014-04-021-1/+1
| * Adjust import orderThialfihar2014-04-021-0/+1
| * always askAshley Hughes2014-04-021-1/+1
| * confirm that empty IDs are really wantedAshley Hughes2014-04-021-1/+46
| * pass through info that keys are new without relying on new keys orginally bei...Ashley Hughes2014-04-011-0/+1
| * CleanupDominik Schürmann2014-04-011-74/+55
| * Automatically select newly created key in api accountsDominik Schürmann2014-04-011-0/+8
* | Break a lot of stuff. Also, database redesign.Vincent Breitmoser2014-04-031-2/+2
|/
* don't disable save button, show message if nothing needs to be doneAshley Hughes2014-04-011-3/+4
* change how new default keys are passed back, fix showing their usage flagsAshley Hughes2014-03-311-15/+13
* merge masterAshley Hughes2014-03-291-55/+57
|\
| * Rename old mentionings of APG-named thingsThialfihar2014-03-231-4/+4
| * Because of an unknown reason toast messages were commented out.Daniel Hammann2014-03-211-10/+7
| * Fix GPL HeadersNikhil Peter Raj2014-03-211-1/+1
| * Fix for #410Nikhil Peter Raj2014-03-211-5/+9
| * Merge pull request #435 from sreeram-boyapati/change_passphraseDominik Schürmann2014-03-181-3/+5
| |\
| | * Button Text changes to Change Passphrase if Passphrase is setSreeram Boyapati2014-03-181-3/+5
| * | Fix export for new unified key list #409uberspot2014-03-151-2/+4
| |/
| * Make email address less restrictive and add icon to show when it's correctuberspot2014-03-141-2/+0
| * final ui code style changesuberspot2014-03-131-1/+1
| * More code style fixes for /uiuberspot2014-03-131-9/+10
| * First code style changes in uiuberspot2014-03-131-54/+49
| * Merge branch 'unified-keylist'Vincent Breitmoser2014-03-121-4/+2
| |\
| | * Make EditKeyActivity's uri handling (more) saneVincent Breitmoser2014-03-081-4/+2
| * | Add export... button and functionality in multi-selectuberspot2014-03-111-2/+1
| * | Make export work with rowIds instead of MasterKeyIdsuberspot2014-03-111-1/+2
| * | Remove duplicate code from ActionBarHelper. You can now set the drawables via...uberspot2014-03-111-5/+5
| * | Appropriate save Icon in EditKeyActivityuberspot2014-03-111-1/+1
| * | getString before init of KeychainIntentHandlerDominik Schürmann2014-03-101-1/+1
| * | Fix progress_generating and reformatDominik Schürmann2014-03-101-1/+2
| * | progress is shown when creating the default key based on number of keys crea...grait2014-03-081-1/+1
| * | removed useless semicolons, fixed some parameters in documenation, simplified...uberspot2014-03-071-2/+2
* | | pass through original primary IDAshley Hughes2014-03-271-0/+1
* | | keep up with masterAshley Hughes2014-03-071-18/+32
|\| |
| * | corrected commitAnkush2014-03-071-17/+17
| |/