aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | Fix tests for Passphrase classDominik Schürmann2015-03-1910-45/+71
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-192-17/+27
| |\ \
| | * \ Merge pull request #1160 from jellysheep/cloudsearch-show-main-emailDominik Schürmann2015-03-181-1/+14
| | |\ \ | | | |/ | | |/|
| | | * Added comments for server result sorting in key searchMax Mertens2015-03-181-0/+6
| | | * Show HKP server results first in key cloud search. Fixes #1066Max Mertens2015-03-181-1/+8
| | |/
| | * Merge pull request #1155 from adithyaphilip/developmentDominik Schürmann2015-03-171-16/+13
| | |\
| | | * contacts work on all supported api levelsAdithya Abraham Philip2015-03-171-16/+13
| | |/
| * / New Passphrase class for safer passphrase handling in memoryDominik Schürmann2015-03-1934-140/+307
| |/
| * Manifest cleanupDominik Schürmann2015-03-171-9/+12
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-171-6/+2
| |\
| | * Merge pull request #1154 from adithyaphilip/developmentDominik Schürmann2015-03-161-6/+2
| | |\
| | | * removed unnecessary @TargetApi annotationAdithya Abraham Philip2015-03-171-6/+2
| | |/
| * / File extensions into ConstantsDominik Schürmann2015-03-175-13/+19
| |/
| * Disable hidden recipients for nowDominik Schürmann2015-03-162-10/+10
| * Allow for hidden recipients in encrypt methodsDominik Schürmann2015-03-1613-33/+133
| * Allow encrypt of filenames via overflow menuDominik Schürmann2015-03-167-11/+44
| * Remove old info from readmeDominik Schürmann2015-03-161-2/+0
| * Remove old info from readmeDominik Schürmann2015-03-161-28/+5
| * Clarify certification help screenDominik Schürmann2015-03-161-2/+2
| * Update api libDominik Schürmann2015-03-161-0/+0
| * Update api libDominik Schürmann2015-03-161-0/+0
| * object oriented split user idDominik Schürmann2015-03-161-0/+53
| * object oriented split user idDominik Schürmann2015-03-1626-148/+139
| * Update openpgp-api libDominik Schürmann2015-03-161-0/+0
| * Fix nullpointer when scanning malformed qr codesDominik Schürmann2015-03-161-1/+1
| * Allow selection of none in SelectSignKeyIdActivityDominik Schürmann2015-03-152-2/+37
| * Clarify MIME usageDominik Schürmann2015-03-153-2/+7
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-152-15/+22
| |\
| * | Put API activites in normal process to allow hydrate/dehydrate of logsDominik Schürmann2015-03-151-4/+2
* | | support github resource (ci)Vincent Breitmoser2015-03-243-3/+70
* | | support github resource (re)Vincent Breitmoser2015-03-248-1/+594
* | | support github resource (pa)Vincent Breitmoser2015-03-246-46/+224
* | | give short branch description in readmeVincent Breitmoser2015-03-161-0/+6
* | | work on certification uiVincent Breitmoser2015-03-1522-48/+197
* | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-15162-1977/+2884
|\ \ \ | | |/ | |/|
| * | fix expiry of master keysVincent Breitmoser2015-03-152-15/+22
| |/
| * Prefer ZIP algorithm as discussed on OpenPGP WG mailinglistDominik Schürmann2015-03-151-1/+7
| * Add ignore dirty to other git submodulesDominik Schürmann2015-03-151-2/+9
| * Remove display of key id in other listsDominik Schürmann2015-03-156-19/+70
| * Show main user id instead of key in certify screenDominik Schürmann2015-03-151-10/+15
| * Fixes for selection of certify keyDominik Schürmann2015-03-152-10/+21
| * Merge pull request #1142 from tdjogi010/developmentDominik Schürmann2015-03-151-4/+10
| |\
| | * Merge branch 'development' of https://github.com/tdjogi010/open-keychain into...tdjogi010@gmail.com2015-03-130-0/+0
| | |\
| | | * Preselected Suitable Keytdjogi010@gmail.com2015-03-121-4/+9
| | * | Preselected Suitable Keytdjogi010@gmail.com2015-03-131-4/+10
| | |/
| * | Merge pull request #1148 from manojkhannakm/developmentDominik Schürmann2015-03-152-5/+5
| |\ \
| | * | Fixed a ClassCastExceptionManoj Khanna2015-03-152-5/+5
| * | | Merge pull request #1147 from Hiperzone/developmentDominik Schürmann2015-03-152-11/+15
| |\ \ \
| | * | | -fixed out of bounds crash when retrieving the main profile name with secret ...Daniel Ramos2015-03-152-11/+15
| | |/ /
| * | | Dont display key ids in KeySpinner, display creation date when user ids dupli...Dominik Schürmann2015-03-154-16/+39