Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Spacing corrections | Thialfihar | 2014-04-02 | 1 | -3/+2 |
| | |||||
* | Add missing and curly brackets and fix others | Thialfihar | 2014-04-02 | 5 | -50/+47 |
| | | | | | Style guide demands them even for single-line blocks, and opening curly brackets never appear on a line on their own. | ||||
* | Rearrange too long lines | Thialfihar | 2014-04-02 | 16 | -48/+87 |
| | |||||
* | Adjust variable/member naming to conform to style guide | Thialfihar | 2014-04-02 | 9 | -70/+73 |
| | | | | | In some cases change member accessibility, so the naming matches. Also, some key words were reordered to comply with JLS suggestions. | ||||
* | Trivial spacing changes to conform to style guide | Thialfihar | 2014-04-02 | 18 | -57/+56 |
| | |||||
* | Adjust copyright headers | Thialfihar | 2014-04-02 | 2 | -2/+2 |
| | |||||
* | Adjust import order | Thialfihar | 2014-04-02 | 11 | -49/+24 |
| | |||||
* | always ask | Ashley Hughes | 2014-04-02 | 1 | -1/+1 |
| | |||||
* | confirm that empty IDs are really wanted | Ashley Hughes | 2014-04-02 | 1 | -1/+46 |
| | |||||
* | allow blank IDs, allow adding new IDs and let them be master | Ashley Hughes | 2014-04-02 | 1 | -2/+5 |
| | |||||
* | pass through info that keys are new without relying on new keys orginally ↵ | Ashley Hughes | 2014-04-01 | 3 | -0/+13 |
| | | | | being empty | ||||
* | Menu cleanup | Dominik Schürmann | 2014-04-01 | 1 | -4/+5 |
| | |||||
* | Dont show encrypted data before decryption from clipboard | Dominik Schürmann | 2014-04-01 | 1 | -7/+14 |
| | |||||
* | Cleanup | Dominik Schürmann | 2014-04-01 | 2 | -79/+55 |
| | |||||
* | Automatically select newly created key in api accounts | Dominik Schürmann | 2014-04-01 | 2 | -16/+19 |
| | |||||
* | Fully qualified imports | Dominik Schürmann | 2014-04-01 | 1 | -0/+3 |
| | |||||
* | Remove DECRYPT_ASSUME_SYMMETRIC | Dominik Schürmann | 2014-04-01 | 2 | -6/+0 |
| | |||||
* | Fix symmetric decryption | Dominik Schürmann | 2014-04-01 | 2 | -0/+6 |
| | |||||
* | Fix pre-selection for encrypt | Dominik Schürmann | 2014-04-01 | 1 | -4/+2 |
| | |||||
* | Fix layouts | Dominik Schürmann | 2014-04-01 | 1 | -0/+1 |
| | |||||
* | Simplify encrypt and sign backend | Dominik Schürmann | 2014-04-01 | 2 | -17/+5 |
| | |||||
* | Fix symmetric encryption and cleanup | Dominik Schürmann | 2014-04-01 | 6 | -124/+77 |
| | |||||
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-04-01 | 2 | -21/+20 |
|\ | |||||
| * | don't disable save button, show message if nothing needs to be done | Ashley Hughes | 2014-04-01 | 1 | -3/+4 |
| | | |||||
| * | change how new default keys are passed back, fix showing their usage flags | Ashley Hughes | 2014-03-31 | 2 | -20/+18 |
| | | |||||
* | | Experimental work on a fragment-based encrypt activity | Dominik Schürmann | 2014-04-01 | 10 | -857/+1265 |
|/ | |||||
* | Include signature result in fragments | Dominik Schürmann | 2014-03-30 | 5 | -245/+204 |
| | |||||
* | Decrypt mostly works again | Dominik Schürmann | 2014-03-30 | 4 | -541/+214 |
| | |||||
* | compiles again | Dominik Schürmann | 2014-03-30 | 2 | -7/+9 |
| | |||||
* | More experimental work on decrypt fragments | Dominik Schürmann | 2014-03-30 | 5 | -333/+582 |
| | |||||
* | Experiments with fragments in decrypt activity | Dominik Schürmann | 2014-03-30 | 5 | -155/+421 |
| | |||||
* | Merge pull request #491 from openpgp-keychain/edit-key | Dominik Schürmann | 2014-03-30 | 7 | -239/+599 |
|\ | | | | | Edit key changes | ||||
| * | merge master | Ashley Hughes | 2014-03-29 | 63 | -2339/+2823 |
| |\ | |||||
| * | | pass through original primary ID | Ashley Hughes | 2014-03-27 | 3 | -0/+21 |
| | | | |||||
| * | | keep up with master | Ashley Hughes | 2014-03-07 | 25 | -364/+939 |
| |\ \ | |||||
| * | | | use parcel to save keys, but saving existing keys is disabled, pending a ↵ | Ashley Hughes | 2014-03-06 | 1 | -29/+17 |
| | | | | | | | | | | | | | | | | rewrite... | ||||
| * | | | fix saving new key (tmp) | Ashley Hughes | 2014-03-06 | 1 | -1/+4 |
| | | | | |||||
| * | | | pass through which keys are new | Ashley Hughes | 2014-02-22 | 3 | -0/+19 |
| | | | | |||||
| * | | | change how primary id changing is passed through | Ashley Hughes | 2014-02-22 | 3 | -1/+21 |
| | | | | |||||
| * | | | master merge | Ashley Hughes | 2014-02-22 | 27 | -858/+1062 |
| |\ \ \ | |||||
| * | | | | put main original id at the top | Ashley Hughes | 2014-02-21 | 1 | -1/+4 |
| | | | | | |||||
| * | | | | pass through deleted keys | Ashley Hughes | 2014-02-15 | 2 | -2/+16 |
| | | | | | |||||
| * | | | | propgate through | Ashley Hughes | 2014-02-14 | 3 | -10/+33 |
| | | | | | |||||
| * | | | | save work, this code doesn't work... | Ashley Hughes | 2014-02-13 | 2 | -0/+34 |
| | | | | | |||||
| * | | | | saving fixes | Ashley Hughes | 2014-02-08 | 3 | -23/+33 |
| | | | | | |||||
| * | | | | some AS Inspect Code fixes | Ashley Hughes | 2014-02-08 | 1 | -18/+15 |
| | | | | | |||||
| * | | | | consistent ui | Ashley Hughes | 2014-02-08 | 1 | -10/+7 |
| | | | | | |||||
| * | | | | keep track of brand new keys, they need saving | Ashley Hughes | 2014-02-08 | 1 | -1/+4 |
| | | | | | |||||
| * | | | | fix create keyring crash | Ashley Hughes | 2014-02-08 | 1 | -6/+10 |
| | | | | | |||||
| * | | | | disable export if unsaved | Ashley Hughes | 2014-02-08 | 1 | -2/+6 |
| | | | | |