summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge pull request #6318luigi11112020-03-311-0/+29
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | gpg_keys: add selsta keyselsta2020-02-061-0/+29
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #6312luigi11112020-03-3146-59606/+68576
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Translations from Weblate + updated language filesWeblate2020-01-2846-59606/+68576
* | | | | | | | | | | | | Merge pull request #6311luigi11112020-03-311-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Explicitly define copy assignment operatorMartijn Otto2020-01-281-0/+7
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #6304luigi11112020-03-311-3/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | wallet2: fix store-tx-info loadingmoneromooo-monero2020-01-241-3/+12
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #6302luigi11112020-03-315-14/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | wallet2_api: implement estimateTransactionFeexiphon2020-01-255-14/+45
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #6301luigi11112020-03-312-14/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | simplewallet: warn about correlations if print-ring-members is not setmoneromooo-monero2020-03-282-14/+18
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #6298luigi11112020-03-311-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | [randomx] Add missing randomx_vm_set_cache()cohcho2020-01-171-0/+4
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #6260luigi11112020-03-312-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | rpc: add --rpc-payment-allow-free-loopbackmoneromooo-monero2020-03-122-1/+12
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #6214luigi11112020-03-319-0/+147
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | protocol: request txpool contents when syncedmoneromooo-monero2020-03-229-0/+147
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #6407luigi11112020-03-281-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix network unit tests after epee changesLee Clagett2020-03-281-2/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #6299Alexander Blair2020-03-272-2/+26
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | wallet2: remember daemon address overrides when loading a new walletmoneromooo-monero2020-03-072-2/+26
* | | | | | | | | | | | Merge pull request #6296Alexander Blair2020-03-271-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | wallet2: reject zero keys in json inputmoneromooo-monero2020-01-161-0/+4
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #6295Alexander Blair2020-03-273-7/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | p2p: do not add recently failed addresses to the peerlistmoneromooo-monero2020-03-203-7/+17
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #6290Alexander Blair2020-03-271-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | gitian-build.py: Fixing check for docker command.Jonathan Cross2020-01-101-2/+5
* | | | | | | | | | | | | Merge pull request #6289Alexander Blair2020-03-275-12/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | wallet: reroll fake outs selection on local tx_sanity_check failurexiphon2020-01-145-12/+59
* | | | | | | | | | | | | | Merge pull request #6288Alexander Blair2020-03-273-20/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | ringdb: use a different iv for key and data in rings tablemoneromooo-monero2020-01-091-18/+37
| * | | | | | | | | | | | | | simplewallet: reword mixin in user message in terms of ring sizemoneromooo-monero2020-01-091-1/+1
| * | | | | | | | | | | | | | wallet2: do not remove known rings when a tx failsmoneromooo-monero2020-01-091-1/+0
* | | | | | | | | | | | | | | Merge pull request #6285Alexander Blair2020-03-273-24/+406
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | net: fix incorrect less operator for top/i2p addressesAaron Hook2020-01-183-24/+406
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #6284Alexander Blair2020-03-271-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix check_fee() discrepancy.UkoeHB2020-01-091-2/+2
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #6283Alexander Blair2020-03-271-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | p2p: fix off by one adding fallback peersmoneromooo-monero2020-01-071-2/+2
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #6282Alexander Blair2020-03-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Daemon: Guard against reporting "synchronized" too earlyrbrunner72020-01-101-1/+1
* | | | | | | | | | | | | | | | Merge pull request #6281Alexander Blair2020-03-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | 10 block time is for incoming outputs, not transactionsrating89us2020-01-051-1/+1
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #6280Alexander Blair2020-03-271-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | p2p: fix spurious warning when we're connected to at last one seedmoneromooo-monero2020-01-311-2/+8
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #6279Alexander Blair2020-03-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | p2p: fix adding wrong indices to the filtered peer listmoneromooo-monero2020-01-031-1/+1
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #6275Alexander Blair2020-03-2715-328/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | p2p: remove old debug commandsAaron Hook2020-03-2015-328/+3
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |