Philip Kaufmann
2943f60811
GUI: change language selection format
...
- display as "language - country (locale name)", when locale name consists of 2 parts
- display as "language (locale name)", when locale name consists of 1 part
2012-06-26 16:14:25 +02:00
Jeff Garzik
8a6ea5d687
Merge pull request #1520 from TheBlueMatt/debian
...
Update contrib/debian and remove system json_spirit patch.
2012-06-25 15:04:10 -07:00
Matt Corallo
3563824c60
Update contrib/debian and remove system json_spirit patch.
...
That patch has been broken for a long, long time (forever?) and
doesn't make sense.
2012-06-25 23:59:19 +02:00
Wladimir J. van der Laan
2849d0661d
Merge pull request #1501 from fanquake/master
...
QT to Qt
2012-06-25 06:49:59 -07:00
Gavin Andresen
1282c8653e
Checkpoint at block 185333 (and remove a couple of intermediate checkpoints)
2012-06-25 09:26:14 -04:00
Michael Ford
160eb23b0e
Add Bitcoin dev Copyright
2012-06-25 12:28:29 +08:00
Michael Ford
e4ebe82ee2
Update comments
2012-06-25 12:26:52 +08:00
Pieter Wuille
6cef700203
Merge pull request #1517 from Diapolo/fix_comment
...
fix a comment to correctly use -upgradewallet
2012-06-24 09:10:03 -07:00
Philip Kaufmann
a8c20ea946
fix a comment to correctly use -upgradewallet
2012-06-24 18:08:27 +02:00
Jeff Garzik
d887f54494
Document -debugnet option in command line help.
...
Fixes #1507
2012-06-24 10:38:02 -04:00
Gregory Maxwell
817ee0d826
Merge pull request #1174 from sipa/torhs
...
Tor hidden service support
2012-06-23 19:21:13 -07:00
Gregory Maxwell
0ae2ac5431
Merge pull request #1503 from gmaxwell/testnet_tweaks
...
Remove some rule differences which aren't needed with testnet3.
2012-06-23 19:02:55 -07:00
Pieter Wuille
d789a3f140
Some documentation about tor
2012-06-23 01:11:38 +02:00
Pieter Wuille
863e995b79
Debug version messages
2012-06-23 01:11:38 +02:00
Pieter Wuille
54ce3bad64
Add -tor and related configuration
2012-06-23 01:11:38 +02:00
Pieter Wuille
d077dd2a6e
Rewrite CNetAddr::GetReachabilityFrom()
...
Add support for Tor/I2P networks, and make code more readable.
2012-06-23 01:11:38 +02:00
Pieter Wuille
70f7f00385
Node support for Tor hidden services
...
This commit adds support for .onion addresses (mapped into the IPv6
by using OnionCat's range and encoding), and the ability to connect
to them via a SOCKS5 proxy.
2012-06-23 01:11:32 +02:00
Jeff Garzik
d62a1947be
Merge pull request #1458 from jgarzik/tracenet
...
Introduce -tracenet option, thereby quieting some redundant debug messages
2012-06-22 10:13:31 -07:00
Jeff Garzik
d07eaba195
Introduce -debugnet option, thereby quieting some redundant debug messages
...
Prior to this change, each TX typically generated 3+ debug messages,
askfor tx 8644cc97480ba1537214 0
sending getdata: tx 8644cc97480ba1537214
askfor tx 8644cc97480ba1537214 1339640761000000
askfor tx 8644cc97480ba1537214 1339640881000000
CTxMemPool::accept() : accepted 8644cc9748 (poolsz 6857)
After this change, there is only one message for each valid TX received
CTxMemPool::accept() : accepted 22a73c5d8c (poolsz 42)
and two messages for each orphan tx received
ERROR: FetchInputs() : 673dc195aa mempool Tx prev not found 1e439346fc
stored orphan tx 673dc195aa (mapsz 19)
The -debugnet option, or its superset -debug, will restore the full debug
output.
2012-06-22 13:11:57 -04:00
Jeff Garzik
cb1fcde2f4
Merge pull request #1502 from jgarzik/getrawmempool
...
RPC: add 'getrawmempool', listing all transaction ids in memory pool
2012-06-22 09:59:19 -07:00
Gregory Maxwell
e6332751c6
Remove some rule differences which aren't needed with testnet3.
...
Bip16 and Bip30 had early activation dates for testnet, but
with the reset they might as well use the same dates as
the main network.
2012-06-22 11:50:52 -04:00
Jeff Garzik
25d5c19522
RPC: add 'getrawmempool', listing all transaction ids in memory pool
2012-06-22 11:43:34 -04:00
Gregory Maxwell
a3869547e5
Merge pull request #1495 from Diapolo/fix_CKey_mem_leak
...
fix a memory leak in key.cpp
2012-06-22 08:38:48 -07:00
Pieter Wuille
e0be8da392
Unit tests for base32 encode/decode
2012-06-22 17:19:28 +02:00
Pieter Wuille
c4c99ade65
Base32 encoding/decoding
2012-06-22 17:19:28 +02:00
Gregory Maxwell
a08e182698
Merge pull request #1490 from luke-jr/gd_ljr_key
...
gitian-downloader: Update luke-jr's key
2012-06-21 14:25:17 -07:00
Gavin Andresen
9700f212ad
Merge pull request #1496 from xanatos/patch-2
...
= instead of == in multisig_tests.cpp
2012-06-21 12:51:05 -07:00
xanatos
fdfdb5cd7d
= instead of == in multisig_tests.cpp
2012-06-21 21:37:49 +03:00
Philip Kaufmann
a3d12f445a
fix a memory leak in key.cpp
...
- add EC_KEY_free() in CKey::Reset() when pkey != NULL
- init pkey with NULL in CKey constructor
2012-06-21 14:43:13 +02:00
Michael Ford
b768a38b76
Update master
2012-06-21 09:36:20 +08:00
Luke Dashjr
0783bcceef
gitian-downloader: Update luke-jr's key
2012-06-20 16:15:46 +00:00
Pieter Wuille
d65e959bae
Update my GPG key
2012-06-20 18:13:16 +02:00
Jeff Garzik
219abac227
Merge pull request #1488 from sipa/noowner
...
Remove CTxDB::ReadOwnerTxes.
2012-06-20 06:46:39 -07:00
Pieter Wuille
70f6049f71
Remove CTxDB::ReadOwnerTxes.
...
It seems it wasn't ever used since 0.1.5.
2012-06-20 15:07:48 +02:00
Wladimir J. van der Laan
703db97d80
Merge pull request #1483 from Diapolo/txtablemodel_updateDisplayUnit
...
GUI: ensure a changed bitcoin unit immediately updates the tx list amounts
2012-06-19 22:34:03 -07:00
Philip Kaufmann
229c34f818
GUI: ensure a changed bitcoin unit immediately updates the tx list amounts
2012-06-20 06:51:38 +02:00
Gavin Andresen
c283b3c569
print large orphan warning BEFORE deleting pvMsg
2012-06-19 17:14:29 -04:00
Pieter Wuille
451c3957fe
Merge pull request #1485 from xanatos/patch-1
...
Small logical error in mruset
2012-06-19 05:37:21 -07:00
xanatos
16d5671943
If (for example) the new max_size must be 5 then at the end the queue.size() must be <= 5, so the exit condition must be <=, so the continuing condition must be > (and not >= as it was).
2012-06-19 09:48:00 +03:00
Pieter Wuille
4c6b210af0
Fix netbase tests
...
* Do not rely on "a.b.c" being interpreted as "a.0.b.c"
* Parse numeric addresses for address families for which no device is configured
2012-06-19 02:22:09 +02:00
Gavin Andresen
c5532e188e
Merge pull request #1399 from sipa/ipparse
...
Improve parsing of IPv6 addresses
2012-06-18 11:39:16 -07:00
Gavin Andresen
7596a030c6
Merge branch 'master' of https://github.com/fanquake/bitcoin
2012-06-18 14:29:32 -04:00
Gavin Andresen
550c73f4c8
Merge branch 'signbugs' of https://github.com/wizeman/bitcoin
...
Resolved minor conflict in main.cpp
2012-06-18 10:48:40 -04:00
fanquake
baf814f3da
OS X not OSX
2012-06-18 22:09:19 +08:00
fanquake
8b7b3be765
Further updates to build instructions
2012-06-18 21:58:20 +08:00
Gavin Andresen
5204ca87e2
Merge pull request #1480 from fanquake/master
...
Update OSX build instructions
2012-06-18 06:44:51 -07:00
Fordy
2bbfcd2d02
Update OSX build instructions
2012-06-18 14:57:28 +08:00
Pieter Wuille
432d28d3bb
Merge pull request #1477 from gmaxwell/master
...
Fix inverted logic for !Discover/!UPNP when !Listen.
2012-06-17 17:07:08 -07:00
Wladimir J. van der Laan
a54d2118be
Merge pull request #1434 from Diapolo/GUI_fix_displayunit
...
GUI: init with correct display unit and update it, when user changes it via options dialog
2012-06-17 12:29:26 -07:00
Wladimir J. van der Laan
8ce04527f9
Merge pull request #1451 from Diapolo/sendcoins
...
GUI: set cursor for balance field to IBeamCursor (to show the user it IS selectable)
2012-06-17 12:26:20 -07:00