aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-304-392/+400
|\
| * rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-304-392/+400
* | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-292-14/+41
|\|
| * Merge pull request #1188 from adithyaphilip/import-message-errorDominik Schürmann2015-03-281-2/+5
| |\
| | * changed style to WARN, corrected error messageAdithya Abraham Philip2015-03-281-2/+5
| * | -Fixed a situation where additional emails could be duplicated when creating ...Daniel Ramos2015-03-271-12/+36
| |/
* | Fixing crashes with new encrypt uiDominik Schürmann2015-03-295-41/+69
* | Start reworking decrypt ui classesDominik Schürmann2015-03-273-172/+197
* | Refactoring of EncryptTextActivityDominik Schürmann2015-03-278-400/+415
* | 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-266-506/+531
* | 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-2432-186/+753
|\|
| * Pull from transifexDominik Schürmann2015-03-233-10/+10
| * 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-2322-122/+681
| |\ \
| | * | shifted multi-threading to own serviceAdithya Abraham Philip2015-03-2320-334/+608
| | * | introduced multi-threadingAdithya Abraham Philip2015-03-234-35/+320
| * | | 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
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-231-14/+23
| |\ \ \
| * | | | Use markdown for in-app helpDominik Schürmann2015-03-233-17/+41
| | |/ / | |/| |
* | | | further improve yubikey error handlingVincent Breitmoser2015-03-234-24/+77
* | | | nicer handling of nfc errorsVincent Breitmoser2015-03-231-5/+8
* | | | Merge branch 'development' into v/crypto-input-parcelVincent Breitmoser2015-03-221-14/+23
|\ \ \ \ | | |/ / | |/| |
| * | | use top line in snackbar for status indicationVincent Breitmoser2015-03-221-14/+23
| |/ /
* | | 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-223-5/+49
* | | finish ui flow for yubikey importVincent Breitmoser2015-03-227-198/+330
* | | actually promote to divert, pass yubikey's AIDVincent Breitmoser2015-03-225-30/+21
* | | improve status reporting in yubikey dialogueVincent Breitmoser2015-03-221-11/+102
* | | move yubikey import into viewkeyfragmentVincent Breitmoser2015-03-226-158/+259
* | | split up wait/action yubikey fragmentsVincent Breitmoser2015-03-216-67/+142
* | | work on ad-hoc yubikey import supportVincent Breitmoser2015-03-215-21/+278
* | | first steps toward yubikey activityVincent Breitmoser2015-03-2128-451/+589
* | | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcelVincent Breitmoser2015-03-2125-193/+200
|\| |
| * | Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ...Dominik Schürmann2015-03-2124-198/+169
| |\ \
| | * | Added docs for Notify classManoj Khanna2015-03-201-0/+10
| | * | Fixed Snackbar behind keyboard on ImportKeysActivityManoj Khanna2015-03-201-4/+9
| | * | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 14:44:27 +0000