aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3933luigi11112018-06-201-2/+13
|\
| * readme - explain building master vs. releaseGingeropolous2018-06-051-2/+13
* | Merge pull request #3932luigi11112018-06-203-1/+37
|\ \
| * | README: mention --untrusted-daemonmoneromooo-monero2018-06-051-0/+2
| * | 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 #3927luigi11112018-06-201-1/+1
|\ \
| * | Update Readme to indicate recommended versionGingeropolous2018-06-041-1/+1
| |/
* | 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 #3902luigi11112018-06-202-1/+33
|\ \
| * | unit_tests: add tests for local IP range detectionmoneromooo-monero2018-06-011-0/+32
| * | epee: fix detection of 172.16.0.0/172.31.255.255 local IP rangemoneromooo-monero2018-06-011-1/+1
| |/
* | Merge pull request #3897luigi11112018-06-205-5/+63
|\ \
| * | mlog: --max-log-files to set the max number of rotated log filesstoffu2018-06-135-5/+63
| |/
* | 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 #3880luigi11112018-06-201-0/+14
|\ \ \ \
| * | | | adding win building details.k1nghat2018-05-291-0/+14
* | | | | Merge pull request #3702luigi11112018-06-202-1/+12
|\ \ \ \ \
| * | | | | easylogging++: cached allowed categoriesmoneromooo-monero2018-04-252-1/+12
* | | | | | Merge pull request #3878luigi11112018-06-192-4/+4
|\ \ \ \ \ \
| * | | | | | disable file size sanity check when loading the wallet cachemoneromooo-monero2018-05-282-4/+4
| | |/ / / / | |/| | | |
* | | | | | 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 #3852luigi11112018-06-191-43/+40
|\ \ \ \ \ \
| * | | | | | add disclaimer about 3rd party packagesJethro Grassie2018-06-161-43/+40
* | | | | | | 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-194-11/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix CMAKE config for PCSC in order to avoid msys DLL dependenciescslashm2018-05-311-17/+20
| * | | | | | | | Fix PCSC compilation under windowscslashm2018-05-234-0/+23
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #3835luigi11112018-06-191-5/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed for compilation in big endian PPC. "Everything is broken thought due to...Judemir Ribeiro2018-05-191-5/+24
* | | | | | | | | 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-192-1/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | object_sizes: add a few useful typesmoneromooo-monero2018-05-171-0/+5