aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename)Vincent Breitmoser2015-04-0115-276/+150
* | | | | | | | | | | Prepare decrypt UI for input parcelDominik Schürmann2015-03-313-129/+79
* | | | | | | | | | | Rename advanced to extendedDominik Schürmann2015-03-311-7/+7
* | | | | | | | | | | Better check if file is already addedDominik Schürmann2015-03-311-19/+42
* | | | | | | | | | | Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychai...Dominik Schürmann2015-03-314-12/+50
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | work on passphrase data flowVincent Breitmoser2015-03-314-12/+50
* | | | | | | | | | | | From passphrase to passwordDominik Schürmann2015-03-311-47/+47
* | | | | | | | | | | | Simplify passphrase dialog designDominik Schürmann2015-03-313-4/+4
|/ / / / / / / / / / /
* | | | | | | | | | | update OpenPgpApi, re-add EXTRA_PASSPHRASEVincent Breitmoser2015-03-301-0/+13
* | | | | | | | | | | Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychai...Vincent Breitmoser2015-03-309-183/+392
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Dont show slinger button in spinnerDominik Schürmann2015-03-301-0/+2
| * | | | | | | | | | | Fix scrollbarDominik Schürmann2015-03-301-0/+1
| * | | | | | | | | | | Use RecyclerView in EncryptFilesFragmentDominik Schürmann2015-03-308-184/+390
* | | | | | | | | | | | remove unused NfcActivityVincent Breitmoser2015-03-303-580/+5
* | | | | | | | | | | | fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-3021-560/+185
* | | | | | | | | | | | pass CryptoInputParcel independently for SignEncryptOperationVincent Breitmoser2015-03-3010-90/+35
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-307-405/+423
|\| | | | | | | | | |
| * | | | | | | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-307-405/+423
* | | | | | | | | | | Fix strings with email addressDominik Schürmann2015-03-291-2/+2
* | | | | | | | | | | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-293-14/+42
|\| | | | | | | | | |
| * | | | | | | | | | 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-272-12/+37
| |/ / / / / / / / / /
* | | | | | | | | | | Fixing crashes with new encrypt uiDominik Schürmann2015-03-298-43/+70
* | | | | | | | | | | Start reworking decrypt ui classesDominik Schürmann2015-03-273-172/+197
* | | | | | | | | | | Refactoring of EncryptTextActivityDominik Schürmann2015-03-279-404/+418
* | | | | | | | | | | 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-24224-8054/+10116
|\| | | | | | | | | |
| * | | | | | | | | | 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
| * | | | | | | | | | 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-231-14/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |