aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
* minor ui and wording changesVincent Breitmoser2015-04-092-8/+20
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-09226-8092/+10272
|\
| * rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-307-405/+423
| * 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
| |/
| * 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
| * 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
| | |/ / | |/| |
* | | | rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-307-406/+423
* | | | even more linked id ui workVincent Breitmoser2015-03-298-34/+38
* | | | more (subtle) ui workVincent Breitmoser2015-03-264-39/+65
* | | | more linked id ui fine tuningVincent Breitmoser2015-03-2617-0/+2
* | | | some linked id ui fine tuningVincent Breitmoser2015-03-2639-153/+149
* | | | secret/public distinction in LinkedIdViewVincent Breitmoser2015-03-247-25/+27
* | | | work on cookie scanning during creationVincent Breitmoser2015-03-2412-153/+157
* | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-24120-1203/+1772
|\ \ \ \ | | |/ / | |/| |
| * | | use top line in snackbar for status indicationVincent Breitmoser2015-03-222-16/+25
| |/ /
| * | 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
| * | 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
| |\