 Jeff Garzik
|
e94010b239
|
Merge pull request #383 from sipa/syncdefault
Fix synchronization of default key
|
2011-07-05 11:52:13 -07:00 |
|
|
Jeff Garzik
|
bb0d9ce226
|
Merge pull request #384 from TheBlueMatt/upnp
Fix UPnP building, entirely my fault.
|
2011-07-05 10:10:26 -07:00 |
|
|
Jeff Garzik
|
06c903b26c
|
Merge pull request #380 from TheBlueMatt/buildupdates
Added a couple minor things to match newer build process.
|
2011-07-04 16:34:18 -07:00 |
|
|
Jeff Garzik
|
1a19fc17b2
|
Merge pull request #374 from TheBlueMatt/neterror
Give more detailed error messages for connection failure.
|
2011-07-02 12:04:09 -07:00 |
|
|
Jeff Garzik
|
9cd1dfe898
|
Merge pull request #372 from TheBlueMatt/upnp
Make UPnP default on Bitcoin but not on Bitcoind.
|
2011-07-01 19:39:05 -07:00 |
|
|
Jeff Garzik
|
cfbcb1de66
|
Merge pull request #373 from EricJ2190/master
Another Visual C++ Makefile Update
|
2011-07-01 17:38:24 -07:00 |
|
|
Jeff Garzik
|
c4286dc6ee
|
Merge pull request #343 from muggenhor/proper-http-server-rejection
rpc server: send '403 Forbidden' to rejected clients
|
2011-07-01 16:34:49 -07:00 |
|
|
Jeff Garzik
|
b73ab2d885
|
Merge pull request #368 from TheBlueMatt/dnsseed
Only use dnsseeds when not on testnet.
|
2011-07-01 16:33:28 -07:00 |
|
|
Jeff Garzik
|
056d2ad312
|
Merge pull request #371 from EricJ2190/master
Updated Visual C++ Makefile
|
2011-07-01 16:31:33 -07:00 |
|
|
Jeff Garzik
|
7fbeca05c9
|
Merge pull request #369 from sipa/limitblocksend
Limit size of response to getblocks
|
2011-07-01 14:51:48 -07:00 |
|
|
Jeff Garzik
|
44d16327c1
|
Merge pull request #367 from TheBlueMatt/dnsseed
Add new DNSSeed dnsseed.bluematt.me.
|
2011-06-30 14:51:55 -07:00 |
|
|
Jeff Garzik
|
77ba3ab99c
|
Merge pull request #342 from jburkle/datadir_check
Edited init.cpp to include a check that -datadir exists
|
2011-06-23 21:43:30 -07:00 |
|
|
Jeff Garzik
|
04e442070d
|
Merge pull request #332 from shanew/master
Include missing Boost header
|
2011-06-19 20:04:24 -07:00 |
|
|
Jeff Garzik
|
2207f5e201
|
Merge pull request #331 from TheBlueMatt/translatefix
Update translations and remove obsolete translations.
|
2011-06-19 20:03:08 -07:00 |
|
|
Jeff Garzik
|
19ea44208f
|
Merge pull request #226 from jordanlewis/betterheaders
Optimize header dependencies; improve Makefile dependency graph
|
2011-06-14 02:05:57 -07:00 |
|
|
Jeff Garzik
|
6f460bace6
|
Merge pull request #314 from codler/translate
Update swedish translation
|
2011-06-14 01:33:04 -07:00 |
|
|
Jeff Garzik
|
40dc7e6e1d
|
Merge pull request #315 from codler/consistent-address
Consistent Bitcoin example address
|
2011-06-14 01:32:40 -07:00 |
|
|
Jeff Garzik
|
ce148944c7
|
Merge pull request #300 from sipa/connecttimeout
non-blocking connect (by phantomcircuit)
|
2011-06-11 16:17:13 -07:00 |
|
|
Jeff Garzik
|
e051f1b510
|
Merge pull request #312 from codler/patch-1
Remove unused variable
|
2011-06-11 09:58:02 -07:00 |
|
|
Jeff Garzik
|
18e39300e6
|
Merge pull request #311 from codler/master
Added Swedish translation
|
2011-06-11 00:27:16 -07:00 |
|
|
Jeff Garzik
|
65ee333ae0
|
Merge pull request #304 from TheBlueMatt/cpufix
Fix CPU Usage bug when using -nolisten and have no connections.
|
2011-06-09 22:42:25 -07:00 |
|
|
Jeff Garzik
|
2661f2f7c4
|
Merge pull request #310 from xslidian/master
Updated Chinese Simp translation
|
2011-06-09 12:11:07 -07:00 |
|
|
Jeff Garzik
|
04bc3f0a63
|
Merge pull request #303 from jrmithdobbs/demystify-magic-numbers
Demystify a few magic numbers.
|
2011-06-06 11:17:39 -07:00 |
|
|
Jeff Garzik
|
09d1484b22
|
Merge pull request #264 from sipa/mintxfeefix
Fix for small change outputs
|
2011-06-05 07:32:58 -07:00 |
|
|
Jeff Garzik
|
e3d884479a
|
Merge pull request #291 from jrmithdobbs/ignore-vim-swp-files
Add common temp files to .gitignore.
|
2011-06-05 07:31:09 -07:00 |
|
|
Jeff Garzik
|
7a234cdae5
|
Merge pull request #255 from sipa/rescanupdate
Update transactions already in the wallet when rescanning.
|
2011-06-05 07:30:47 -07:00 |
|
|
Jeff Garzik
|
39105dac1b
|
Merge pull request #290 from jrmithdobbs/ip-filter-rfc1918-rfc3927
Fix rfc1918 and rfc3927 compliance for ignoring non-internet-routable hosts
|
2011-06-05 07:30:05 -07:00 |
|
|
Jeff Garzik
|
1d418728b0
|
Merge pull request #277 from TheBlueMatt/dpifix
Handle high DPI a bit more gracefully on Win32.
|
2011-05-26 17:24:56 -07:00 |
|
|
Jeff Garzik
|
20d28e6031
|
Merge pull request #268 from TheBlueMatt/deletefix
Fixes #240 and #244 - delete delete[] mismatch.
|
2011-05-26 13:25:58 -07:00 |
|
|
Jeff Garzik
|
54c465f25d
|
Merge pull request #250 from TheBlueMatt/macbuildfix
Revert "OSX build tweaks (laszlo)"
|
2011-05-24 16:31:15 -07:00 |
|
|
Jeff Garzik
|
32a1753e61
|
Merge pull request #249 from TheBlueMatt/nsisfix
Update NSIS Installer file to support the new directory structure.
|
2011-05-24 16:21:45 -07:00 |
|
|
Jeff Garzik
|
1fcf6f038e
|
Merge pull request #251 from TheBlueMatt/itfix
Update Italian translation to latest git.
|
2011-05-24 16:21:23 -07:00 |
|
|
Jeff Garzik
|
ec39b59a03
|
Merge pull request #259 from TheBlueMatt/rufix
Update russian translation to latest git.
|
2011-05-24 16:20:38 -07:00 |
|
|
Jeff Garzik
|
95f748c54e
|
Merge pull request #260 from TheBlueMatt/eotranslation
Add esperanto translation.
|
2011-05-24 16:20:08 -07:00 |
|
|
Jeff Garzik
|
813a3b438f
|
Merge pull request #229 from TheBlueMatt/esfix
Update spanish translation to newest git.
|
2011-05-18 10:37:11 -07:00 |
|
|
Jeff Garzik
|
fbe6d5defa
|
Merge pull request #230 from TheBlueMatt/defix
Update German translation to latest git.
|
2011-05-18 10:36:43 -07:00 |
|
|
Jeff Garzik
|
98199faa0b
|
Merge pull request #234 from TheBlueMatt/ltfix
Update Lithuanian Translation to latest git.
|
2011-05-18 10:36:22 -07:00 |
|
|
Jeff Garzik
|
010ca705df
|
Merge pull request #235 from TheBlueMatt/gitianfix
Update Gitian Build Descriptor to match new directory layout.
|
2011-05-18 10:35:52 -07:00 |
|
|
Jeff Garzik
|
112262cb24
|
Merge pull request #221 from gavinandresen/portoption
-port option to listen on arbitrary port
|
2011-05-16 22:29:28 -07:00 |
|
|
Jeff Garzik
|
6d62d2fb56
|
Merge pull request #222 from TheBlueMatt/lt
Add Lithuanian translation.
|
2011-05-16 22:24:59 -07:00 |
|
|
Jeff Garzik
|
efe06e1efd
|
Merge pull request #215 from gavinandresen/negativemove
Allow move RPC to take account balances negative
|
2011-05-12 14:46:13 -07:00 |
|
|
Jeff Garzik
|
9398bf946c
|
Merge pull request #192 from sipa/dnslookup
Support for name lookups in -connect and -addnode
|
2011-05-12 14:31:25 -07:00 |
|
|
Jeff Garzik
|
4b2e21e7ee
|
Merge pull request #218 from jgarzik/fee-update
Update TX fee to 0.0005 BTC
|
2011-05-11 18:16:36 -07:00 |
|
|
Jeff Garzik
|
04a667b076
|
Merge pull request #150 from jgarzik/settxfee
Add 'settxfee' RPC, to change TX fee setting at runtime
|
2011-05-09 11:54:16 -07:00 |
|
|
Jeff Garzik
|
4408034bcd
|
Merge pull request #197 from TheBlueMatt/errorfix
Fix GUI crash
|
2011-05-06 04:33:44 -07:00 |
|
|
Jeff Garzik
|
62b427ec55
|
Merge pull request #196 from amiryal/master
Improve UPNP build instructions
|
2011-05-06 04:24:32 -07:00 |
|