summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1102v0.10.0Riccardo Spagni2016-09-1819-18/+60
|\ | | | | | | eeb2bbc epee: optionally restrict HTTP service to a configurable user agent (moneromooo-monero)
| * epee: optionally restrict HTTP service to a configurable user agentmoneromooo-monero2016-09-1819-18/+60
| | | | | | | | | | | | | | | | This is intended to catch traffic coming from a web browser, so we avoid issues with a web page sending a transfer RPC to the wallet. Requiring a particular user agent can act as a simple password scheme, while we wait for 0MQ and proper authentication to be merged.
* | Merge pull request #1101Riccardo Spagni2016-09-181-36/+16
|\ \ | |/ |/| | | 56ff099 fixed tag detector (Riccardo Spagni)
| * fixed tag detectorRiccardo Spagni2016-09-181-36/+16
| |
* | Merge pull request #1099Riccardo Spagni2016-09-187-37/+28
|\| | | | | | | | | | | | | | | | | | | | | | | c2faab5 fix v5 height (Riccardo Spagni) 70bd7d8 remove dead backup seed nodes, add new ones (Riccardo Spagni) cebbcf0 fix v5 fork date description (Riccardo Spagni) eb60fa2 update version (Riccardo Spagni) c41098a updated fork heights for v4 and v5 (Riccardo Spagni) c69b8a1 update block headers (Riccardo Spagni) f148af2 add checkpoints (Riccardo Spagni) c15da0e switch wallet API from std thread/mutex to boost (Riccardo Spagni) 8a274ea switch wallet API from std thread/mutex to boost (Riccardo Spagni)
| * fix v5 heightRiccardo Spagni2016-09-181-1/+1
| |
| * remove dead backup seed nodes, add new onesRiccardo Spagni2016-09-181-24/+6
| |
| * fix v5 fork date descriptionRiccardo Spagni2016-09-181-1/+1
| |
| * update versionRiccardo Spagni2016-09-181-2/+2
| |
| * updated fork heights for v4 and v5Riccardo Spagni2016-09-181-0/+7
| |
| * update block headersRiccardo Spagni2016-09-181-0/+0
| |
| * add checkpointsRiccardo Spagni2016-09-181-0/+2
| |
| * Merge branch 'master' of https://github.com/fluffypony/moneroRiccardo Spagni2016-09-180-0/+0
| |\
| | * switch wallet API from std thread/mutex to boostRiccardo Spagni2016-09-182-11/+11
| | |
| * | switch wallet API from std thread/mutex to boostRiccardo Spagni2016-09-182-11/+11
| | |
* | | Merge branch 'NanoAkron-armv8-march-crypto'Riccardo Spagni2016-09-181-4/+22
|\ \ \
| * | | fix conflictRiccardo Spagni2016-09-181-4/+22
|/| | |
| * | | +crypto for ARMv8 now tests and modifies ${ARCH$NanoAkron2016-09-181-12/+3
| | | |
| * | | Updated +crypto option for ARMv8 to modify ${ARCH} insteadNanoAkron2016-09-181-11/+26
| | | |
| * | | Add +crypto flag for ARMv8-aNanoAkron2016-09-171-2/+6
| | | |
* | | | Merge pull request #1100Riccardo Spagni2016-09-181-25/+25
|\ \ \ \ | | | | | | | | | | | | | | | d0fa9e7 gpg_keys: update my keys' expiration dates (moneromooo-monero)
| * | | | gpg_keys: update my keys' expiration datesmoneromooo-monero2016-09-181-25/+25
| | |/ / | |/| |
* | | | Merge pull request #1098Riccardo Spagni2016-09-181-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | 1dd5b0b wallet: keep change dest separate from other dests (moneromooo-monero)
| * | | | wallet: keep change dest separate from other destsmoneromooo-monero2016-09-181-2/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | This fixes misreporting of amount/fee in rct txes, as the rct tx construction code was lumping all dests (whether change or not) in the same dests vector, while the pre-rct code was keeping it separate.
* | | | Merge pull request #1097Riccardo Spagni2016-09-181-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | 5f5d727 wallet: fix empty tx in corner case sending nothing (moneromooo-monero)
| * | | | wallet: fix empty tx in corner case sending nothingmoneromooo-monero2016-09-181-0/+6
| | |/ / | |/| |
* | | | Merge pull request #1096Riccardo Spagni2016-09-181-2/+6
|\ \ \ \ | |_|/ / |/| | | | | | | c2491b9 README: make TORSOCKS_ALLOW_INBOUND optional (moneromooo-monero)
| * | | README: make TORSOCKS_ALLOW_INBOUND optionalmoneromooo-monero2016-09-181-2/+6
| |/ /
* | | Merge pull request #1095Riccardo Spagni2016-09-181-0/+3
|\ \ \ | |_|/ |/| | | | | f06882f README: mention --max-concurrency 1 for Mac (moneromooo-monero)
| * | README: mention --max-concurrency 1 for Macmoneromooo-monero2016-09-181-0/+3
| |/
* | Merge pull request #1094Riccardo Spagni2016-09-1832-119/+117
|\ \ | | | | | | | | | | | | | | | 06bb692 cmake: support BUILD_SHARED_LIBS built-in option (redfish) e1c7af3 cmake: transitive deps and remove deprecated LINK_* (redfish) 54010b9 crypto: armv7: slow-hash: remove redundant source include (redfish)
| * | cmake: support BUILD_SHARED_LIBS built-in optionredfish2016-09-183-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support building internal libraries as shared. This reduces development time by eliminating the need to re-link all binaries every time non-interface code in the library changes. Instead, can hack on libxyz, then `make libxyz`, and re-run monerod. By default BUILD_SHARED_LIBS is OFF in release build type, and ON in debug build type, but can be overriden with -D.
| * | cmake: transitive deps and remove deprecated LINK_*redfish2016-09-1829-114/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep the immediate direct deps at the library that depends on them, declare deps as PUBLIC so that targets that link against that library get the library's deps as transitive deps. Break dep cycle between blockchain_db <-> crytonote_core. No code refactoring, just hide cycle from cmake so that it doesn't complain (cycles are allowed only between static libs, not shared libs). This is in preparation for supproting BUILD_SHARED_LIBS cmake built-in option for building internal libs as shared.
| * | crypto: armv7: slow-hash: remove redundant source includeredfish2016-09-181-1/+0
| |/ | | | | | | | | aesb.c is already present in libcrypto as a standalone object. Tested: builds and runs fine on armv7, static and dynamic.
* | Merge pull request #1093Riccardo Spagni2016-09-181-1/+2
|\ \ | | | | | | | | | e86c5b9 miner: do not try to save config if the path isn't set (moneromooo-monero)
| * | miner: do not try to save config if the path isn't setmoneromooo-monero2016-09-181-1/+2
| |/ | | | | | | | | This saves on an exception dump when trying to write to / after finding a block.
* | Merge pull request #1092Riccardo Spagni2016-09-181-1/+1
|\ \ | | | | | | | | | 98b8043 readme: deps: fix libunwind Debian/Ubuntu package name (redfish)
| * | readme: deps: fix libunwind Debian/Ubuntu package nameredfish2016-09-181-1/+1
| |/
* | Merge pull request #1089Riccardo Spagni2016-09-181-10/+11
|\ \ | | | | | | | | | 368485d simplewallet: do not expose the details of tx splitting to the user (moneromooo-monero)
| * | simplewallet: do not expose the details of tx splitting to the usermoneromooo-monero2016-09-171-10/+11
| |/ | | | | | | They're confusing, as people think it reports their balance.
* | Merge pull request #1086Riccardo Spagni2016-09-181-3/+3
|\ \ | | | | | | | | | c791040 cmake: quotes around ARCH_ID string (redfish)
| * | cmake: quotes around ARCH_ID stringredfish2016-09-171-3/+3
| |/ | | | | | | | | | | It's only blank only if somebody running cmake in MSYS/MinGW (Windows) manually forgets to add -D ARCH, but when it is blank, without quotes those lines are invalid cmake syntax.
* | Merge pull request #1085Riccardo Spagni2016-09-181-1/+1
|\ \ | |/ |/| | | 9250863 simplewallet: fix wrong amount in show_transfers for pending transactions (moneromooo-monero)
| * simplewallet: fix wrong amount in show_transfers for pending transactionsmoneromooo-monero2016-09-171-1/+1
|/ | | | Change was not taken into consideration
* Merge pull request #1084Riccardo Spagni2016-09-1739-6979/+11533
|\ | | | | | | | | | | | | | | 5850122 remove errant target_link_libraries (Riccardo Spagni) 58abc09 don't build any miniupnpc executables (Riccardo Spagni) 114e368 don't build miniupnpc test executables (Riccardo Spagni) bb69371 updated miniupnp (Riccardo Spagni) f62ebc5 update rapidjson (Riccardo Spagni)
| * remove errant target_link_librariesRiccardo Spagni2016-09-171-1/+1
| |
| * don't build any miniupnpc executablesRiccardo Spagni2016-09-171-1/+1
| |
| * don't build miniupnpc test executablesRiccardo Spagni2016-09-171-3/+1
| |
| * updated miniupnpRiccardo Spagni2016-09-178-26/+48
| |
| * update rapidjsonRiccardo Spagni2016-09-1731-6950/+11484
| |