Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Fix symmetric encryption and cleanup | Dominik Schürmann | 2014-04-01 | 8 | -136/+91 | |
| | ||||||
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-04-01 | 4 | -26/+40 | |
|\ | ||||||
| * | don't disable save button, show message if nothing needs to be done | Ashley Hughes | 2014-04-01 | 2 | -3/+5 | |
| | | ||||||
| * | create three keys by default | Ashley Hughes | 2014-03-31 | 1 | -1/+8 | |
| | | ||||||
| * | change how new default keys are passed back, fix showing their usage flags | Ashley Hughes | 2014-03-31 | 3 | -24/+29 | |
| | | ||||||
* | | Small layout fix (more to come) | Dominik Schürmann | 2014-04-01 | 1 | -1/+1 | |
| | | ||||||
* | | Experimental work on a fragment-based encrypt activity | Dominik Schürmann | 2014-04-01 | 15 | -1176/+1302 | |
| | | ||||||
* | | Layouts for new encrypt design | Dominik Schürmann | 2014-03-31 | 6 | -12/+263 | |
|/ | ||||||
* | Include signature result in fragments | Dominik Schürmann | 2014-03-30 | 8 | -290/+242 | |
| | ||||||
* | Decrypt mostly works again | Dominik Schürmann | 2014-03-30 | 7 | -700/+255 | |
| | ||||||
* | compiles again | Dominik Schürmann | 2014-03-30 | 2 | -7/+9 | |
| | ||||||
* | More experimental work on decrypt fragments | Dominik Schürmann | 2014-03-30 | 14 | -516/+831 | |
| | ||||||
* | Experiments with fragments in decrypt activity | Dominik Schürmann | 2014-03-30 | 9 | -251/+603 | |
| | ||||||
* | Remove cancel from app menu | Dominik Schürmann | 2014-03-30 | 2 | -7/+0 | |
| | ||||||
* | Revert "Remove cancel from app menu" | Dominik Schürmann | 2014-03-30 | 2 | -0/+7 | |
| | | | | This reverts commit 3c0b97f280f11d553d93df9bc93ce47098af35d4. | |||||
* | Remove cancel from app menu | Dominik Schürmann | 2014-03-30 | 2 | -7/+0 | |
| | ||||||
* | Remove FLAG_ONE_SHOT from most PIs | Dominik Schürmann | 2014-03-30 | 2 | -6/+6 | |
| | ||||||
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-03-30 | 16 | -504/+1279 | |
|\ | ||||||
| * | Merge pull request #491 from openpgp-keychain/edit-key | Dominik Schürmann | 2014-03-30 | 16 | -504/+1279 | |
| |\ | | | | | | | Edit key changes | |||||
| | * | style changes | Ashley Hughes | 2014-03-30 | 1 | -27/+26 | |
| | | | ||||||
| | * | use save icon, not tick | Ashley Hughes | 2014-03-29 | 1 | -1/+1 | |
| | | | ||||||
| | * | revert mistake | Ashley Hughes | 2014-03-29 | 1 | -1/+1 | |
| | | | ||||||
| | * | merge master | Ashley Hughes | 2014-03-29 | 353 | -5731/+26503 | |
| | |\ | ||||||
| | * | | all editing cases I can think of now work | Ashley Hughes | 2014-03-27 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | fix for editing master keys and IDs, case of change primary ID and modify ↵ | Ashley Hughes | 2014-03-27 | 1 | -3/+29 | |
| | | | | | | | | | | | | | | | | master key props fails | |||||
| | * | | pass through original primary ID | Ashley Hughes | 2014-03-27 | 3 | -0/+21 | |
| | | | | ||||||
| | * | | add original primary ID field to parcel | Ashley Hughes | 2014-03-26 | 1 | -0/+3 | |
| | | | | ||||||
| | * | | allow master key updates by removing old primary ID cert | Ashley Hughes | 2014-03-25 | 1 | -0/+8 | |
| | | | | ||||||
| | * | | delete IDs needs to update keyring, flag it | Ashley Hughes | 2014-03-25 | 1 | -1/+2 | |
| | | | | ||||||
| | * | | allow lists to be subkeys or keyrings | Ashley Hughes | 2014-03-25 | 1 | -6/+23 | |
| | | | | ||||||
| | * | | results of debugging, fix several bugs - more needed though... | Ashley Hughes | 2014-03-25 | 1 | -31/+45 | |
| | | | | ||||||
| | * | | comments, slight change to progress bar | Ashley Hughes | 2014-03-24 | 1 | -6/+10 | |
| | | | | ||||||
| | * | | make sure ID info is saved | Ashley Hughes | 2014-03-24 | 1 | -3/+10 | |
| | | | | ||||||
| | * | | work on saving | Ashley Hughes | 2014-03-24 | 1 | -22/+23 | |
| | | | | ||||||
| | * | | move stuff around, save work | Ashley Hughes | 2014-03-23 | 1 | -59/+61 | |
| | | | | ||||||
| | * | | unused imports | Ashley Hughes | 2014-03-11 | 1 | -4/+0 | |
| | | | | ||||||
| | * | | start modifying save code | Ashley Hughes | 2014-03-10 | 1 | -8/+26 | |
| | | | | ||||||
| | * | | uncomment, use Parcel. Builds, not functional | Ashley Hughes | 2014-03-07 | 1 | -25/+23 | |
| | | | | ||||||
| | * | | keep up with master | Ashley Hughes | 2014-03-07 | 168 | -3031/+2898 | |
| | |\ \ | ||||||
| | * | | | use parcel to save keys, but saving existing keys is disabled, pending a ↵ | Ashley Hughes | 2014-03-06 | 4 | -78/+49 | |
| | | | | | | | | | | | | | | | | | | | | rewrite... | |||||
| | * | | | fix saving new key (tmp) | Ashley Hughes | 2014-03-06 | 3 | -3/+13 | |
| | | | | | ||||||
| | * | | | a method, if not the best one, for each property | Ashley Hughes | 2014-03-06 | 1 | -2/+6 | |
| | | | | | ||||||
| | * | | | begin adding parcel for save intent | Ashley Hughes | 2014-03-02 | 2 | -3/+97 | |
| | | | | | ||||||
| | * | | | pass through which keys are new | Ashley Hughes | 2014-02-22 | 5 | -3/+29 | |
| | | | | | ||||||
| | * | | | remove deleted keys | Ashley Hughes | 2014-02-22 | 1 | -0/+4 | |
| | | | | | ||||||
| | * | | | first go at saving IDs correctly | Ashley Hughes | 2014-02-22 | 1 | -14/+64 | |
| | | | | | ||||||
| | * | | | change how primary id changing is passed through | Ashley Hughes | 2014-02-22 | 5 | -5/+28 | |
| | | | | | ||||||
| | * | | | master merge | Ashley Hughes | 2014-02-22 | 259 | -5932/+10079 | |
| | |\ \ \ | ||||||
| | * | | | | put main original id at the top | Ashley Hughes | 2014-02-21 | 1 | -1/+4 | |
| | | | | | | ||||||
| | * | | | | initial split into two functions | Ashley Hughes | 2014-02-21 | 1 | -24/+154 | |
| | | | | | |