aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* clarify readmeDominik Schürmann2014-04-031-1/+1
* Merge pull request #508 from thi/naming-adjustmentsDominik Schürmann2014-04-0215-106/+106
|\
| * Rename "canEdit" to "canBeEdited"Thialfihar2014-04-024-13/+13
| * Rename "armour" to "armor"Thialfihar2014-04-026-20/+20
| * Rename "pass phrase" to "passphrase"Thialfihar2014-04-0210-73/+73
|/
* Cleanup example codeDominik Schürmann2014-04-021-7/+7
* Started changelog for 2.5Dominik Schürmann2014-04-021-0/+8
* Fix buildDominik Schürmann2014-04-021-0/+2
* Merge pull request #507 from thi/fix-wildcard-importsDominik Schürmann2014-04-0215-25/+135
|\
| * Add wildcard import warning to checkstyle configurationThialfihar2014-04-021-1/+7
| * Replace wildcard imports with explicit importsThialfihar2014-04-0213-21/+126
| * Spacing correctionsThialfihar2014-04-021-3/+2
|/
* Update from transifexDominik Schürmann2014-04-0232-270/+217
* Merge pull request #502 from thi/conform-to-style-guideDominik Schürmann2014-04-0268-464/+538
|\
| * Suppress checkstyle for some filesThialfihar2014-04-022-2/+14
| * Add missing and curly brackets and fix othersThialfihar2014-04-027-60/+61
| * Rearrange too long linesThialfihar2014-04-0228-145/+228
| * Adjust variable/member naming to conform to style guideThialfihar2014-04-0211-79/+82
| * Trivial spacing changes to conform to style guideThialfihar2014-04-0229-85/+87
| * Adjust copyright headersThialfihar2014-04-026-12/+20
| * Adjust import orderThialfihar2014-04-0224-81/+46
|/
* always askAshley Hughes2014-04-021-1/+1
* confirm that empty IDs are really wantedAshley Hughes2014-04-022-1/+47
* new ID sigs already added, so do save themAshley Hughes2014-04-021-1/+1
* allow blank IDs, allow adding new IDs and let them be masterAshley Hughes2014-04-022-5/+8
* pass through info that keys are new without relying on new keys orginally bei...Ashley Hughes2014-04-015-2/+22
* sort out saving empty string IDsAshley Hughes2014-04-011-9/+3
* Menu cleanupDominik Schürmann2014-04-014-28/+47
* Dont show encrypted data before decryption from clipboardDominik Schürmann2014-04-011-7/+14
* Change path to OpenKeychainDominik Schürmann2014-04-011-3/+8
* Only allow private keys associated to accounts of an appDominik Schürmann2014-04-014-18/+39
* Add API imageDominik Schürmann2014-04-011-0/+0
* CleanupDominik Schürmann2014-04-012-79/+55
* Automatically select newly created key in api accountsDominik Schürmann2014-04-014-18/+47
* Fully qualified importsDominik Schürmann2014-04-017-19/+99
* Remove DECRYPT_ASSUME_SYMMETRICDominik Schürmann2014-04-012-6/+0
* Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-04-019-117/+347
|\
| * Merge pull request #501 from Valodim/masterDominik Schürmann2014-04-019-117/+347
| |\
| | * test: add junit+robolectric to buildfiles and stub test fileVincent Breitmoser2014-04-014-1/+112
| | * PgpKeyOperation: factor out all android dependenciesVincent Breitmoser2014-04-015-116/+235
| |/
* / default to allow symmetric decryptionDominik Schürmann2014-04-011-1/+1
|/
* Fix symmetric decryptionDominik Schürmann2014-04-015-117/+117
* Fix pre-selection for encryptDominik Schürmann2014-04-011-4/+2
* languageDominik Schürmann2014-04-011-2/+2
* More layout fixesDominik Schürmann2014-04-011-56/+62
* More layout fixesDominik Schürmann2014-04-012-97/+108
* Language clarificationsDominik Schürmann2014-04-013-9/+11
* Fix layoutsDominik Schürmann2014-04-0111-97/+100
* Simplify encrypt and sign backendDominik Schürmann2014-04-013-115/+59
* Fix symmetric encryption and cleanupDominik Schürmann2014-04-018-136/+91