highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-04 06:12:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,509 Commits 8 Branches 347 Tags
5cbe24202a6ba0b7780fcaa3a4530d46612f02da
Commit Graph

2509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip Kaufmann
5cbe24202a fix #952 by checking if we have a new address or an updated label 2012-05-06 22:52:12 +00:00
Wladimir J. van der Laan
486f7c8f65 Hide UI immediately after leaving the main loop. 
Prevents it from seeming to hang during shutdown if shutdown is triggered while the window is open.
 2012-05-06 14:56:13 +00:00
Luke Dashjr
9b661e57bf Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	src/bitcoinrpc.cpp
	src/db.cpp
 2012-05-06 05:37:21 +00:00
Luke Dashjr
457ff3a437 Merge branch '0.5.x' into 0.6.0.x 2012-05-06 05:35:58 +00:00
Luke Dashjr
5da2dce524 Merge branch '0.4.x' into 0.5.x 2012-05-06 05:35:50 +00:00
Pieter Wuille
700e5a4d86 Bugfix: store source address in addrman 2012-05-06 05:33:38 +00:00
Pieter Wuille
adecb2ea00 Fix addrman crashes 
A function returned the element to remove from a bucket, instead of its
position in that bucket. This function was only called when a tried
bucket overflowed, which only happens after many outgoing connections
have been made.

Closes: #1065, #1156
 2012-05-06 05:32:44 +00:00
Peter Todd
e2b9bf9e6e Fixed non-sensical error message 
Previously trying to create a multisig address that required less than
one signature would output something like the following:

"wrong number of keys(got 1, need at least 0)"
 2012-05-06 05:30:43 +00:00
Peter Todd
b94e6eb5a5 Fixed non-sensical error message 
Previously trying to create a multisig address that required less than
one signature would output something like the following:

"wrong number of keys(got 1, need at least 0)"
 2012-05-06 05:30:37 +00:00
Luke Dashjr
d41f22cb76 Bugfix: %-12I64d is not valid and causes the parameter to be skipped, use %12"PRI64d" instead 2012-05-06 05:27:38 +00:00
Luke Dashjr
607739befb Bugfix: %-12I64d is not valid and causes the parameter to be skipped, use %12"PRI64d" instead 
Conflicts:

	src/walletdb.cpp
 2012-05-06 05:27:08 +00:00
Philip Kaufmann
479c99022e remove HTML code around "Wallet" (displayed on overview page) and use Qt tags for font settings 2012-05-05 16:15:38 +00:00
Luke Dashjr
65077e1177 Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	bitcoin-qt.pro
	contrib/gitian-descriptors/gitian-win32.yml
	doc/README
	doc/README_windows.txt
	share/qt/make_windows_icon.sh
	share/setup.nsi
	src/bitcoinrpc.cpp
	src/main.cpp
	src/main.h
	src/makefile.linux-mingw
	src/net.cpp
	src/net.h
	src/netbase.h
	src/noui.h
	src/qt/addressbookpage.cpp
	src/qt/bitcoin.cpp
	src/qt/bitcoingui.cpp
	src/qt/bitcoingui.h
	src/qt/bitcoinstrings.cpp
	src/qt/guiutil.cpp
	src/qt/guiutil.h
	src/qt/optionsmodel.cpp
	src/qt/qrcodedialog.cpp
	src/qt/qtipcserver.cpp
	src/script.cpp
	src/serialize.h
	src/ui_interface.h
	src/uint256.h
 2012-05-05 16:13:56 +00:00
Luke Dashjr
ee932c6e35 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/main.cpp
 2012-05-04 19:55:54 +00:00
Luke Dashjr
c328c684c2 Bugfix: Remove redundant duplicate transaction check 2012-05-04 19:54:24 +00:00
Luke Dashjr
57cd445e95 Merge branch '0.6.0.x' of gitorious.org:+bitcoin-stable-developers/bitcoin/bitcoind-stable into 0.6.0.x 2012-05-04 18:58:37 +00:00
Luke Dashjr
a1a5a89063 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/main.cpp
	src/serialize.h
 2012-05-04 18:57:03 +00:00
Luke Dashjr
b2e5f797b5 Merge branch '0.4.x' into 0.5.x 2012-05-04 18:55:15 +00:00
Gavin Andresen
6a89317f62 Check earlier for blocks with duplicate transactions. Fixes #1167 2012-05-04 18:55:05 +00:00
Gavin Andresen
ad5a4c7c47 Check earlier for blocks with duplicate transactions. Fixes #1167 2012-05-04 18:52:16 +00:00
Philip Kaufmann
cae1a68267 remove obsolete BackupWallet() entry in wallet.h 2012-05-04 17:41:13 +00:00
Gavin Andresen
397737b913 Bump version numbers for 0.6.1rc2 v0.6.1 2012-05-04 10:22:26 -04:00
Gregory Maxwell
1210aa435f Merge pull request #1188 from Diapolo/rem_BackupWallet_wallet_h 
remove obsolete BackupWallet() entry in wallet.h
 2012-05-03 06:47:16 -07:00
