highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-21 15:50:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,566 Commits 8 Branches 346 Tags
01ed45cbbcefc0448de86b4196caa5b1a0ab6ce5
Commit Graph

2566 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pieter Wuille
01ed45cbbc Update comment about secure_allocator<> 2012-06-14 17:03:27 +00:00
Pieter Wuille
17badef789 Do not signal outbound semaphore if uninitialized 2012-05-25 21:32:06 +00:00
Luke Dashjr
a49927a46d 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
 2012-05-22 23:07:46 +00:00
Luke Dashjr
d67b0434f2 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/main.cpp
 2012-05-22 22:57:10 +00:00
Luke Dashjr
3b36da6d27 Merge branch '0.4.x' into 0.5.x 
Conflicts:
	src/ui.cpp
	src/ui.h
	src/uibase.cpp
	src/xpm/about.xpm
 2012-05-22 22:55:49 +00:00
Jeff Garzik
a2de1ea2d5 Prevent crashes due to missing or corrupted blk????.dat records 2012-05-22 22:50:02 +00:00
Jeff Garzik
b6862f7b74 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.
 2012-05-22 22:47:51 +00:00
Wladimir J. van der Laan
d7534272c6 Remove duplicate behavior on MacOSX 
Dock icon on macosx already has show/hide functionality. This results in erratic behavior.
 2012-05-22 22:43:53 +00:00
R E Broadley
8a39b0d613 Correct debug.log output to show correct function the debug is coming from. 2012-05-22 22:42:13 +00:00
Wladimir J. van der Laan
087fc28f7d Filter out whitespace and zero-width non-breaking spaces in validator 
- Fixes issues with copy/pasting from web or html emails (#1325)
 2012-05-22 22:33:41 +00:00
Fordy
58ac600b2c 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.
 2012-05-20 20:15:41 +00:00
Fordy
b2de28c740 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.
 2012-05-20 20:10:24 +00:00
Fordy
d11488abd0 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.
 2012-05-20 20:06:11 +00:00
Fordy
e10622d129 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.
 2012-05-20 20:00:26 +00:00
Philip Kaufmann
334668cde4 remove 2 ugly spaces from a message string 
(PARTIAL of 966ae00)
 2012-05-20 19:54:14 +00:00
R E Broadley
c45c2c380d Add build directory to .gitignore, so that it's not tracked. 2012-05-18 00:08:34 +00:00
R E Broadley
77b0f86a43 Add /bin/sh to bitcoin-qt.pro - as some filesystems don't have the execute flag. 2012-05-18 00:07:45 +00:00
Christian von Roques
fba681519a Fix typo. libarcode => libqrcode 2012-05-18 00:04:59 +00:00
Jeff Garzik
3a05f1d2ce Always check return values of TxnBegin() and TxnCommit() 2012-05-18 00:04:18 +00:00
Jeff Garzik
738592a002 Always check return values of TxnBegin() and TxnCommit() 
PARTIAL, since d68dcf7 isn't backported (yet)
 2012-05-18 00:03:32 +00:00
Pieter Wuille
c455aec699 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.
 2012-05-17 23:45:49 +00:00
Philip Kaufmann
10593f3be1 remove string "TextLabel" from warningLabel, as this is unneeded and as such is a silly translation less to do :) 2012-05-15 08:08:32 +00:00
Wladimir J. van der Laan
dc15d56b2d Properly escape " in strings when exporting CSV 2012-05-15 08:03:38 +00:00
Fordy
0d174e130b Correct Date 2012-05-15 08:02:57 +00:00
Fordy
182738e177 Correct Date 2012-05-15 08:02:30 +00:00
Pieter Wuille
7532c476fe Fix version numbers of archive builds 2012-05-15 08:00:04 +00:00
Gavin Andresen
d306fd833c Fix osx build 2012-05-15 07:49:27 +00:00
Matt Corallo
7700b94d33 Fix DEBUG_LOCKCONTENTION 2012-05-15 07:40:01 +00:00
Philip Kaufmann
7515f00aa3 remove 2 ugly spaces from a string used in translations 2012-05-15 07:37:59 +00:00
Philip Kaufmann
9e52f51223 remove 2 obsolete functions from init.h that moved to util.h 2012-05-15 07:34:22 +00:00
Luke Dashjr
93b5eff274 Bitcoin-Qt: Remove redundant tooltip on optional transaction fee. Fixes #1218 2012-05-15 07:32:00 +00:00
Luke Dashjr
99101685f6 Merge remote branch 'origin/0.6.2' into 0.6.x 
Conflicts:
	src/addrman.cpp
 2012-05-15 07:23:32 +00:00
Gavin Andresen
40fd689eb1 Bump version to 0.6.2.2 for osx-special build v0.6.2.2 2012-05-11 10:09:45 -04:00
Gavin Andresen
aaff04791d Merge branch 'semaphores-v0.6.2' of https://github.com/sipa/bitcoin into 0.6.2 2012-05-10 16:39:49 -04:00
Pieter Wuille
f0f1b3775e Use polling instead of boost's broken semaphore on OSX 2012-05-10 22:34:49 +02:00
Pieter Wuille
ca0816152d Use semaphores instead of condition variables 2012-05-10 22:34:43 +02:00
Gavin Andresen
91b13a0dff Revert "Fix 100% cpu usage on osx bug" 
This reverts commit 8f9123a157.
 2012-05-10 16:14:15 -04:00
Gavin Andresen
8f9123a157 Fix 100% cpu usage on osx bug v0.6.2.1 2012-05-09 18:58:38 -04:00
Luke Dashjr
8fa3259664 Bump version to 0.6.0.8 2012-05-08 20:11:44 +00:00
Luke Dashjr
cd0527453b 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
 2012-05-08 20:10:20 +00:00
Luke Dashjr
35a07f8ec4 Bump version to 0.5.6 2012-05-08 20:09:43 +00:00
Luke Dashjr
fac3476993 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
 2012-05-08 20:08:19 +00:00
Luke Dashjr
18b4eccddb Bump version to 0.4.7 2012-05-08 19:53:29 +00:00
Gavin Andresen
8ff1873096 Bump versions for 0.6.2 v0.6.2 2012-05-08 12:58:39 -04:00
Luke Dashjr
b481373001 Update/fix translations 2012-05-07 05:34:18 +00:00
Luke Dashjr
1fa846bbb6 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
 2012-05-07 04:10:54 +00:00
Luke Dashjr
b803009c84 Update/fix translations 2012-05-07 04:10:35 +00:00
Pieter Wuille
60953d05c8 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.
 2012-05-07 04:00:49 +00:00
Luke Dashjr
6bcefc1338 Merge commit '293f264' into 0.6.0.x 2012-05-07 04:00:26 +00:00
Luke Dashjr
afff998ef0 Merge branch '0.4.x' into 0.5.x 2012-05-07 02:46:14 +00:00