summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | threadpool: use std::move when taking an element off the queuemoneromooo-monero2019-11-151-1/+1
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #6139Alexander Blair2020-01-161-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | translations: fix "monero_" prefix when taking languages from filemoneromooo-monero2019-11-151-1/+1
| * | | | | | | | | | | | | | | | | translations: find lrelease disguised as lrelease-qt5moneromooo-monero2019-11-151-0/+4
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #6134Alexander Blair2020-01-161-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Actually concatenate error strings.Bert Peters2019-11-141-8/+8
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #6133Alexander Blair2020-01-162-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Replace memset with memwipe.Bert Peters2019-11-132-5/+6
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #6130Alexander Blair2020-01-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | simplewallet: fix restore height warningselsta2019-11-141-1/+1
| | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #6125Alexander Blair2020-01-161-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | epee: fix console_handlers_binder race, wait for thread to finishxiphon2019-11-121-1/+8
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #6124Alexander Blair2020-01-161-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | blockchain: error out if the builtin hashes data size is wrongmoneromooo-monero2019-11-121-1/+6
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #6120Alexander Blair2020-01-161-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | epee: fix peer ids being truncated on displaymoneromooo-monero2019-11-141-1/+3
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #6119Alexander Blair2020-01-161-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | p2p: zero last seen timestamp when inserting a new peermoneromooo-monero2019-11-111-0/+1
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #6115Alexander Blair2020-01-163-7/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | core_tests: reset thread pool between testsmoneromooo-monero2019-11-103-7/+29
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #6112Alexander Blair2020-01-112-36/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | build: fix IOS, build blockchain_db and rpc, skip wallet_rpc_serverxiphon2019-11-092-36/+35
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #6110Alexander Blair2020-01-113-22/+180
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | tests: fix HF12 chaingen - construct bc object from eventsDusan Klinec2019-11-133-22/+180
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #6105Alexander Blair2020-01-116-0/+86
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | wallet_rpc_server: new estimate_tx_size_and_weight RPCmoneromooo-monero2019-11-066-0/+86
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #6231luigi11112020-01-082-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | depends: update libsodium to 1.0.18TheCharlatan2019-12-122-4/+4
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #6253Riccardo Spagni2020-01-061-0/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | GPGKey: Add SnipaAlexander Blair2019-12-181-0/+52
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #6232luigi11112020-01-031-0/+87
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | add binaryFate's PGP keybinaryFate2019-12-131-0/+87
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #6057luigi11112019-12-122-3/+23
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | wallet2: make keys unlocker reentrantmoneromooo-monero2019-10-292-3/+23
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #6056luigi11112019-12-121-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | python-rpc: add missing strict_balances parameter for get_accountsmoneromooo-monero2019-10-291-1/+2
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #6055luigi11112019-12-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | blockchain: fix comment wrongly refering to SHA-3 rather than Keccakmoneromooo-monero2019-10-291-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #6054luigi11112019-12-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | daemon: handle printing higher hash ratesmoneromooo-monero2019-10-291-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #6052luigi11112019-12-121-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | tx_pool: fix error message assuming incorrectlymoneromooo-monero2019-10-291-2/+2
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #6049luigi11112019-12-121-34/+27
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Updated paper referencesSarang Noether2019-10-281-24/+22
| * | | | | | | | | | | | Minor prover simplificationSarang Noether2019-10-281-10/+5
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #6041luigi11112019-12-121-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | functional_tests: ensure mining stops on error in mining testmoneromooo-monero2019-10-271-1/+11
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #6037luigi11112019-12-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | easylogging++: add screen.xterm-256color to the "allow colour" TERM listmoneromooo-monero2019-10-261-1/+1
* | | | | | | | | | | | | Merge pull request #6027luigi11112019-12-121-26/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \