aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* translation fixesDominik Schürmann2015-03-239-113/+93
* Fix language problems reported by yahoe.001 on transifexDominik Schürmann2015-03-234-11/+16
* Update build env and pluginsDominik Schürmann2015-03-237-52/+52
* Pull from transifexDominik Schürmann2015-03-23114-210/+8860
* Remove remaining html entities in changelogDominik Schürmann2015-03-231-3/+3
* Fix transifex configDominik Schürmann2015-03-231-4/+1
* Merge pull request #1165 from kentnek/dev-yubikey-nullDominik Schürmann2015-03-231-5/+11
|\
| * Fixed #1152:Kent2015-03-201-5/+11
* | Merge pull request #1166 from adithyaphilip/multi-threadedDominik Schürmann2015-03-2325-122/+691
|\ \
| * | shifted multi-threading to own serviceAdithya Abraham Philip2015-03-2321-334/+611
| * | introduced multi-threadingAdithya Abraham Philip2015-03-236-35/+327
* | | Fix passphrase cache not clearing all passphrasesDominik Schürmann2015-03-231-2/+2
* | | Merge pull request #1174 from Jesperbk/developmentDominik Schürmann2015-03-231-1/+3
|\ \ \ | |/ / |/| |
| * | Fixed issue where setting a passphrase to null later causes a NullPointerExce...JesperBK2015-03-231-1/+3
* | | Update readme for libs linkDominik Schürmann2015-03-231-1/+1
* | | Markdown commentsDominik Schürmann2015-03-235-5/+5
* | | Remove changelog in main folder, update commentsDominik Schürmann2015-03-235-265/+5
* | | Update transifex configDominik Schürmann2015-03-231-9/+12
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-235-16/+29
|\ \ \
| * \ \ Merge pull request #1170 from manojkhannakm/developmentDominik Schürmann2015-03-221-0/+0
| |\ \ \
| | * | | Updated openpgp-api-libManoj Khanna2015-03-221-0/+0
| | |/ /
| * / / use top line in snackbar for status indicationVincent Breitmoser2015-03-225-16/+29
| |/ /
* / / Use markdown for in-app helpDominik Schürmann2015-03-2383-7652/+524
|/ /
* | Merge branch 'manojkhannakm-development' into developmentDominik Schürmann2015-03-2126-203/+184
|\ \
| * | Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ...Dominik Schürmann2015-03-2126-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-2025-197/+153
* | | Add TODO to remote APIDominik Schürmann2015-03-211-0/+2
|/ /
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-201-2/+17
|\ \
| * \ 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
| | |/
* | / Update api libDominik Schürmann2015-03-201-0/+0
|/ /
* | Update OpenPGP API libDominik Schürmann2015-03-201-0/+0
* | Fix API RESULT_TYPEDominik Schürmann2015-03-202-3/+6
* | Fix PASSPHRASE handling in APIDominik Schürmann2015-03-202-2/+18
* | Merge pull request #1164 from kentnek/dev-nfc-advanced-viewDominik Schürmann2015-03-209-158/+275
|\ \ | |/ |/|
| * 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
|\
| * Merge pull request #1158 from manojkhannakm/developmentDominik 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 headerDominik Schürmann2015-03-191-1/+2
* 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
|\