aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * 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 markdown for in-app helpDominik Schürmann2015-03-2383-7652/+524
| | |/ / | |/| |
* | | | further improve yubikey error handlingVincent Breitmoser2015-03-235-24/+78
* | | | nicer handling of nfc errorsVincent Breitmoser2015-03-232-5/+9
* | | | Merge branch 'development' into v/crypto-input-parcelVincent Breitmoser2015-03-225-16/+29
|\ \ \ \ | | |/ / | |/| |
| * | | use top line in snackbar for status indicationVincent Breitmoser2015-03-225-16/+29
| |/ /
* | | forgot spongycastle updateVincent Breitmoser2015-03-221-0/+0
* | | fix unit test and add new for divert-to-card promotionVincent Breitmoser2015-03-222-6/+33
* | | enable nfc in import dialog as wellVincent Breitmoser2015-03-224-6/+51
* | | finish ui flow for yubikey importVincent Breitmoser2015-03-229-221/+396
* | | actually promote to divert, pass yubikey's AIDVincent Breitmoser2015-03-226-31/+24
* | | improve status reporting in yubikey dialogueVincent Breitmoser2015-03-223-14/+114
* | | move yubikey import into viewkeyfragmentVincent Breitmoser2015-03-229-228/+376
* | | split up wait/action yubikey fragmentsVincent Breitmoser2015-03-2120-88/+264
* | | work on ad-hoc yubikey import supportVincent Breitmoser2015-03-217-37/+365
* | | first steps toward yubikey activityVincent Breitmoser2015-03-2130-468/+689
* | | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcelVincent Breitmoser2015-03-2127-198/+215
|\| |
| * | 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
* | | more data in RequiredInputParcel, OperationResult notificationsVincent Breitmoser2015-03-217-36/+110
* | | add edit key unit test for no-opVincent Breitmoser2015-03-205-0/+17
* | | fix unit tests (for real)Vincent Breitmoser2015-03-207-20/+39
* | | fix more unit tests (syntax)Vincent Breitmoser2015-03-2010-66/+56