aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
...
| | * 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
| |/
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-171-6/+2
| |\
| | * removed unnecessary @TargetApi annotationAdithya Abraham Philip2015-03-171-6/+2
| * | File extensions into ConstantsDominik Schürmann2015-03-175-13/+19
| |/
| * Allow for hidden recipients in encrypt methodsDominik Schürmann2015-03-169-31/+117
| * Allow encrypt of filenames via overflow menuDominik Schürmann2015-03-164-6/+27
| * object oriented split user idDominik Schürmann2015-03-1625-148/+139
| * Fix nullpointer when scanning malformed qr codesDominik Schürmann2015-03-161-1/+1
| * Allow selection of none in SelectSignKeyIdActivityDominik Schürmann2015-03-151-2/+15
| * Clarify MIME usageDominik Schürmann2015-03-153-2/+7
* | support github resource (ci)Vincent Breitmoser2015-03-243-3/+70
* | support github resource (re)Vincent Breitmoser2015-03-244-0/+263
* | support github resource (pa)Vincent Breitmoser2015-03-244-46/+221
* | work on certification uiVincent Breitmoser2015-03-156-12/+46
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-1555-468/+1371
|\|
| * fix expiry of master keysVincent Breitmoser2015-03-151-15/+16
| * Prefer ZIP algorithm as discussed on OpenPGP WG mailinglistDominik Schürmann2015-03-151-1/+7
| * Remove display of key id in other listsDominik Schürmann2015-03-155-18/+69
| * 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
| |\
| | * 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-153-14/+37
| * | | Query for duplicate user idsDominik Schürmann2015-03-153-2/+14
| * | | Add missing license headersDominik Schürmann2015-03-156-0/+102
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-141-1/+2
| |\| |
| | * | Merge pull request #1143 from manojkhannakm/developmentDominik Schürmann2015-03-141-1/+2
| | |\ \
| | | * | Fix for Issue #1115Manoj Khanna2015-03-131-1/+2
| * | | | disable debug syncDominik Schürmann2015-03-141-1/+1
| * | | | Use names also for main contactDominik Schürmann2015-03-142-4/+4
| * | | | Show key name instead of key id in contacts, cleanupDominik Schürmann2015-03-141-20/+7
| |/ / /
| * | | added some documentationAdithya Abraham Philip2015-03-132-27/+87
| * | | added own profile support in linekd system contactAdithya Abraham Philip2015-03-132-10/+61
| * | | links own keys to me profile in contactsAdithya Abraham Philip2015-03-131-9/+118
| |/ /
| * | Clarify logs in DeleteFileDialogDominik Schürmann2015-03-121-2/+2
| * | Use notify instead of Toast for NFC checkDominik Schürmann2015-03-121-2/+2
| * | Merge pull request #1133 from Rrego6/developmentDominik Schürmann2015-03-121-0/+6
| |\ \
| | * | Check if NFC is available on deviceRaoul2015-03-101-0/+6
| * | | Merge pull request #1117 from danielnelz/developmentDominik Schürmann2015-03-1218-73/+108
| |\ \ \
| | * | | Fixed possible ArrayIndexOutOfBoundsException.danielnelz2015-03-112-2/+2
| | * | | Merge remote-tracking branch 'upstream/development' into developmentdanielnelz2015-03-094-29/+32
| | |\| |
| | * | | Added braces to if else.danielnelz2015-03-092-4/+6
| | * | | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOTypedanielnelz2015-03-0918-73/+106
| * | | | Improve file deletion stringsDominik Schürmann2015-03-121-3/+3
| * | | | Merge pull request #1137 from manojkhannakm/developmentDominik Schürmann2015-03-123-46/+104
| |\ \ \ \