aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1188 from adithyaphilip/import-message-errorDominik Schürmann2015-03-281-2/+5
|\ | | | | Corrected import error message, changed style to WARN
| * changed style to WARN, corrected error messageAdithya Abraham Philip2015-03-281-2/+5
| |
* | Merge pull request #1187 from Hiperzone/developmentDominik Schürmann2015-03-282-12/+37
|\ \ | |/ |/| -Fixed a situation where additional emails could be duplicated when crea...
| * -Fixed a situation where additional emails could be duplicated when creating ↵Daniel Ramos2015-03-272-12/+37
|/ | | | a new key -If CreateKeyEmailFragment view is recreated, the array of additional emails won't be repopulated again if its not null, avoiding new reallocations. -if CreateKeyEmailFragment view is recreated, the email adapter wont be recreated if its not null, avoiding new reallocations.
* Merge pull request #1182 from iseki-masaya/1045Dominik Schürmann2015-03-261-14/+76
|\ | | | | #1045: Add a loop for multiple key export.
| * Modify break as return.iseki2015-03-261-1/+1
| |
| * Add brackets for if-else constructs and externalize the procedure as ↵iseki2015-03-261-26/+33
| | | | | | | | showMultiExportDialog.
| * 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-239-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-237-52/+52
|
* Pull from transifexDominik Schürmann2015-03-23114-210/+8860
|
* 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: NullPointerException when signing with YubiKey
| * Fixed #1152:Kent2015-03-201-5/+11
| | | | | | | | - Checking if input.getSignatureSubKeyId() is not null before proceeding.
* | Merge pull request #1166 from adithyaphilip/multi-threadedDominik Schürmann2015-03-2325-122/+691
|\ \ | | | | | | Multi-threaded key import, update all feature
| * | shifted multi-threading to own serviceAdithya Abraham Philip2015-03-2321-334/+611
| | | | | | | | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import
| * | introduced multi-threadingAdithya Abraham Philip2015-03-236-35/+327
| | | | | | | | | | | | | | | | | | | | | | | | refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor
* | | 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 symmetric encryption crash
| * | Fixed issue where setting a passphrase to null later causes a ↵JesperBK2015-03-231-1/+3
| | | | | | | | | | | | NullPointerException.
* | | 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 ↵Dominik Schürmann2015-03-235-16/+29
|\ \ \ | | | | | | | | | | | | development
| * \ \ Merge pull request #1170 from manojkhannakm/developmentDominik Schürmann2015-03-221-0/+0
| |\ \ \ | | | | | | | | | | Updated openpgp-api-lib
| | * | | Updated openpgp-api-libManoj Khanna2015-03-221-0/+0
| | |/ /
| * / / use top line in snackbar for status indicationVincent Breitmoser2015-03-225-16/+29
| |/ /
* / / Use markdown for in-app helpDominik Schürmann2015-03-2383-7652/+524
|/ /
* | 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
|/| | | | | | | | | | | into manojkhannakm-development
| * | 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 ↵Dominik Schürmann2015-03-201-2/+17
|\ \ | | | | | | | | | development
| * \ Merge pull request #1163 from kentnek/dev-list-footerDominik Schürmann2015-03-201-2/+17
| |\ \ | | | | | | | | Added a blank footer view to the list of keys
| | * | - Added footer so that the Floating Action Button won't block the last few ↵Kent2015-03-201-2/+17
| | |/ | | | | | | | | | items' content
* | / 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
| |
* | Merge pull request #1164 from kentnek/dev-nfc-advanced-viewDominik Schürmann2015-03-209-158/+275
|\ \ | |/ |/| Implemented #1071: Invoke NFC in Advanced View
| * 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
|/ | | | | | | - Extracted NFC code from ViewKeyActivity to NfcHelper to share code between classes - Changed the private anonymous Handler for NFC into a static private subclass, that uses WeakReference to avoid memory leaks - Added resources needed (retrieved from Graphics) for the NFC button inside ViewKeyAdvShareFragment. - Fixed the ripple boundary of the Share With... button to prevent it from bleeding to other buttons on the right (UX improvement)
* Remove on click on iconDominik Schürmann2015-03-191-0/+2
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 04:07:44 +0000