aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3932luigi11112018-06-202-1/+35
|\
| * util: consider Tor/I2P addresses to be non localmoneromooo-monero2018-06-051-0/+7
| * simplewallet: add optional trusted/untrusted argument to set_daemonmoneromooo-monero2018-06-051-1/+28
* | Merge pull request #3924luigi11112018-06-201-1/+1
|\ \
| * | Fixes #3645: error on freebsd lambda return values forced to std::stringS2018-06-041-1/+1
| |/
* | Merge pull request #3919luigi11112018-06-201-1/+1
|\ \
| * | blockchain: pop forked blocks only when DB is not read-onlystoffu2018-06-041-1/+1
| |/
* | Merge pull request #3904luigi11112018-06-201-6/+13
|\ \
| * | blockchain: return error when requesting non existent outputmoneromooo-monero2018-06-011-6/+13
| |/
* | Merge pull request #3903luigi11112018-06-202-12/+35
|\ \
| * | tx_pool: hold off parsing a tx blob till we actually need itmoneromooo-monero2018-06-022-12/+35
| |/
* | Merge pull request #3897luigi11112018-06-203-2/+10
|\ \
| * | mlog: --max-log-files to set the max number of rotated log filesstoffu2018-06-133-2/+10
| |/
* | Merge pull request #3896luigi11112018-06-201-4/+4
|\ \
| * | simplewallet.sign_transfer: rename export to export_raw, add help messagestoffu2018-06-011-4/+4
| |/
* | Merge pull request #3888luigi11112018-06-201-0/+3
|\ \
| * | daemon: fix readline interfering with std::cerr usagemoneromooo-monero2018-05-311-0/+3
* | | Merge pull request #3757luigi11112018-06-202-2/+22
|\ \ \
| * | | handle optional miner params bettercryptochangements342018-05-062-2/+22
* | | | Merge pull request #3878luigi11112018-06-191-1/+1
|\ \ \ \
| * | | | disable file size sanity check when loading the wallet cachemoneromooo-monero2018-05-281-1/+1
* | | | | Merge pull request #3861luigi11112018-06-192-0/+16
|\ \ \ \ \
| * | | | | p2p: warn when no incoming connections are seen for a whilemoneromooo-monero2018-05-262-0/+16
| |/ / / /
* | | | | Merge pull request #3851luigi11112018-06-193-2/+4
|\ \ \ \ \
| * | | | | fix build with GCC 8.1.0moneromooo-monero2018-05-263-2/+4
* | | | | | Merge pull request #3844luigi11112018-06-192-0/+14
|\ \ \ \ \ \
| * | | | | | Fix PCSC compilation under windowscslashm2018-05-232-0/+14
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #3829luigi11112018-06-191-20/+34
|\ \ \ \ \ \
| * | | | | | use deterministic viewkey if not suppliedcryptochangements342018-06-051-20/+34
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #3828luigi11112018-06-191-0/+1
|\ \ \ \ \ \
| * | | | | | core: lock incoming tx lock when checking the txpool and chainmoneromooo-monero2018-05-181-0/+1
* | | | | | | Merge pull request #3821luigi11112018-06-191-0/+5
|\ \ \ \ \ \ \
| * | | | | | | object_sizes: add a few useful typesmoneromooo-monero2018-05-171-0/+5
| |/ / / / / /
* | | | | | | Merge pull request #3691luigi11112018-06-174-15/+16
|\ \ \ \ \ \ \
| * | | | | | | core: remove threadpool dependency from headermoneromooo-monero2018-05-202-6/+3
| * | | | | | | threadpool: allow constructing an object, and misc tweaksmoneromooo-monero2018-05-202-9/+13
* | | | | | | | Merge pull request #3804luigi11112018-06-163-0/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | simple-wallet-cli: Add warnings about inaccurate balances to to watch-only wa...jcktm2018-05-153-0/+11
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #3798luigi11112018-06-161-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix TypoRafficer2018-05-121-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #3780luigi11112018-06-167-98/+495
|\ \ \ \ \ \ \ \
| * | | | | | | | wallet-rpc: watch-only and cold wallet features addedDusan Klinec2018-06-037-98/+495
* | | | | | | | | Merge pull request #3762luigi11112018-06-161-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | check_spend_proofitssteven2018-05-061-2/+3
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #3735luigi11112018-06-161-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add .load() to make Boost 1.67 happy with its new is_integral checkTeutone2018-05-051-1/+1
* | | | | | | | | | Merge pull request #3732luigi11112018-06-161-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Ensure m_timestamps has the correct number for computing difficulty.Thaer Khawaja2018-04-291-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #3737luigi11112018-06-162-3/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | p2p: fix fallback seed node usagemoneromooo-monero2018-04-292-3/+11
| | |/ / / / / / / / | |/| | | | | | | |