Commit Graph
2182 Commits
Author SHA1 Message Date
Luke Dashjr 278074eb23 Display an error, rather than crashing, if encoding a QR Code failed.
(master workaround in b1a99c3a1f + 7261945eb5)
2012-04-14 15:28:07 -04:00
Philip KaufmannandLuke Dashjr 760d9480ed removed (no label) string if we have NO label
(partial of 9e0dba8c17)
2012-04-14 15:11:28 -04:00
cardpuncherandLuke Dashjr 06de079091 Added comment lines in French & Turkish which basically mean "Bitcoin, virtual P2P cryptocurrency". 2012-04-11 15:20:59 -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
graingertandLuke Dashjr 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 WuilleandLuke Dashjr c7057326ea Verify status of encrypt/decrypt calls to detect failed padding 2012-04-05 18:03:48 -04:00
Wladimir J. van der LaanandLuke Dashjr 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
Matt CoralloandLuke Dashjr d02833c76a Add laanwj to gitian download scripts. 2012-04-04 15:58:15 -04:00
Matt CoralloandLuke Dashjr bf754cfd01 Add laanwj to gitian download scripts. 2012-04-04 15:58:02 -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
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 LaanandLuke Dashjr 91d7e847e0 Use a messagebox to display the error when -server is provided without providing a rpc password
(plus part of 7cfbe1fee4)
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 KaufmannandLuke Dashjr 6806677841 removed an ugly line break in a transaction tooltip for case TransactionStatus::Mature 2012-04-04 10:21:14 -04:00
Pieter WuilleandLuke Dashjr 3f47eb4a9a Updated my GPG key 2012-04-04 10:17:26 -04:00
Pieter WuilleandLuke Dashjr 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: 922e8e2929
2012-04-04 10:00:32 -04:00
Vegard NossumandLuke Dashjr 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 WuilleandLuke Dashjr 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:
	11529c6e4f
	d4d9c734c3
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 AndresenandLuke Dashjr 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