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

1146 Commits

Author SHA1 Message Date
Luke Dashjr
3374c3ef09 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/qt/bitcoin.cpp
	src/qt/bitcoingui.cpp
	src/qt/guiutil.cpp
	src/qt/guiutil.h
	src/qt/sendcoinsdialog.cpp
	src/qt/sendcoinsdialog.h
	src/util.cpp
 2012-04-15 21:15:48 -04:00
Luke Dashjr
e73b792b1a Merge branch '0.5.0.x' into 0.5.x 2012-04-15 21:06:10 -04:00
Luke Dashjr
79fc752b61 Merge branch '0.4.x' into 0.5.0.x 
Conflicts:
	src/keystore.h
 2012-04-15 21:05:54 -04:00
Wladimir J. van der Laan
1bdfa94a01 fix warnings: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses] 2012-04-15 19:43:45 -04:00
Wladimir J. van der Laan
8460185dec fix warnings: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses] 2012-04-15 19:43:41 -04:00
Wladimir J. van der Laan
9c236a945c fix warnings: '&&' within '||' [-Wlogical-op-parentheses] 2012-04-15 19:42:40 -04:00
Wladimir J. van der Laan
678a319888 fix warnings: delete called on 'XX' that has virtual functions but non-virtual destructor [-Wdelete-non-virtual-dtor] 2012-04-15 19:42:19 -04:00
Wladimir J. van der Laan
0aa0bb1ead fix warnings: unused variable 'XX' [-Wunused-variable] 2012-04-15 19:40:58 -04:00
Wladimir J. van der Laan
fdcafa3535 fix warnings: unused variable 'XX' [-Wunused-variable] 2012-04-15 19:37:34 -04:00
Wladimir J. van der Laan
5f4fee559e fix warnings: enumeration values 'XX' not handled in switch [-Wswitch-enum] 2012-04-15 19:28:48 -04:00
Wladimir J. van der Laan
c4381587a6 fix warnings: 'XX' defined as a struct here but previously declared as a class [-Wmismatched-tags] 2012-04-15 19:28:34 -04:00
Wladimir J. van der Laan
85e975f379 fix warnings: array subscript is of type 'char' [-Wchar-subscripts] 2012-04-15 19:28:09 -04:00
Wladimir J. van der Laan
f650d62fc6 fix warnings: array subscript is of type 'char' [-Wchar-subscripts] 2012-04-15 19:28:00 -04:00
Wladimir J. van der Laan
401db6d96b work around issue in boost::program_options that prevents from compiling in clang 2012-04-15 19:23:01 -04:00
Chris Moore
7c3db2129e CBitcoinSecret::SetString() now calls IsValid() to make sure it was passed something with the correct version. 2012-04-15 13:31:50 -04:00
Wladimir J. van der Laan
cb1035a008 Show a message box when runaway exception happens 
This is more clear to users than when the program simply disappears (usually during initialization). It still logs the message to the console and debug log as well.
 2012-04-15 13:25:35 -04:00
Luke Dashjr
e962c7f532 Bugfix: nTotalBlocks wasn't in 0.5.0, so need to replace it with equivalent function call in backport 2012-04-15 13:23:34 -04:00
Luke Dashjr
b7566fe29c Bump version to 0.6.0.7 
Skipping 0.6.0.1 through 0.6.0.6 since the internal version for 0.6.0[.0] was in fact 0.6.0.6
 2012-04-15 13:08:21 -04:00
Luke Dashjr
b557c17a37 Bugfix: Check that QRcode_encodeString didn't return NULL (error) 
Without this, any error will segfault Bitcoin-Qt
 2012-04-15 12:59:11 -04:00
Wladimir J. van der Laan
a558054709 Do not show green tick unless all known blocks are downloaded (fixes #921) 2012-04-14 15:33:24 -04:00
Wladimir J. van der Laan
1f91797535 Add missing tooltip and key shortcut in settings dialog (#1088 without line break part) 2012-04-14 15:33:03 -04:00
Gavin Andresen
e88b6b341d Bug fix listtransactions from/count handling. 2012-04-14 15:29:43 -04:00
Luke Dashjr
278074eb23 Display an error, rather than crashing, if encoding a QR Code failed. 
(master workaround in b1a99c3a1fb2613e9c7cecd565e8cc604b03eb6f + 7261945eb5f64423d47a5bff63ecd8b65d88b8ed)
 2012-04-14 15:28:07 -04:00
Philip Kaufmann
760d9480ed removed (no label) string if we have NO label 
(partial of 9e0dba8c17eb6507083b4d7602541c25f1fd7f38)
 2012-04-14 15:11:28 -04:00
Wladimir J. van der Laan
1f56046fd5 Show error message instead of exception crash when unable to bind RPC port 
Fixes issue #875
 2012-04-11 15:54:30 -04:00
Luke Dashjr
9bf1140b90 Merge branch '0.5.0.x' into 0.5.x 2012-04-06 17:45:20 -04:00
Luke Dashjr
527b512cf7 Bugfix: Windows lacks sleep(), so need to use Sleep() from util.h 2012-04-06 17:44:48 -04:00
Luke Dashjr
892fcaf291 Merge branch '0.5.0.x' into 0.5.x 
Conflicts:
	src/qt/notificator.h
 2012-04-06 16:34:34 -04:00
p2k
bf1f995c4c Proper support for Growl 1.3 notifications 2012-04-06 16:31:09 -04:00
Luke Dashjr
ce33356094 Bugfix: Replace "URL" with "URI" where we aren't actually working with URLs 2012-04-06 14:46:30 -04:00
Luke Dashjr
d652709aba Bugfix: Replace "URL" with "URI" where we aren't actually working with URLs 2012-04-06 14:30:10 -04:00
graingert
8ae76e0f5d Change sign message bitcoin address tooltip to "The address to sign the message with" Closes #1050 2012-04-05 22:24:44 -04:00
Luke Dashjr
3e0e10add3 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/keystore.cpp
 2012-04-05 18:22:47 -04:00
Luke Dashjr
0d10cb7a1f Merge branch '0.5.0.x' into 0.5.x 2012-04-05 18:21:01 -04:00
Luke Dashjr
0af2f2d856 Merge branch '0.4.x' into 0.5.0.x 2012-04-05 18:20:18 -04:00
Pieter Wuille
c7057326ea Verify status of encrypt/decrypt calls to detect failed padding 2012-04-05 18:03:48 -04:00
Wladimir J. van der Laan
53e596512c Increase time ago of last block for "up to date" status from 30 to 90 minutes 
It was too hyperactive.
gmaxwell: I mean that right now when the block gap goes over an hour it starts showing synchronizing. Increasing that to 90 minutes or so would make it only happen about 6.4 times per year
 2012-04-04 16:00:04 -04:00
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
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
ef9ab3c2a0 Merge branch '0.5.0.x' into 0.5.x 2012-04-04 10:30:35 -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
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 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
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