cryptogera/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-17 02:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,170 Commits 8 Branches 349 Tags
Commit Graph

2170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luke Dashjr
fe1725a141 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/bitcoinrpc.cpp
 2012-04-04 15:43:29 -04:00
Luke Dashjr
658cf0b1be Merge branch '0.5.0.x' into 0.5.x 
Conflicts:
	src/qt/bitcoingui.h
 2012-04-04 15:41:07 -04:00
Luke Dashjr
a37092fcf4 Merge branch '0.4.x' into 0.5.0.x 2012-04-04 15:36:25 -04:00
Wladimir J. van der Laan
91d7e847e0 Use a messagebox to display the error when -server is provided without providing a rpc password 
(plus part of 7cfbe1fee465e82ddbdc8ed17dfcce791bd765f5)
 2012-04-04 13:57:32 -04:00
Luke Dashjr
1376cd9d7f Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	bitcoin-qt.pro
	contrib/debian/changelog
	doc/README
	doc/README_windows.txt
	doc/translation_process.md
	share/setup.nsi
	src/bitcoinrpc.cpp
	src/db.cpp
	src/init.cpp
	src/irc.cpp
	src/main.cpp
	src/main.h
	src/makefile.osx
	src/makefile.unix
	src/net.cpp
	src/net.h
	src/qt/bitcoin.cpp
	src/qt/bitcoingui.cpp
	src/qt/bitcoinstrings.cpp
	src/qt/guiutil.cpp
	src/qt/guiutil.h
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_de.ts
	src/qt/locale/bitcoin_en.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_nb.ts
	src/qt/locale/bitcoin_nl.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
	src/qt/locale/bitcoin_zh_TW.ts
	src/qt/sendcoinsdialog.h
	src/qt/transactionrecord.cpp
	src/script.cpp
	src/script.h
	src/serialize.h
	src/util.cpp
	src/util.h
 2012-04-04 10:32:09 -04:00
Luke Dashjr
ef9ab3c2a0 Merge branch '0.5.0.x' into 0.5.x 2012-04-04 10:30:35 -04:00
Luke Dashjr
724c65c1f8 Add Luke-Jr's PGP key to gitian-downloader 2012-04-04 10:23:08 -04:00
Luke Dashjr
8fae3dae11 Add Luke-Jr's PGP key to gitian-downloader 2012-04-04 10:23:02 -04:00
Philip Kaufmann
6806677841 removed an ugly line break in a transaction tooltip for case TransactionStatus::Mature 2012-04-04 10:21:14 -04:00
Pieter Wuille
3f47eb4a9a Updated my GPG key 2012-04-04 10:17:26 -04:00
Pieter Wuille
2f98e8c1a4 Updated my GPG key 2012-04-04 10:17:18 -04:00
Luke Dashjr
1fafcee66d Merge branch '0.4.x' into 0.5.0.x 
Conflicts:
	src/main.cpp
	src/makefile.unix
 2012-04-04 10:10:16 -04:00
Luke Dashjr
d53fbb4a53 Fix script tests for P2SH 
Upstream: 922e8e2929a2e78270868385aa46f96002fbcff3
 2012-04-04 10:00:32 -04:00
Vegard Nossum
d15180297f Fix testing setup 
There were some problems with the existing testing setup:

 - Makefile rules for test-file compilation used CFLAGS instead of
   CXXFLAGS in makefile.unix
 2012-04-04 10:00:20 -04:00
Pieter Wuille
60f89779a3 Do not invoke anti-DoS system for invalid BIP16 transactions 
Doing so would allow an attack on old nodes, which would relay a
standard transaction spending a BIP16 output in an invalid way,
until reaching a new node, which will disconnect their peer.

Reported by makomk on IRC.
 2012-04-04 09:50:48 -04:00
Luke Dashjr
dce656f9e0 Merge branch '0.5.0.x' into 0.5.x 2012-04-02 09:37:09 -04:00
Gavin Andresen
a1c3d8f14d Merge branch 'master' of github.com:bitcoin/bitcoin v0.6.0 v0.6.0rc6 2012-03-29 15:11:04 -04:00
Gavin Andresen
f146061d24 Merge pull request #1010 from sipa/fastblocks2 
Use transactions-updated as flush condition
 2012-03-29 12:10:30 -07:00
Gavin Andresen
dac1888c18 Merge pull request #1008 from gavinandresen/addrworkaround 
Workaround hangs when upgrading old addr.dat files
 2012-03-29 12:10:08 -07:00
Pieter Wuille
25c5eca893 Use transactions-updated as flush condition 
The normal checkpointing during the block chain download is reduced
to every five minutes only, but forced every 200000 updated transactions.
 2012-03-29 21:00:31 +02:00
Gavin Andresen
f3f9da868e Bump version to 0.6.0rc6 2012-03-29 13:58:22 -04:00
Gavin Andresen
6293a9f87f Workaround hangs when upgrading old addr.dat files 2012-03-29 13:34:07 -04:00
Gavin Andresen
83e914c1d5 Merge pull request #1007 from gavinandresen/log_auto_remove 
Auto-remove logs, and decrease logfile size to 10M
 2012-03-29 10:13:42 -07:00
Gavin Andresen
94b5960ef3 Merge pull request #996 from Diapolo/tx-lang-upd 
update translations from transifex
 2012-03-29 06:48:01 -07:00
Gavin Andresen
9f18347034 Auto-remove logs, and decrease logfile size to 10M 2012-03-29 09:03:11 -04:00
Luke Dashjr
2eba535348 Merge branch 'vfycompsig_0.5.0' into 0.5.0.x 2012-03-27 20:10:46 -04:00
Luke Dashjr
ddd0d9ae54 Minimal support for compressed-key signature recovery (for verifymessage) 
Upstream commits:
	11529c6e4f7288d8a64c488a726ee3821c7adefe
	d4d9c734c315e99136fe245c5733ca75cab9f8bf
 2012-03-27 20:03:31 -04:00
Philip Kaufmann
7b2eecd428 update translations from transifex 2012-03-27 10:13:38 +02:00
Luke Dashjr
9a133240d3 Merge branch '0.5.0.x' into 0.5.x 2012-03-26 20:07:28 -04:00
Luke Dashjr
6085033f31 Merge branch '0.4.x' into 0.5.0.x 2012-03-26 20:06:55 -04:00
Gavin Andresen
9504e415cb Remove wxWidgets .exe and locales during setup 2012-03-26 17:40:02 -04:00
Gavin Andresen
8d29329f93 Update version to 60005 (0.6.0rc5) v0.6.0rc5 2012-03-26 15:42:06 -04:00
Gavin Andresen
0ccb2c4f66 Merge branch 'master' of github.com:bitcoin/bitcoin 2012-03-26 15:37:40 -04:00
Gavin Andresen
84560c41c7 Merge pull request #994 from sipa/deladdr 
Use erase instead of rewrite to remove old addr entries
 2012-03-26 12:35:04 -07:00
Gavin Andresen
dd675e01c4 Merge branch 'master' of github.com:bitcoin/bitcoin 2012-03-26 15:34:13 -04:00
Gavin Andresen
be4502968e Merge pull request #992 from gavinandresen/remove_wxBitcoin 
Remove wxWidgets .exe during setup
 2012-03-26 12:33:02 -07:00
Gavin Andresen
c698633447 Merge branch 'master' of github.com:bitcoin/bitcoin 2012-03-26 15:31:32 -04:00
Gavin Andresen
c289d95d6b Merge pull request #991 from gavinandresen/disableWinURI 
Disable bitcoin: URI handling on Windows for the 0.6 release
 2012-03-26 12:31:06 -07:00
Wladimir J. van der Laan
57de7cd603 Merge pull request #990 from sipa/doc 
Begin doxygen-compatible comments
 2012-03-26 12:27:49 -07:00
Gavin Andresen
bf5b80a8ae Merge branch 'deladdr' of https://github.com/sipa/bitcoin 2012-03-26 14:32:26 -04:00
Pieter Wuille
53cb1a49e7 Use erase instead of rewrite to remove old addr entries 2012-03-26 20:22:38 +02:00
Gavin Andresen
a56881b005 Remove wxWidgets .exe and locales during setup 2012-03-26 14:14:45 -04:00
Wladimir J. van der Laan
e9f9282bde Merge pull request #988 from Diapolo/URL-Handling 
show Window, when user is clicking bitcoin: link
 2012-03-26 10:58:48 -07:00
Gavin Andresen
7b90edb5a6 Disable bitcoin: URI handling on Windows for the 0.6 release 2012-03-26 12:18:24 -04:00
Pieter Wuille
6b8de05d0a Begin doxygen-compatible comments 2012-03-26 16:48:23 +02:00
Philip Kaufmann
4004b9a40b make sure Window is shown when clicking bitcoin: Links to get user attention 2012-03-26 09:19:49 +02:00
Pieter Wuille
01a196e08d Merge pull request #974 from sipa/walletupgrade 
Introduce explicit -walletupgrade option
 2012-03-25 19:44:52 -07:00
Pieter Wuille
59e659fcc0 Merge pull request #983 from laanwj/2012_03_removeunusedutil 
Remove unused functions from util.h/util.cpp (EOM)
 2012-03-25 19:31:03 -07:00
Pieter Wuille
6eb339fae4 Merge pull request #984 from sipa/youngseeds 
Give DNS seeds a random age between 3 and 7 days old
 2012-03-25 17:47:54 -07:00
Pieter Wuille
b3dbab33ca Merge pull request #985 from TheBlueMatt/uri 
Fix URI link to bitcoin-qt.exe instead of bitcoin.exe
 2012-03-25 10:32:31 -07:00