Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Simplify PassphraseDialogFragment usage | Thialfihar | 2014-04-04 | 7 | -153/+89 |
* | title for ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN | Dominik Schürmann | 2014-04-03 | 1 | -2/+2 |
* | Callback for OpenPgpServiceConnection | Dominik Schürmann | 2014-04-03 | 1 | -0/+33 |
* | simplify OpenPgpServiceConnection | Dominik Schürmann | 2014-04-03 | 1 | -5/+2 |
* | Keychain API Demo 3 | Dominik Schürmann | 2014-04-03 | 1 | -2/+2 |
* | Merge branch 'db-overhaul' of git://github.com/Valodim/openpgp-keychain into ... | Dominik Schürmann | 2014-04-03 | 26 | -1407/+635 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/master' into db-overhaul | Vincent Breitmoser | 2014-04-03 | 113 | -1011/+1322 |
| |\ | |||||
| * | | Break a lot of stuff. Also, database redesign. | Vincent Breitmoser | 2014-04-03 | 25 | -1367/+598 |
* | | | Disable tests | Dominik Schürmann | 2014-04-03 | 1 | -1/+1 |
* | | | version 2.5 | Dominik Schürmann | 2014-04-03 | 1 | -2/+2 |
* | | | Update from transifex | Dominik Schürmann | 2014-04-03 | 25 | -1/+221 |
* | | | Changelog | Dominik Schürmann | 2014-04-03 | 3 | -2/+8 |
* | | | Key lookup for API | Dominik Schürmann | 2014-04-03 | 2 | -6/+8 |
* | | | Key lookup for API | Dominik Schürmann | 2014-04-03 | 2 | -7/+16 |
* | | | Implement ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN | Dominik Schürmann | 2014-04-03 | 10 | -147/+155 |
| |/ |/| | |||||
* | | Cleanup DrawerActivity | Dominik Schürmann | 2014-04-03 | 1 | -31/+4 |
* | | clarify readme | Dominik Schürmann | 2014-04-03 | 1 | -1/+1 |
* | | Merge pull request #508 from thi/naming-adjustments | Dominik Schürmann | 2014-04-02 | 15 | -106/+106 |
|\ \ | |||||
| * | | Rename "canEdit" to "canBeEdited" | Thialfihar | 2014-04-02 | 4 | -13/+13 |
| * | | Rename "armour" to "armor" | Thialfihar | 2014-04-02 | 6 | -20/+20 |
| * | | Rename "pass phrase" to "passphrase" | Thialfihar | 2014-04-02 | 10 | -73/+73 |
|/ / | |||||
* | | Cleanup example code | Dominik Schürmann | 2014-04-02 | 1 | -7/+7 |
* | | Started changelog for 2.5 | Dominik Schürmann | 2014-04-02 | 1 | -0/+8 |
* | | Fix build | Dominik Schürmann | 2014-04-02 | 1 | -0/+2 |
* | | Merge pull request #507 from thi/fix-wildcard-imports | Dominik Schürmann | 2014-04-02 | 15 | -25/+135 |
|\ \ | |||||
| * | | Add wildcard import warning to checkstyle configuration | Thialfihar | 2014-04-02 | 1 | -1/+7 |
| * | | Replace wildcard imports with explicit imports | Thialfihar | 2014-04-02 | 13 | -21/+126 |
| * | | Spacing corrections | Thialfihar | 2014-04-02 | 1 | -3/+2 |
|/ / | |||||
* | | Update from transifex | Dominik Schürmann | 2014-04-02 | 32 | -270/+217 |
* | | Merge pull request #502 from thi/conform-to-style-guide | Dominik Schürmann | 2014-04-02 | 68 | -464/+538 |
|\ \ | |||||
| * | | Suppress checkstyle for some files | Thialfihar | 2014-04-02 | 2 | -2/+14 |
| * | | Add missing and curly brackets and fix others | Thialfihar | 2014-04-02 | 7 | -60/+61 |
| * | | Rearrange too long lines | Thialfihar | 2014-04-02 | 28 | -145/+228 |
| * | | Adjust variable/member naming to conform to style guide | Thialfihar | 2014-04-02 | 11 | -79/+82 |
| * | | Trivial spacing changes to conform to style guide | Thialfihar | 2014-04-02 | 29 | -85/+87 |
| * | | Adjust copyright headers | Thialfihar | 2014-04-02 | 6 | -12/+20 |
| * | | Adjust import order | Thialfihar | 2014-04-02 | 24 | -81/+46 |
|/ / | |||||
* | | always ask | Ashley Hughes | 2014-04-02 | 1 | -1/+1 |
* | | confirm that empty IDs are really wanted | Ashley Hughes | 2014-04-02 | 2 | -1/+47 |
* | | 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 bei... | Ashley Hughes | 2014-04-01 | 5 | -2/+22 |
* | | 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 |