Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Cleanup | Dominik Schürmann | 2014-04-01 | 2 | -79/+55 |
* | Automatically select newly created key in api accounts | Dominik Schürmann | 2014-04-01 | 4 | -18/+47 |
* | Fully qualified imports | Dominik Schürmann | 2014-04-01 | 7 | -19/+99 |
* | Remove DECRYPT_ASSUME_SYMMETRIC | Dominik Schürmann | 2014-04-01 | 2 | -6/+0 |
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-04-01 | 9 | -117/+347 |
|\ | |||||
| * | test: add junit+robolectric to buildfiles and stub test file | Vincent Breitmoser | 2014-04-01 | 4 | -1/+112 |
| * | PgpKeyOperation: factor out all android dependencies | Vincent Breitmoser | 2014-04-01 | 5 | -116/+235 |
* | | default to allow symmetric decryption | Dominik Schürmann | 2014-04-01 | 1 | -1/+1 |
|/ | |||||
* | Fix symmetric decryption | Dominik Schürmann | 2014-04-01 | 5 | -117/+117 |
* | Fix pre-selection for encrypt | Dominik Schürmann | 2014-04-01 | 1 | -4/+2 |
* | language | Dominik Schürmann | 2014-04-01 | 1 | -2/+2 |
* | More layout fixes | Dominik Schürmann | 2014-04-01 | 1 | -56/+62 |
* | More layout fixes | Dominik Schürmann | 2014-04-01 | 2 | -97/+108 |
* | Language clarifications | Dominik Schürmann | 2014-04-01 | 3 | -9/+11 |
* | Fix layouts | Dominik Schürmann | 2014-04-01 | 11 | -97/+100 |
* | Simplify encrypt and sign backend | Dominik Schürmann | 2014-04-01 | 3 | -115/+59 |
* | 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 |
* | 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 pull request #491 from openpgp-keychain/edit-key | Dominik Schürmann | 2014-03-30 | 16 | -504/+1279 |
|\ | |||||
| * | 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 | 302 | -5693/+10721 |
| |\ | |||||
| * | | 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 mas... | Ashley Hughes | 2014-03-27 | 1 | -3/+29 |
| * | | 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 |