Luke Dashjr [Tue, 22 May 2012 23:07:46 +0000]
Merge branch '0.6.0.x' into 0.6.x
Conflicts:
bitcoin-qt.pro
doc/README
doc/README_windows.txt
share/setup.nsi
src/bitcoinrpc.h
src/db.h
src/headers.h
src/init.cpp
src/main.cpp
src/main.h
src/noui.h
src/qt/bitcoin.cpp
src/qt/locale/bitcoin_en.ts
src/qt/walletmodel.cpp
src/script.cpp
src/ui_interface.h
src/util.cpp
Luke Dashjr [Tue, 22 May 2012 22:57:10 +0000]
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/main.cpp
Luke Dashjr [Tue, 22 May 2012 22:55:49 +0000]
Merge branch '0.4.x' into 0.5.x
Conflicts:
src/ui.cpp
src/ui.h
src/uibase.cpp
src/xpm/about.xpm
Jeff Garzik [Tue, 22 May 2012 19:23:17 +0000]
Prevent crashes due to missing or corrupted blk????.dat records
Jeff Garzik [Tue, 22 May 2012 19:12:52 +0000]
Prevent crashes due to missing or corrupted database records
Any problems seen during deserialization will throw an uncaught
exception, crashing the entire bitcoin process. Properly return an
error instead, so that we may at least log the error and gracefully
shutdown other portions of the app.
Wladimir J. van der Laan [Tue, 22 May 2012 16:28:10 +0000]
Remove duplicate behavior on MacOSX
Dock icon on macosx already has show/hide functionality. This results in erratic behavior.
R E Broadley [Tue, 22 May 2012 11:06:08 +0000]
Correct debug.log output to show correct function the debug is coming from.
Wladimir J. van der Laan [Thu, 17 May 2012 10:10:15 +0000]
Filter out whitespace and zero-width non-breaking spaces in validator
- Fixes issues with copy/pasting from web or html emails (#1325)
Fordy [Fri, 18 May 2012 14:02:28 +0000]
Update License in File Headers
I originally created a pull to replace the "COPYING" in crypter.cpp and
crypter.h, but it turned out that COPYING was actually the correct
file.
Fordy [Fri, 18 May 2012 14:02:28 +0000]
Update License in File Headers
I originally created a pull to replace the "COPYING" in crypter.cpp and
crypter.h, but it turned out that COPYING was actually the correct
file.
Fordy [Fri, 18 May 2012 14:02:28 +0000]
Update License in File Headers
I originally created a pull to replace the "COPYING" in crypter.cpp and
crypter.h, but it turned out that COPYING was actually the correct
file.
Fordy [Fri, 18 May 2012 14:02:28 +0000]
Update License in File Headers
I originally created a pull to replace the "COPYING" in crypter.cpp and
crypter.h, but it turned out that COPYING was actually the correct
file.
Philip Kaufmann [Mon, 14 May 2012 05:49:17 +0000]
remove 2 ugly spaces from a message string
(PARTIAL of 966ae00)
R E Broadley [Thu, 17 May 2012 18:09:21 +0000]
Add build directory to .gitignore, so that it's not tracked.
R E Broadley [Thu, 17 May 2012 15:15:28 +0000]
Add /bin/sh to bitcoin-qt.pro - as some filesystems don't have the execute flag.
Christian von Roques [Thu, 17 May 2012 15:33:59 +0000]
Fix typo. libarcode => libqrcode
Jeff Garzik [Mon, 14 May 2012 05:11:11 +0000]
Always check return values of TxnBegin() and TxnCommit()
Jeff Garzik [Mon, 14 May 2012 05:11:11 +0000]
Always check return values of TxnBegin() and TxnCommit()
PARTIAL, since d68dcf7 isn't backported (yet)
Pieter Wuille [Mon, 7 May 2012 19:36:30 +0000]
Hopefully final fix for the stuck blockchain issue
Immediately issue a "getblocks", instead of a "getdata" (which will
trigger the relevant "inv" to be sent anyway), and only do so when
the previous set of invs led us into a known and attached part of
the block tree.
Philip Kaufmann [Sat, 12 May 2012 22:16:50 +0000]
remove string "TextLabel" from warningLabel, as this is unneeded and as such is a silly translation less to do :)
Wladimir J. van der Laan [Fri, 11 May 2012 18:17:09 +0000]
Properly escape " in strings when exporting CSV
Fordy [Sat, 12 May 2012 03:36:37 +0000]
Correct Date
Fordy [Sat, 12 May 2012 03:32:03 +0000]
Correct Date
Pieter Wuille [Fri, 11 May 2012 02:11:22 +0000]
Fix version numbers of archive builds
Gavin Andresen [Wed, 9 May 2012 17:56:53 +0000]
Fix osx build
Matt Corallo [Wed, 9 May 2012 05:40:33 +0000]
Fix DEBUG_LOCKCONTENTION
Philip Kaufmann [Tue, 8 May 2012 07:31:25 +0000]
remove 2 ugly spaces from a string used in translations
Philip Kaufmann [Tue, 8 May 2012 21:22:36 +0000]
remove 2 obsolete functions from init.h that moved to util.h
Luke Dashjr [Mon, 7 May 2012 19:22:09 +0000]
Bitcoin-Qt: Remove redundant tooltip on optional transaction fee. Fixes #1218
Luke Dashjr [Tue, 15 May 2012 07:23:32 +0000]
Merge remote branch 'origin/0.6.2' into 0.6.x
Conflicts:
src/addrman.cpp
Gavin Andresen [Fri, 11 May 2012 14:09:45 +0000]
Bump version to 0.6.2.2 for osx-special build
Gavin Andresen [Thu, 10 May 2012 20:39:49 +0000]
Merge branch 'semaphores-v0.6.2' of https://github.com/sipa/bitcoin into 0.6.2
Pieter Wuille [Thu, 10 May 2012 18:45:35 +0000]
Use polling instead of boost's broken semaphore on OSX
Pieter Wuille [Thu, 10 May 2012 16:44:07 +0000]
Use semaphores instead of condition variables
Gavin Andresen [Thu, 10 May 2012 20:14:15 +0000]
Revert "Fix 100% cpu usage on osx bug"
This reverts commit
8f9123a157d0ef479f62eb3e05da2ba6613c5dfc.
Gavin Andresen [Wed, 9 May 2012 22:24:34 +0000]
Fix 100% cpu usage on osx bug
Luke Dashjr [Tue, 8 May 2012 20:11:44 +0000]
Bump version to 0.6.0.8
Luke Dashjr [Tue, 8 May 2012 20:10:20 +0000]
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
bitcoin-qt.pro
doc/README
doc/README_windows.txt
share/setup.nsi
src/serialize.h
Luke Dashjr [Tue, 8 May 2012 20:09:43 +0000]
Bump version to 0.5.6
Luke Dashjr [Tue, 8 May 2012 20:08:19 +0000]
Merge branch '0.4.x' into 0.5.x
Conflicts:
contrib/Bitcoin.app/Contents/Info.plist
doc/README
doc/README_windows.txt
share/setup.nsi
src/serialize.h
Luke Dashjr [Tue, 8 May 2012 19:53:29 +0000]
Bump version to 0.4.7
Gavin Andresen [Mon, 7 May 2012 00:11:05 +0000]
Bump versions for 0.6.2
Luke Dashjr [Mon, 7 May 2012 05:34:18 +0000]
Update/fix translations
Luke Dashjr [Mon, 7 May 2012 04:10:54 +0000]
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/main.cpp
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
Luke Dashjr [Mon, 7 May 2012 03:57:39 +0000]
Update/fix translations
Pieter Wuille [Sat, 5 May 2012 02:04:38 +0000]
Prevent stuck download: correct solution
Pull request #948 introduced a fix for nodes stuck on a long side branch
of the main chain. The fix was non-functional however, as the additional
getdata request was created in a first step of processing, but dropped
in a second step as it was considered redundant. This commits fixes it
by sending the request directly.
Luke Dashjr [Mon, 7 May 2012 04:00:26 +0000]
Merge commit '293f264' into 0.6.0.x
Luke Dashjr [Mon, 7 May 2012 02:46:14 +0000]
Merge branch '0.4.x' into 0.5.x
Pieter Wuille [Sat, 5 May 2012 02:04:38 +0000]
Prevent stuck download: correct solution
Pull request #948 introduced a fix for nodes stuck on a long side branch
of the main chain. The fix was non-functional however, as the additional
getdata request was created in a first step of processing, but dropped
in a second step as it was considered redundant. This commits fixes it
by sending the request directly.
Pieter Wuille [Sun, 18 Mar 2012 22:47:26 +0000]
Prevent stuck block download in large reorganisations
In cases of very large reorganisations (hundreds of blocks), a situation
may appear where an 'inv' is sent as response to a 'getblocks', but the
last block mentioned in the inv is already known to the receiver node.
However, the supplying node uses a request for this last block as a
trigger to send the rest of the inv blocks. If it never comes, the block
chain download is stuck.
This commit makes the receiver node always request the last inv'ed block,
even if it is already known, to prevent this problem.
Pieter Wuille [Sat, 5 May 2012 19:27:52 +0000]
Bugfix: store source address in addrman
Pieter Wuille [Sat, 5 May 2012 19:22:55 +0000]
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
Pieter Wuille [Sat, 5 May 2012 19:30:38 +0000]
Add extra asserts to addrman
Philip Kaufmann [Thu, 3 May 2012 12:52:15 +0000]
fix #952 by checking if we have a new address or an updated label
Philip Kaufmann [Thu, 3 May 2012 12:52:15 +0000]
fix #952 by checking if we have a new address or an updated label
Wladimir J. van der Laan [Sun, 6 May 2012 06:14:19 +0000]
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.
Wladimir J. van der Laan [Sun, 6 May 2012 06:14:19 +0000]
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.
Luke Dashjr [Sun, 6 May 2012 05:37:21 +0000]
Merge branch '0.6.0.x' into 0.6.x
Conflicts:
src/bitcoinrpc.cpp
src/db.cpp
Luke Dashjr [Sun, 6 May 2012 05:35:58 +0000]
Merge branch '0.5.x' into 0.6.0.x
Luke Dashjr [Sun, 6 May 2012 05:35:50 +0000]
Merge branch '0.4.x' into 0.5.x
Pieter Wuille [Sat, 5 May 2012 19:27:52 +0000]
Bugfix: store source address in addrman
Pieter Wuille [Sat, 5 May 2012 19:22:55 +0000]
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
Peter Todd [Sat, 28 Apr 2012 20:29:27 +0000]
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)"
Peter Todd [Sat, 28 Apr 2012 20:29:27 +0000]
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)"
Luke Dashjr [Sat, 5 May 2012 02:41:43 +0000]
Bugfix: %-12I64d is not valid and causes the parameter to be skipped, use %12"PRI64d" instead
Luke Dashjr [Sun, 6 May 2012 05:27:08 +0000]
Bugfix: %-12I64d is not valid and causes the parameter to be skipped, use %12"PRI64d" instead
Conflicts:
src/walletdb.cpp
Philip Kaufmann [Wed, 4 Apr 2012 07:07:55 +0000]
remove HTML code around "Wallet" (displayed on overview page) and use Qt tags for font settings
Luke Dashjr [Sat, 5 May 2012 16:13:56 +0000]
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
Luke Dashjr [Fri, 4 May 2012 19:55:54 +0000]
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/main.cpp
Luke Dashjr [Fri, 4 May 2012 19:54:24 +0000]
Bugfix: Remove redundant duplicate transaction check
Luke Dashjr [Fri, 4 May 2012 18:58:37 +0000]
Merge branch '0.6.0.x' of gitorious.org:+bitcoin-stable-developers/bitcoin/bitcoind-stable into 0.6.0.x
Luke Dashjr [Fri, 4 May 2012 18:57:03 +0000]
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/main.cpp
src/serialize.h
Luke Dashjr [Fri, 4 May 2012 18:55:15 +0000]
Merge branch '0.4.x' into 0.5.x
Gavin Andresen [Mon, 30 Apr 2012 00:56:55 +0000]
Check earlier for blocks with duplicate transactions. Fixes #1167
Gavin Andresen [Mon, 30 Apr 2012 00:56:55 +0000]
Check earlier for blocks with duplicate transactions. Fixes #1167
Philip Kaufmann [Thu, 3 May 2012 09:30:52 +0000]
remove obsolete BackupWallet() entry in wallet.h
Gavin Andresen [Mon, 30 Apr 2012 17:06:30 +0000]
Bump version numbers for 0.6.1rc2
Gregory Maxwell [Thu, 3 May 2012 13:47:16 +0000]
Merge pull request #1188 from Diapolo/rem_BackupWallet_wallet_h
remove obsolete BackupWallet() entry in wallet.h
Philip Kaufmann [Thu, 3 May 2012 09:30:52 +0000]
remove obsolete BackupWallet() entry in wallet.h
Philip Kaufmann [Tue, 1 May 2012 20:26:33 +0000]
add bitcoin-qt.rc to OTHER_FILES (shown in Qt Creator)
Wladimir J. van der Laan [Wed, 2 May 2012 06:57:02 +0000]
Merge pull request #1179 from Diapolo/project-file
add bitcoin-qt.rc to OTHER_FILES (shown in Qt Creator)
Philip Kaufmann [Mon, 30 Apr 2012 23:46:03 +0000]
fix compiler warning "suggest parentheses around assignment used as truth
value [-Wparentheses]" in util.cpp
Philip Kaufmann [Tue, 1 May 2012 16:45:10 +0000]
fix DEPENDPATH in the project file, as json has no include sub-dir and src was in twice
Philip Kaufmann [Mon, 30 Apr 2012 23:56:47 +0000]
remove unused typedef in serialize.h
Jeff Garzik [Tue, 1 May 2012 22:02:41 +0000]
Merge pull request #1171 from Diapolo/fix_compiler_warn
fix 2 compiler warnings
Philip Kaufmann [Tue, 1 May 2012 20:26:33 +0000]
add bitcoin-qt.rc to OTHER_FILES (shown in Qt Creator)
Wladimir J. van der Laan [Tue, 1 May 2012 19:38:56 +0000]
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
Jeff Garzik [Tue, 1 May 2012 17:05:00 +0000]
Merge pull request #1177 from laanwj/2012_05_remove_duplicate_securestring
remove duplicate definition of SecureString in util.h
Wladimir J. van der Laan [Tue, 1 May 2012 16:52:38 +0000]
Merge pull request #1172 from Diapolo/serialize_h_rem_typedef
remove unused typedef in serialize.h
Wladimir J. van der Laan [Tue, 1 May 2012 16:49:50 +0000]
remove duplicate definition of SecureString in util.h
SecureString was moved to allocators.h in commit
6cb6d623479c5dd42d91de7a4d391078d0800e54
Philip Kaufmann [Tue, 1 May 2012 16:45:10 +0000]
fix DEPENDPATH in the project file, as json has no include sub-dir and src was in twice
Jeff Garzik [Tue, 1 May 2012 15:29:10 +0000]
Merge pull request #1173 from Diapolo/init_cpp_comment_upd
remove references to bitcoin-wx from comment in init.cpp
Philip Kaufmann [Mon, 30 Apr 2012 23:46:03 +0000]
fix compiler warning "suggest parentheses around assignment used as truth
value [-Wparentheses]" in util.cpp
Philip Kaufmann [Mon, 30 Apr 2012 23:44:59 +0000]
fix compiler warning "suggest explicit braces to avoid ambiguous "else"
[-Wparentheses]" in net.cpp
Philip Kaufmann [Mon, 30 Apr 2012 23:59:54 +0000]
remove references to bitcoin-wx from comment in init.cpp
Philip Kaufmann [Mon, 30 Apr 2012 23:56:47 +0000]
remove unused typedef in serialize.h
Gavin Andresen [Mon, 30 Apr 2012 00:56:55 +0000]
Check earlier for blocks with duplicate transactions. Fixes #1167
Philip Kaufmann [Sun, 22 Apr 2012 15:32:08 +0000]
change button tooltip on sign message page for copy to clipboard as it was missleading
Wladimir J. van der Laan [Sun, 29 Apr 2012 11:35:27 +0000]
Merge pull request #1139 from Diapolo/messagepage
change button tooltip on sign message page for copy to clipboard...
Wladimir J. van der Laan [Sun, 29 Apr 2012 11:34:42 +0000]
Merge pull request #1163 from laanwj/2012_04_uiperformanceissue
Fix critical UI performance issue (#1154)