summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1775v0.10.2Riccardo Spagni2017-02-222-0/+0
|\ | | | | | | | | 700d218c fix broken test data (Riccardo Spagni) 0abddd64 fix broken checkpoints.dat (Riccardo Spagni)
| * fix broken test dataRiccardo Spagni2017-02-221-0/+0
| |
| * fix broken checkpoints.datRiccardo Spagni2017-02-221-0/+0
| |
* | Merge pull request #1750Riccardo Spagni2017-02-223-1/+32
|\ \ | | | | | | | | | | | | ada0e23a updates: fix user/auto url split (moneromooo-monero) 14d0e002 wallet2_api: add updates check api (moneromooo-monero)
| * | updates: fix user/auto url splitmoneromooo-monero2017-02-221-1/+1
| | |
| * | wallet2_api: add updates check apimoneromooo-monero2017-02-222-0/+31
|/ /
* | Merge pull request #1774Riccardo Spagni2017-02-223-13/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | 59013316 updates: remove testnet case (moneromooo-monero) 822577eb updates: we now have a user URL, and an automatic one (moneromooo-monero) 9f17b1a3 updates: s/monerod/monero/ for the main download (moneromooo-monero) 6a5dfb88 updates: add all update servers (moneromooo-monero) 72d40f13 updates: use HTTP, not HTTPS (moneromooo-monero)
| * | updates: remove testnet casemoneromooo-monero2017-02-223-7/+4
| | | | | | | | | | | | It need not be any different
| * | updates: we now have a user URL, and an automatic onemoneromooo-monero2017-02-223-4/+5
| | | | | | | | | | | | So the user can use https, while the automatic does not have to
| * | updates: s/monerod/monero/ for the main downloadmoneromooo-monero2017-02-221-2/+2
| | | | | | | | | | | | Also print download success message as global log
| * | updates: add all update serversmoneromooo-monero2017-02-221-0/+4
| | |
| * | updates: use HTTP, not HTTPSmoneromooo-monero2017-02-221-1/+1
|/ / | | | | | | The files are hashed and the hashes signed
* | Merge pull request #1773Riccardo Spagni2017-02-2211-11/+11
|\| | | | | | | 27b477f6 update last few copyright year references (Riccardo Spagni)
| * update last few copyright year referencesRiccardo Spagni2017-02-2211-11/+11
|/
* Merge pull request #1765Riccardo Spagni2017-02-221-8/+7
|\ | | | | | | 5cfddd74 Add support for smart mining through wallet. (Dion Ahmetaj)
| * Add support for smart mining through wallet.Dion Ahmetaj2017-02-211-8/+7
| |
* | Merge pull request #1762Riccardo Spagni2017-02-221-1/+1
|\ \ | | | | | | | | | dcf684c7 http_server_impl_base: set bind message to MGINFO (anonimal)
| * | http_server_impl_base: set bind message to MGINFOanonimal2017-02-211-1/+1
| | |
* | | Merge pull request #1766Riccardo Spagni2017-02-22356-361/+367
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 72deb484 updated fallback nodes (Riccardo Spagni) 33329f5b update version to 0.10.2 (Riccardo Spagni) 04a50a7e update checkpoints.dat (Riccardo Spagni) c3599fa7 update copyright year, fix occasional lack of newline at line end (Riccardo Spagni)
| * | | updated fallback nodesRiccardo Spagni2017-02-211-6/+12
| | | |
| * | | update version to 0.10.2Riccardo Spagni2017-02-211-1/+1
| | | |
| * | | update checkpoints.datRiccardo Spagni2017-02-211-0/+0
| | | |
| * | | update copyright year, fix occasional lack of newline at line endRiccardo Spagni2017-02-21355-354/+354
| | |/ | |/|
* | | Merge pull request #1767Riccardo Spagni2017-02-222-15/+24
|\ \ \ | | | | | | | | | | | | | | | | 708758b7 core: do not download an update we already downloaded (moneromooo-monero) 45101550 updates: use updates host, not downloads, for HTTP (moneromooo-monero)
| * | | core: do not download an update we already downloadedmoneromooo-monero2017-02-211-14/+23
| | | |
| * | | updates: use updates host, not downloads, for HTTPmoneromooo-monero2017-02-211-1/+1
| | |/ | |/|
* | | Merge pull request #1771Riccardo Spagni2017-02-221-1/+2
|\ \ \ | | | | | | | | | | | | ec217cd1 README: add DragonFly BSD to build status + update FreeBSD version (anonimal)
| * | | README: add DragonFly BSD to build status + update FreeBSD versionanonimal2017-02-221-1/+2
| |/ /
* | | Merge pull request #1772Riccardo Spagni2017-02-221-0/+50
|\ \ \ | |/ / |/| | | | | 40946a29 kenshi84's gpg key (kenshi84)
| * | kenshi84's gpg keykenshi842017-02-221-0/+50
|/ /
* | Merge pull request #1761Riccardo Spagni2017-02-211-1/+1
|\ \ | |/ |/| | | 56586bde mlog: restrict net.p2p to FATAL by default (moneromooo-monero)
| * mlog: restrict net.p2p to FATAL by defaultmoneromooo-monero2017-02-211-1/+1
| |
* | Merge pull request #1760Riccardo Spagni2017-02-214-17/+21
|\ \ | | | | | | | | | | | | efdd783c add openssl to readme (Riccardo Spagni) 058eed36 cmakify openssl (Riccardo Spagni)
| * | add openssl to readmeRiccardo Spagni2017-02-211-0/+1
| | |
| * | cmakify opensslRiccardo Spagni2017-02-213-17/+20
| | |
* | | Merge pull request #1759Riccardo Spagni2017-02-212-1/+2
|\ \ \ | | | | | | | | | | | | 417b126f Fix core_tests breaking on startup (moneromooo-monero)
| * | | Fix core_tests breaking on startupmoneromooo-monero2017-02-212-1/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | You're wondering how this fixes core tests, aren't you... It prevents the miner (initialized by cryptonote::core) from breaking trying to access arguments that were not added. Since the tests don't use the miner directly, it makes more sense to have cryptonote_core add those, since it also uses the miner.
* | | Merge pull request #1758Riccardo Spagni2017-02-211-1/+2
|\ \ \ | | | | | | | | | | | | 5664826a unit_tests: hardfork unit test now needs get_block_blob_from_height (moneromooo-monero)
| * | | unit_tests: hardfork unit test now needs get_block_blob_from_heightmoneromooo-monero2017-02-211-1/+2
| |/ /
* | | Merge pull request #1757Riccardo Spagni2017-02-211-0/+3
|\ \ \ | | | | | | | | | | | | 5c3badb7 dns_utils: fix infinite recursion when distributing empty dns_urls (anonimal)
| * | | dns_utils: fix infinite recursion when distributing empty dns_urlsanonimal2017-02-211-0/+3
| | |/ | |/| | | | | | | | | | | | | load_txt_records_from_dns attempts to distribute `a = 0, b = -1` where (b = dns_urls.size() - 1) and IntType is signed integer. This results in an infinite recursion which leads to SIGSEGV.
* | | Merge pull request #1756Riccardo Spagni2017-02-211-1/+1
|\ \ \ | | | | | | | | | | | | 80749e59 More for PR #1724 (Howard Chu)
| * | | More for PR #1724Howard Chu2017-02-211-1/+1
| |/ / | | | | | | | | | Fix unit_tests build (get_output_key API change)
* | | Merge pull request #1755Riccardo Spagni2017-02-211-1/+0
|\ \ \ | |/ / |/| | | | | 86d8a33a BerkeleyDB code isn't usable any more, drop from dependencies (Howard Chu)
| * | BerkeleyDB code isn't usable any more, drop from dependenciesHoward Chu2017-02-211-1/+0
|/ /
* | Merge pull request #1754Riccardo Spagni2017-02-211-1/+1
|\ \ | |/ |/| | | 13cd544d Makefile: fix copy/paste mistake in targets (s/freebsd/mac) (moneromooo-monero)
| * Makefile: fix copy/paste mistake in targets (s/freebsd/mac)moneromooo-monero2017-02-211-1/+1
|/
* Merge pull request #1703Riccardo Spagni2017-02-212-2/+6
|\ | | | | | | e74b3ab5 core: add p2p bind port options from net_node (moneromooo-monero)
| * core: add p2p bind port options from net_nodemoneromooo-monero2017-02-212-2/+6
|/ | | | | | | | They're now used by core to determine the data directory to use for the txpool directory. This fixes an assert in the core tests, which don't use the RPC server, which normally initializes the P2P code.
* Merge pull request #1747Riccardo Spagni2017-02-213-1/+6
|\ | | | | | | 26bd7aac wallet_api: fix logging init via api (moneromooo-monero)