aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #3019Riccardo Spagni2018-01-021-32/+30
|\ \ \ \ \ \ \ \
| * | | | | | | | Additional fix for core_testsHoward Chu2017-12-281-10/+15
| * | | | | | | | Fix stale readcursor flagsHoward Chu2017-12-281-22/+15
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #2977Riccardo Spagni2018-01-021-1/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | threadpool: fix deadlock in recursive waiter usagemoneromooo-monero2017-12-231-1/+7
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #2967Riccardo Spagni2018-01-023-303/+118
|\ \ \ \ \ \ \ \
| * | | | | | | | wallet_rpc_server: factor transfer info return and add missing infomoneromooo-monero2017-12-203-303/+118
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #2965Riccardo Spagni2018-01-022-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Added using TOOLCHAIN_DIR varable on symlinking in android dockerfilesdamir2017-12-192-2/+2
| |/ / / / / / /
* | | | | | | | Merge pull request #2964Riccardo Spagni2018-01-021-24/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | tests: remove unused/unfinished keccak bitsmoneromooo-monero2017-12-191-24/+0
| |/ / / / / / /
* | | | | | | | Merge pull request #2963Riccardo Spagni2018-01-024-43/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | tests: test wallets don't need a dummy temp file anymoremoneromooo-monero2017-12-194-43/+4
| |/ / / / / / /
* | | | | | | | Merge pull request #2962Riccardo Spagni2018-01-021-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | wallet2: fix use of uninitialized datamoneromooo-monero2017-12-191-0/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #2960Riccardo Spagni2018-01-025-45/+326
|\ \ \ \ \ \ \ \
| * | | | | | | | wallet: support for multisig seedsmoneromooo-monero2017-12-205-45/+326
| |/ / / / / / /
* | | | | | | | Merge pull request #2956Riccardo Spagni2018-01-023-0/+70
|\ \ \ \ \ \ \ \
| * | | | | | | | performance_tests: add a test for subaddress expansionmoneromooo-monero2017-12-183-0/+70
| |/ / / / / / /
* | | | | | | | Merge pull request #2934Riccardo Spagni2018-01-024-13/+174
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Embed the translation files in the binaryGuillaume LE VAILLANT2017-12-154-13/+174
* | | | | | | | Merge pull request #2955Riccardo Spagni2017-12-281-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | tests: fix link error in hash tests now needing commonmoneromooo-monero2017-12-181-0/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #2949Riccardo Spagni2017-12-284-20/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Better definite article usexmr-eric2017-12-174-20/+20
* | | | | | | | | Merge pull request #2947Riccardo Spagni2017-12-281-5/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | README.md: Improve copy for supporting the projectxmr-eric2017-12-171-5/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #2946Riccardo Spagni2017-12-281-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | daemon: print num txes in print_bcmoneromooo-monero2017-12-171-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #2945Riccardo Spagni2017-12-284-5/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | daemon: remove some superfluous includesmoneromooo-monero2017-12-174-5/+2
* | | | | | | | | | Merge pull request #2944Riccardo Spagni2017-12-281-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | unit_tests: fix memwipe test comparisonmoneromooo-monero2017-12-171-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #2942Riccardo Spagni2017-12-281-82/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | simplewallet: factor out tx exceptionsmoneromooo-monero2017-12-181-82/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #2941Riccardo Spagni2017-12-281-8/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | wallet2: print tx size in bytes and kBmoneromooo-monero2017-12-161-8/+18
* | | | | | | | | | | Merge pull request #2940Riccardo Spagni2017-12-282-4/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | only include the easylogging++ stack trace code when neededmoneromooo-monero2017-12-262-4/+7
| * | | | | | | | | | easlogging++: omit some unneded macrosmoneromooo-monero2017-12-261-0/+1
* | | | | | | | | | | Merge pull request #2952Riccardo Spagni2017-12-272-0/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | wallet-api: added Utils::onStartupstoffu2017-12-262-0/+6
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge pull request #2996Riccardo Spagni2017-12-261-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | unbound: enable SHA1moneromooo-monero2017-12-231-0/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #2611Riccardo Spagni2017-12-251-1/+3
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | tests : remove lib_wallet_api testsguzzijones2017-12-221-1/+3
| |/ / / / / / /
* | | | | | | | Merge pull request #3006Riccardo Spagni2017-12-251-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "return subaddress in get_bulk_payments"moneromooo-monero2017-12-251-1/+0
* | | | | | | | | Merge pull request #2895Riccardo Spagni2017-12-259-69/+101
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | wallet2: switch to chacha20 instead of chacha8moneromooo-monero2017-12-251-19/+36