Philip Kaufmann
e23a121afe remove obsolete BackupWallet() entry in wallet.h 2012-05-03 11:30:52 +02:00
Philip Kaufmann
6789e99e4f add bitcoin-qt.rc to OTHER_FILES (shown in Qt Creator) 2012-05-02 19:39:46 -04:00
Wladimir J. van der Laan
e099e1568a Merge pull request #1179 from Diapolo/project-file 
add bitcoin-qt.rc to OTHER_FILES (shown in Qt Creator)
 2012-05-01 23:57:02 -07:00
Philip Kaufmann
4898482915 fix compiler warning "suggest parentheses around assignment used as truth 
value [-Wparentheses]" in util.cpp
 2012-05-01 23:11:56 -04:00
Philip Kaufmann
8edec3f9d6 fix DEPENDPATH in the project file, as json has no include sub-dir and src was in twice 2012-05-01 23:11:07 -04:00
Philip Kaufmann
e6578e7fa7 remove unused typedef in serialize.h 2012-05-01 23:09:22 -04:00
Jeff Garzik
ca97bde8ff Merge pull request #1171 from Diapolo/fix_compiler_warn 
fix 2 compiler warnings
 2012-05-01 15:02:41 -07:00
Philip Kaufmann
8a6329a7ac add bitcoin-qt.rc to OTHER_FILES (shown in Qt Creator) 2012-05-01 22:26:33 +02:00
Wladimir J. van der Laan
50d710496d Merge pull request #1176 from Diapolo/project-file 
fix DEPENDPATH in the project file, as json has no include sub-dir and src was in twice
 2012-05-01 12:38:56 -07:00
Jeff Garzik
e19ccfa657 Merge pull request #1177 from laanwj/2012_05_remove_duplicate_securestring 
remove duplicate definition of SecureString in util.h
 2012-05-01 10:05:00 -07:00
Wladimir J. van der Laan
6d25b0e99a Merge pull request #1172 from Diapolo/serialize_h_rem_typedef 
remove unused typedef in serialize.h
 2012-05-01 09:52:38 -07:00
Wladimir J. van der Laan
3ee5f8aac3 remove duplicate definition of SecureString in util.h 
SecureString was moved to allocators.h in commit 6cb6d62347
 2012-05-01 18:49:50 +02:00
Philip Kaufmann
68103043ce fix DEPENDPATH in the project file, as json has no include sub-dir and src was in twice 2012-05-01 18:45:10 +02:00
Jeff Garzik
bd51e8ef8a Merge pull request #1173 from Diapolo/init_cpp_comment_upd 
remove references to bitcoin-wx from comment in init.cpp
 2012-05-01 08:29:10 -07:00
Philip Kaufmann
1c94f88d5e fix compiler warning "suggest parentheses around assignment used as truth 
value [-Wparentheses]" in util.cpp
 2012-05-01 11:41:04 +02:00
Philip Kaufmann
f8e4d43be7 fix compiler warning "suggest explicit braces to avoid ambiguous "else" 
[-Wparentheses]" in net.cpp
 2012-05-01 11:40:08 +02:00
Philip Kaufmann
00d971e1e7 remove references to bitcoin-wx from comment in init.cpp 2012-05-01 01:59:54 +02:00
Philip Kaufmann
810b4fad7d remove unused typedef in serialize.h 2012-05-01 01:56:47 +02:00
Gavin Andresen
be8651dde7 Check earlier for blocks with duplicate transactions. Fixes #1167 v0.6.1rc2 2012-04-30 11:08:07 -04:00
Philip Kaufmann
1fb6e2d9bf change button tooltip on sign message page for copy to clipboard as it was missleading 2012-04-30 10:45:58 -04:00
Wladimir J. van der Laan
ec4997d48f Merge pull request #1139 from Diapolo/messagepage 
change button tooltip on sign message page for copy to clipboard...
 2012-04-29 04:35:27 -07:00
Wladimir J. van der Laan
0acb1e715c Merge pull request #1163 from laanwj/2012_04_uiperformanceissue 
Fix critical UI performance issue (#1154)
 2012-04-29 04:34:42 -07:00
Wladimir J. van der Laan
6974aff668 Fix critical UI performance issue (#1154) 2012-04-29 13:25:05 +02:00
Luke Dashjr
6c055e506d Merge branch '0.5.x' into 0.6.0.x 2012-04-27 16:28:00 -04:00
Gavin Andresen
813dc92cdc fix compiler error in bitcoinrpc RE: boost::system 
(Partial of 2232717cba)
 2012-04-27 15:00:57 -04:00
Gavin Andresen
3a70f3a4ec Bump win32.deps version number for new openssl 2012-04-27 14:01:49 -04:00
Luke Dashjr
655b1b0cc2 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	contrib/gitian-descriptors/gitian-win32.yml
 2012-04-27 13:57:43 -04:00