Commit graph

327 commits

Author SHA1 Message Date
Riccardo Spagni f3271e8f12
Merge pull request #141
b92a8b5 fix CMake for multiplatform versioning (Riccardo Spagni)
2014-09-15 20:18:40 +02:00
Riccardo Spagni b92a8b53e0
fix CMake for multiplatform versioning 2014-09-15 20:15:26 +02:00
Riccardo Spagni d0069112a3
Merge pull request #140
0214524 added mikezackles / Zachary Michaels gpg key (Riccardo Spagni)
2014-09-15 17:08:56 +02:00
Riccardo Spagni 0214524166
added mikezackles / Zachary Michaels gpg key 2014-09-15 16:56:54 +02:00
Riccardo Spagni 83276bf92d
Merge pull request #139
72a80f6 fixed incorrect version reference (Riccardo Spagni)
95a2701 Change testnet prefix (Zachary Michaels)
120c84d Make P2P use the testnet data dir (Zachary Michaels)
2352565 Replace macro with equivalent function call (Zachary Michaels)
d033087 Separate testnet address prefix (Zachary Michaels)
ee1bacc Add testnet seed nodes (Zachary Michaels)
4a6eb0a Create testnet data dir if necessary (Zachary Michaels)
018e251 Separate testnet default data dir (Zachary Michaels)
3ef7f33 Add descriptions for RPC command line params (Zachary Michaels)
1e38a02 Add testnet genesis tx as output by CN reference (Zachary Michaels)
96eed84 Pass tx and nonce to genesis block constructor (Zachary Michaels)
257077a Separate network id for testnet (Zachary Michaels)
658b669 Separate rpc port for testnet (Zachary Michaels)
98ed9a4 Separate p2p port for testnet (Zachary Michaels)
fb4146f Reorganize testnet constants (Zachary Michaels)
79862ad Add testnet constants (Zachary Michaels)
07470fd Add testnet flag (Zachary Michaels)
32004a7 increase ABSTRACT_SERVER_SEND_QUE_MAX_COUNT to a more sane value (Riccardo Spagni)
2c0a87f additional README info on static builds and FreeBSD (Riccardo Spagni)
2014-09-15 16:46:21 +02:00
Riccardo Spagni 72a80f6213
fixed incorrect version reference 2014-09-15 15:58:22 +02:00
Zachary Michaels 95a2701ec5 Change testnet prefix 2014-09-15 15:55:07 +02:00
Zachary Michaels 120c84d04f Make P2P use the testnet data dir 2014-09-15 15:55:07 +02:00
Zachary Michaels 23525655fa Replace macro with equivalent function call
Also removed useless bool return
2014-09-15 15:55:07 +02:00
Zachary Michaels d03308734b
Separate testnet address prefix 2014-09-15 15:54:59 +02:00
Zachary Michaels ee1bacc64f Add testnet seed nodes 2014-09-15 15:54:24 +02:00
Zachary Michaels 4a6eb0a016 Create testnet data dir if necessary 2014-09-15 15:54:24 +02:00
Zachary Michaels 018e251cc0
Separate testnet default data dir 2014-09-15 15:54:19 +02:00
Zachary Michaels 3ef7f33300 Add descriptions for RPC command line params 2014-09-15 15:53:50 +02:00
Zachary Michaels 1e38a02bb5 Add testnet genesis tx as output by CN reference 2014-09-15 15:53:50 +02:00
Zachary Michaels 96eed84aad Pass tx and nonce to genesis block constructor 2014-09-15 15:53:50 +02:00
Zachary Michaels 257077a96b Separate network id for testnet 2014-09-15 15:53:50 +02:00
Zachary Michaels 658b6690a3
Separate rpc port for testnet 2014-09-15 15:53:46 +02:00
Zachary Michaels 98ed9a41f7 Separate p2p port for testnet 2014-09-15 15:53:10 +02:00
Zachary Michaels fb4146fa34 Reorganize testnet constants 2014-09-15 15:53:10 +02:00
Zachary Michaels 79862ad1de Add testnet constants 2014-09-15 15:53:10 +02:00
Zachary Michaels 07470fd400
Add testnet flag
Source: cryptonotefoundation
2014-09-15 15:53:01 +02:00
Riccardo Spagni 32004a756c increase ABSTRACT_SERVER_SEND_QUE_MAX_COUNT to a more sane value 2014-09-15 15:49:26 +02:00
Riccardo Spagni 2c0a87f2ac additional README info on static builds and FreeBSD 2014-09-15 15:49:26 +02:00
Riccardo Spagni fdae09754e increase ABSTRACT_SERVER_SEND_QUE_MAX_COUNT to a more sane value 2014-09-15 15:41:07 +02:00
Riccardo Spagni 700b72c709 additional README info on static builds and FreeBSD 2014-09-15 15:41:07 +02:00
Riccardo Spagni 51011ed960 fix logic in tag check, AND -> OR
Signed-off-by: Riccardo Spagni <ric@spagni.net>
2014-09-15 08:24:32 +02:00
Riccardo Spagni 3129d51eb4 ignore tag check if we haven't pulled tags
Signed-off-by: Riccardo Spagni <ric@spagni.net>
2014-09-15 08:22:52 +02:00
Riccardo Spagni f2937d15bd Merge branch 'master' of http://github.com/fluffypony/bitmonero 2014-09-15 08:18:34 +02:00
Riccardo Spagni d97191d4f9
new Makefile target: release-static 2014-09-15 08:18:11 +02:00
Riccardo Spagni 8afbed4027 new Makefile target: release-static 2014-09-15 08:13:26 +02:00
Riccardo Spagni 5a3ce8a7dc FreeBSD static linking fixes 2014-09-15 08:08:03 +02:00
Riccardo Spagni 566d194c41 Merge branch 'master' of http://github.com/fluffypony/bitmonero 2014-09-14 14:13:09 +02:00
Riccardo Spagni 9e2ac5308a add gpg pubkeys to start enforcing signed commits 2014-09-14 14:12:53 +02:00
Riccardo Spagni 9c56b38b16
Merge pull request #136
bb2b606 fix incorrect error message (obvious cut and paste bug from upstream) (iamsmooth)
6b77e83 Change wallet to not try to extract tx public key when tx has no outputs (fixes 202612 tx format messages and is otherwise correct) (iamsmooth)
08205f0 output rng fix from boolberry (iamsmooth)
2014-09-13 10:24:39 +02:00
iamsmooth bb2b606e91 fix incorrect error message (obvious cut and paste bug from upstream) 2014-09-13 08:04:05 +00:00
Riccardo Spagni 12c1b0922a
add gpg pubkeys to start enforcing signed commits 2014-09-13 10:03:31 +02:00
iamsmooth 6b77e8358c Change wallet to not try to extract tx public key when tx has no outputs (fixes 202612 tx format messages and is otherwise correct) 2014-09-13 04:25:33 +00:00
iamsmooth 08205f01d9 output rng fix from boolberry 2014-09-12 22:57:32 +00:00
Riccardo Spagni 63f60b1777 Merge pull request #133 from fluffypony/master
fixed cmake variable matching
2014-09-12 13:30:14 +02:00
Riccardo Spagni 570b90eb43 fixed cmake variable matching 2014-09-12 13:27:30 +02:00
Riccardo Spagni e7c52d94c0 Merge pull request #132 from fluffypony/master
versioning now includes the commit hash, or -final for tagged releases
2014-09-12 13:18:12 +02:00
Riccardo Spagni aab57ba9cc Merge branch 'master' of http://github.com/fluffypony/bitmonero
Conflicts:
	src/daemon/daemon.cpp
2014-09-12 13:16:29 +02:00
Riccardo Spagni 8334ce0b24 versioning now includes the commit hash, or -final for tagged releases 2014-09-12 13:12:43 +02:00
Riccardo Spagni 446a7ddc49 always check git diff 2014-09-12 13:12:43 +02:00
Riccardo Spagni ffaa78700c Merge pull request #129 from Jebes/master
Added documentation to varint.h and util.h
2014-09-12 13:12:07 +02:00
Riccardo Spagni 14b3b6ea02 versioning now includes the commit hash, or -final for tagged releases 2014-09-12 13:06:51 +02:00
Riccardo Spagni dd51b03d87 always check git diff 2014-09-12 00:40:25 +02:00
jebes a13e879251 HOW DO I ENGLISH? 2014-09-11 10:45:05 -04:00
jebes f7900ccfc1 mispelled brief, corrected it 2014-09-11 10:36:39 -04:00