 Jeff Garzik
|
4dcad1d294
|
Merge pull request #536 from TheBlueMatt/build-updates
Update release-process.txt with gitian release instructions.
|
2011-09-28 09:27:25 -07:00 |
|
|
Jeff Garzik
|
ab1bbe5492
|
Merge pull request #533 from alexwaters/readme
Updated readme file with timers.
|
2011-09-27 20:47:06 -07:00 |
|
|
Jeff Garzik
|
f8937b2d3b
|
Merge pull request #528 from TheBlueMatt/gitian-downloader
Add win32 gitian download config.
|
2011-09-23 10:56:25 -07:00 |
|
|
Jeff Garzik
|
864e49a12c
|
Merge pull request #525 from TheBlueMatt/master
Update binary mo to match latest po translation.
|
2011-09-22 09:48:02 -07:00 |
|
|
Jeff Garzik
|
700f942692
|
Merge pull request #522 from sipa/minorfix
SocketHandler thread can be detached
|
2011-09-20 11:47:02 -07:00 |
|
|
Jeff Garzik
|
7337b343cd
|
Merge pull request #519 from dabaopku/master
Chinese Simp translation update
|
2011-09-17 09:24:54 -07:00 |
|
|
Jeff Garzik
|
53c6c12886
|
Merge pull request #512 from paraipanakos/master
Spanish translation update
|
2011-09-13 13:21:09 -07:00 |
|
|
Jeff Garzik
|
38fd861fff
|
Merge pull request #511 from mibe/translation-de
Updated German translation
|
2011-09-11 18:45:00 -07:00 |
|
|
Jeff Garzik
|
ff4bd3977a
|
Merge pull request #503 from TheBlueMatt/translatefix
Add binary mo for new translation.
|
2011-09-06 12:03:08 -07:00 |
|
|
Jeff Garzik
|
074653973e
|
Merge pull request #502 from vsrinivas/master
Define MSG_NOSIGNAL to 0 when it is not defined. Gets OpenBSD building.
|
2011-09-06 11:58:42 -07:00 |
|
|
Jeff Garzik
|
04f9a37c71
|
Merge pull request #501 from paraipanakos/master
Added Romanian translation
|
2011-09-06 11:50:56 -07:00 |
|
|
Jeff Garzik
|
3a7c4d89de
|
Merge pull request #495 from alexwaters/readme
Updated readme file
|
2011-09-05 20:01:55 -07:00 |
|
|
Jeff Garzik
|
712077a760
|
Merge pull request #486 from TheBlueMatt/translatefix
Update binary mos to latest translations.
|
2011-09-02 10:12:20 -07:00 |
|
|
Jeff Garzik
|
21189a42a7
|
Merge pull request #463 from TheBlueMatt/encreadme
Encryption readme update and minor rpc.cpp fixes
|
2011-08-31 09:32:42 -07:00 |
|
|
Jeff Garzik
|
ce39dfe425
|
Merge pull request #475 from ovdeathiam/patch-1
Edited locale/pl/LC_MESSAGES/bitcoin.po via GitHub
|
2011-08-31 09:23:30 -07:00 |
|
|
Jeff Garzik
|
8af99d1893
|
Merge pull request #464 from TheBlueMatt/upnp1.6
Upgrade dependancies and tweak build process.
|
2011-08-31 09:16:56 -07:00 |
|
|
Jeff Garzik
|
eb20f3c8f5
|
Merge pull request #448 from sipa/cbitcoinaddress
avoid strAddress + validity checks
|
2011-08-04 11:47:15 -07:00 |
|
|
Jeff Garzik
|
95699e1730
|
Merge pull request #446 from WakiMiko/upnp-desc
Identify as "Bitcoin + version number" when mapping UPnP port
|
2011-08-04 11:40:44 -07:00 |
|
|
Jeff Garzik
|
32de8cd062
|
Merge pull request #451 from TheBlueMatt/tornolisten
Don't listen if on TOR (resolves #441).
|
2011-08-04 11:40:06 -07:00 |
|
|
Jeff Garzik
|
a9ba47101a
|
Merge pull request #403 from sipa/cbitcoinaddress
keys indexed by address + introduced CBitcoinaddress
|
2011-07-24 15:38:38 -07:00 |
|
|
Jeff Garzik
|
c2da35319d
|
Merge pull request #423 from TheBlueMatt/mapalreadyaskedforfix
Actually use mapAlreadyAskedFor.
|
2011-07-21 19:05:38 -07:00 |
|
|
Jeff Garzik
|
133ccbe408
|
Merge pull request #418 from EricJ2190/master
Update makefile.vc for wallet encryptions.
|
2011-07-15 21:11:34 -07:00 |
|
|
Jeff Garzik
|
5b0fc31b1c
|
Merge pull request #414 from spiechu/polish-translation
added polish wallet encryption messages
|
2011-07-14 20:43:22 -07:00 |
|
|
Jeff Garzik
|
065d743019
|
Merge pull request #413 from TheBlueMatt/loadwalletret
Fix bad return values in LoadWallet.
|
2011-07-14 09:37:50 -07:00 |
|
|
Jeff Garzik
|
60d2f8662c
|
Merge pull request #409 from TheBlueMatt/master
Fix crashes when a wallet is locked and GetReservedKey() is called
|
2011-07-13 18:22:19 -07:00 |
|
|
Jeff Garzik
|
9cd22ab862
|
Merge pull request #406 from muggenhor/warning-fixes
Warning fixes
|
2011-07-13 08:55:49 -07:00 |
|
|
Jeff Garzik
|
b8cbbc2c28
|
Merge pull request #405 from sipa/syncdefault
Bugfix: add autogenerated addresses to address book
|
2011-07-13 08:53:57 -07:00 |
|
|
Jeff Garzik
|
4ea952d5c0
|
Merge pull request #399 from muggenhor/warning-fixes
Warning fixes
|
2011-07-12 20:22:38 -07:00 |
|
|
Jeff Garzik
|
0fa89d8e81
|
Merge pull request #381 from TheBlueMatt/nminversion
Add minversion to wallet.
|
2011-07-12 19:34:30 -07:00 |
|
|
Jeff Garzik
|
61e3c011f5
|
Merge pull request #402 from jayschwa/hirez-icon
High resolution Windows icon
|
2011-07-12 19:18:52 -07:00 |
|
|
Jeff Garzik
|
696d34069a
|
Merge pull request #396 from jayschwa/nsis-branding
Add bitcoin.org logos/branding to NSIS installer.
|
2011-07-12 19:18:21 -07:00 |
|
|
Jeff Garzik
|
0bad8e4237
|
Merge pull request #352 from TheBlueMatt/newenc
Wallet Private Key Encryption (on CWallet)
|
2011-07-12 19:10:12 -07:00 |
|
|
Jeff Garzik
|
354f2dd094
|
Merge pull request #392 from laanwj/antimagic
Remove another magic number: change threshold for nLockTime to constant
|
2011-07-09 10:09:13 -07:00 |
|
|
Jeff Garzik
|
c05d011fba
|
Merge pull request #376 from codler/translate
Minor translation changes for latest build (Swedish)
|
2011-07-08 10:36:49 -07:00 |
|
|
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 |
|