aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Expand)AuthorAgeFilesLines
* work on cookie scanning during creationVincent Breitmoser2015-03-2412-153/+157
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-24119-1201/+1770
|\
| * use top line in snackbar for status indicationVincent Breitmoser2015-03-221-14/+23
| * Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ...Dominik Schürmann2015-03-2125-203/+184
| |\
| | * Added docs for Notify classManoj Khanna2015-03-201-0/+10
| | * Fixed Snackbar behind keyboard on ImportKeysActivityManoj Khanna2015-03-202-9/+24
| | * Reworked Notify classManoj Khanna2015-03-2024-197/+153
| * | Add TODO to remote APIDominik Schürmann2015-03-211-0/+2
| |/
| * Merge pull request #1163 from kentnek/dev-list-footerDominik Schürmann2015-03-201-2/+17
| |\
| | * - Added footer so that the Floating Action Button won't block the last few it...Kent2015-03-201-2/+17
| * | Fix API RESULT_TYPEDominik Schürmann2015-03-202-3/+6
| * | Fix PASSPHRASE handling in APIDominik Schürmann2015-03-201-2/+18
| * | Updated GNU headerKent2015-03-201-1/+2
| * | Removed create and added GPLv3 headerKent2015-03-201-4/+17
| * | Implemented #1162: Invoke NFC in Advanced ViewKent2015-03-209-158/+261
| |/
| * Remove on click on iconDominik Schürmann2015-03-191-0/+2
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-193-60/+81
| |\
| | * Fix for Issue #1114Manoj Khanna2015-03-191-5/+30
| | * Fixed a crash on ViewKeyActivityManoj Khanna2015-03-192-55/+51
| * | Manage my keys wizardDominik Schürmann2015-03-1935-430/+455
| |/
| * Improve Passphrase class with finalize()Dominik Schürmann2015-03-191-6/+34
| * Fix tests for Passphrase classDominik Schürmann2015-03-191-0/+4
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-192-17/+27
| |\
| | * 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
| | * 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
| |\
| | * 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-1612-33/+133
| * Allow encrypt of filenames via overflow menuDominik Schürmann2015-03-167-11/+44
| * Clarify certification help screenDominik Schürmann2015-03-161-2/+2
| * 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-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-151-15/+16
| |\
| * | 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
* | | work on certification uiVincent Breitmoser2015-03-1520-45/+117
* | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-15157-1974/+2855
|\ \ \ | | |/ | |/|
| * | 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-156-19/+70
| * Show main user id instead of key in certify screenDominik Schürmann2015-03-151-10/+15