aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-261-14/+76
|\
| * Modify break as return.iseki2015-03-261-1/+1
| * Add brackets for if-else constructs and externalize the procedure as showMult...iseki2015-03-261-26/+33
| * Add a loop for multiple key export.iseki2015-03-251-13/+68
* | Start refactoring encrypt ui, EncryptFileActivity no longer crashingDominik Schürmann2015-03-269-516/+539
* | Fix certify with CryptoInputParcelDominik Schürmann2015-03-253-10/+6
* | Remove backward compat in CertifyKeyFragmentDominik Schürmann2015-03-251-17/+1
* | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-24225-8095/+10159
|\|
| * 3.2beta3Dominik Schürmann2015-03-232-3/+3
| * translation fixesDominik Schürmann2015-03-238-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-231-42/+42
| * Pull from transifexDominik Schürmann2015-03-23113-209/+8859
| * Remove remaining html entities in changelogDominik Schürmann2015-03-231-3/+3
| * 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
| * | | Markdown commentsDominik Schürmann2015-03-235-5/+5
| * | | Remove changelog in main folder, update commentsDominik Schürmann2015-03-234-0/+4
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-232-16/+25
| |\ \ \
| * | | | Use markdown for in-app helpDominik Schürmann2015-03-2382-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-222-16/+25
|\ \ \ \ | | |/ / | |/| |
| * | | use top line in snackbar for status indicationVincent Breitmoser2015-03-222-16/+25
| |/ /
* | | fix unit test and add new for divert-to-card promotionVincent Breitmoser2015-03-221-0/+4
* | | 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-2117-86/+230
* | | 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-2126-198/+215
|\| |
| * | 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
* | | more data in RequiredInputParcel, OperationResult notificationsVincent Breitmoser2015-03-217-36/+110