| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | new ID sigs already added, so do save them | Ashley Hughes | 2014-04-02 | 1 | -1/+1 |
| | | |||||
| * | allow blank IDs, allow adding new IDs and let them be master | Ashley Hughes | 2014-04-02 | 2 | -5/+8 |
| | | |||||
| * | pass through info that keys are new without relying on new keys orginally ↵ | Ashley Hughes | 2014-04-01 | 5 | -2/+22 |
| | | | | | being empty | ||||
| * | sort out saving empty string IDs | Ashley Hughes | 2014-04-01 | 1 | -9/+3 |
| | | |||||
| * | Menu cleanup | Dominik Schürmann | 2014-04-01 | 4 | -28/+47 |
| | | |||||
| * | Dont show encrypted data before decryption from clipboard | Dominik Schürmann | 2014-04-01 | 1 | -7/+14 |
| | | |||||
| * | Change path to OpenKeychain | Dominik Schürmann | 2014-04-01 | 1 | -3/+8 |
| | | |||||
| * | Only allow private keys associated to accounts of an app | Dominik Schürmann | 2014-04-01 | 4 | -18/+39 |
| | | |||||
| * | Add API image | Dominik Schürmann | 2014-04-01 | 1 | -0/+0 |
| | | |||||
| * | 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 |
| |\ | |||||
| | * | Merge pull request #501 from Valodim/master | Dominik Schürmann | 2014-04-01 | 9 | -117/+347 |
| | |\ | | | | | | | factor out android dependencies from PgpKeyOperation, and add JUnit/Robolectric testing stubs | ||||
| | | * | 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 |
| | |/ | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * / | 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 |
| | | | | | 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 |
| | | | | | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |