Commit graph

2837 commits

Author SHA1 Message Date
Luke Dashjr b49f1398a1 Bugfix: Correct English grammar regarding "'s" 2012-08-01 17:50:00 +00:00
Luke Dashjr 3c726dd3c0 Bugfix: Use standard BTC unit in comments 2012-08-01 17:49:57 +00:00
Luke Dashjr 814efd6f1f Bugfix: Fix a variety of misspellings 2012-08-01 17:49:51 +00:00
Jeff Garzik a823faecf1 Merge pull request #1344 from rebroad/AskForTimeFormat
Unless debugging, show a more useful format for the askfors
2012-08-01 09:08:00 -07:00
Jeff Garzik 0ecbd46fe7 Merge pull request #1343 from rebroad/MisbehavingDelta
Show when node is misbehaving, not just at the point that it gets banned...
2012-08-01 09:06:57 -07:00
Wladimir J. van der Laan 3c83387c29 Merge pull request #1635 from Diapolo/update_helpMessage
update HelpMessage()
2012-07-28 01:05:43 -07:00
Wladimir J. van der Laan c1aed4eff4 Merge pull request #1594 from Diapolo/GUI_testnet3_fix
small update for BitcoinGUI::setNumBlocks() function
2012-07-27 05:54:19 -07:00
Philip Kaufmann 6986c779f0 update HelpMessage()
- place "-?" option at first
- re-work description and "\n" usage for Gavins new block creation options
  to better match current description syntax
- ensure no "\n" is in translated strings, which is better for Transifex
2012-07-27 14:03:37 +02:00
Wladimir J. van der Laan 2e53709f17 Merge pull request #1571 from Diapolo/optionsdialog_cleanup
GUI: optionsdialog cleanup
2012-07-27 04:08:03 -07:00
Gregory Maxwell a9d811a976 Switch testnet3's message bytes to avoid connecting to old nodes.
The new bytes are based on "11" to appeal to Gavin's 11 fetish.

This breaks existing testnet3 nodes as the blockchain files
are also versioned.  To upgrade a node delete everything
except wallet.dat from your .bitcoin/testnet3 folder.
2012-07-26 17:50:23 -04:00
Gavin Andresen e0e54740b1 Handle should-never-happen case of orphan in mempool 2012-07-26 15:29:59 -04:00
Gavin Andresen c555400ca1 When creating new blocks, sort 'paid' area by fee-per-kb
Modify CreateNewBlock so that instead of processing all transactions
in priority order, process the first 27K of transactions in
priority order and then process the rest in fee-per-kilobyte
order.

This is the first, minimal step towards better a better fee-handling
system for both miners and end-users; this patch should be easy
to backport to the old versions of Bitcoin, and accomplishes the
most important goal-- allow users to "buy their way in" to blocks
using transaction fees.
2012-07-26 14:24:19 -04:00
Gavin Andresen 29c8fb0d93 Merge branch 'checknewblock' of git://github.com/luke-jr/bitcoin 2012-07-26 13:55:27 -04:00
Gavin Andresen 986a78979e Merge branch 'bugfix_CNBerr' of git://github.com/luke-jr/bitcoin 2012-07-26 13:55:21 -04:00
Wladimir J. van der Laan 701e1f5254 Merge pull request #1631 from laanwj/2012_07_translationsupdate
Update translation messages
2012-07-25 19:23:13 -07:00
Wladimir J. van der Laan ebeafe5b0b Update translation messages
- No core strings changed since last time
- Re-add line numbers in .ts file as this is marginally easier for translators (see #1227)
2012-07-26 04:20:21 +02:00
Wladimir J. van der Laan c32ad4594e Merge pull request #1624 from Diapolo/fix_typo_log_file
fix typo "logfile" -> "log file"
2012-07-25 19:15:01 -07:00
Wladimir J. van der Laan 6892cb056d Merge pull request #1630 from fanquake/master
Fix Typo
2012-07-25 19:09:49 -07:00
Michael Ford 50c85be6fc Typo 2012-07-26 10:07:43 +08:00
Gregory Maxwell f00ffc6c00 Merge pull request #1615 from Diapolo/net_noExtIp_IPv6only
do not use external IPv4 discovery, when -onlynet="IPv6"
2012-07-25 11:11:25 -07:00
Gregory Maxwell f5a3dbea40 Merge pull request #1628 from glondu/master
Fix spelling of successfully
2012-07-25 11:10:00 -07:00
Stephane Glondu 2acfa219aa Fix spelling of successfully 2012-07-24 10:39:09 +02:00
Philip Kaufmann 64c0020ff8 fix typo "logfile" -> "log file" 2012-07-23 08:22:04 +02:00
Wladimir J. van der Laan 12e5881c09 Merge pull request #1622 from fanquake/master
Fix Typos
2012-07-22 22:31:15 -07:00
fanquake 26227db843 Typo 2012-07-23 12:03:48 +08:00
fanquake 951f7d35d6 Fix Typo 2012-07-23 11:59:02 +08:00
Gavin Andresen 0bf30d2b33 Merge pull request #1621 from luke-jr/WinCOPYING
Replace all occurances of license.txt with COPYING, including naming the file COPYING.txt on Windows
2012-07-22 16:18:41 -07:00
Luke Dashjr 90d95b6323 Replace all occurances of license.txt with COPYING, including naming the file COPYING.txt on Windows 2012-07-22 21:49:09 +00:00
Philip Kaufmann 1376a542b4 optionsdialog cleanup
- remove duplicate includes, that are already present in ui_optionsdialog.h
- change QIntValidator to not allow 0 as port-number
- re-order some function calls to match the Ui element order, for better readbility and to prepare for the addition of further IPv6 and Tor proxy options
- restat warning for the language selection is only shown, when the language was changed (not on simply activating the Ui element)
- split check for object == ui->proxyIp into seperate if-clause
- micro-optimize the code in the above mentioned if-clause
- unify used format for comments in the code
- introduce handleProxyIpValid() function, which handles UI elements and the
save button states for valid/invalid proxy IPs
2012-07-22 01:12:11 +02:00
Jeff Garzik fa914f1dda Merge pull request #1616 from Diapolo/OpenSSL_typo
fix OpenSSL not written as proper noun in some comments
2012-07-21 06:59:25 -07:00
Philip Kaufmann a7f82808c4 fix OpenSSL not written as proper noun in some comments 2012-07-21 12:44:54 +02:00
Philip Kaufmann a76552ce47 do not use external IPv4 discovery, when -onlynet="IPv6" 2012-07-20 13:23:02 +02:00
Wladimir J. van der Laan 134cb634b1 Merge pull request #1611 from Diapolo/addressbookpage_size
re-size addressbookpage.ui to fix #1062
2012-07-19 04:36:43 -07:00
Philip Kaufmann 1d915d0237 re-size addressbookpage.ui to fix #1062 2012-07-19 07:22:38 +02:00
Jeff Garzik e3132693fa Merge pull request #1610 from fanquake/master
Update a link to dev resources
2012-07-18 09:45:06 -07:00
fanquake 100f189c25 Update a link 2012-07-19 00:01:04 +08:00
Jeff Garzik 4b76541c25 Merge pull request #1609 from fanquake/master
Docs tidy up + fixes
2012-07-18 07:24:49 -07:00
fanquake f00a0dcfed Docs Tidy up 2012-07-18 22:11:56 +08:00
Gregory Maxwell 07becec31c Merge pull request #1608 from runeksvendsen/master
Update the comment in GetBlockValue() to better reflect the uncertainty about the time interval between subsidy reductions
2012-07-18 06:13:52 -07:00
Wladimir J. van der Laan 1854433829 Merge pull request #1563 from Diapolo/pro-file
update Boost version to 1.49 for Windows in the Qt project file
2012-07-18 02:31:40 -07:00
Rune K. Svendsen 5f2e4b0565 Let the comment in GetBlockValue() reflect the uncertainty about the time interval between subsidy reductions 2012-07-18 09:37:05 +02:00
Wladimir J. van der Laan e47bd0195c Merge pull request #1605 from laanwj/2012_07_caseinsensitivesort
Make sort and filters for transactions and labels case-insensitive
2012-07-17 23:00:23 -07:00
Gavin Andresen c93236b564 Merge branch 'master' of git://github.com/fanquake/bitcoin 2012-07-17 20:33:03 -04:00
Gavin Andresen 3c3666d67e New feature for signrawtransaction: specify signature hash (ALL/NONE/etc) 2012-07-17 12:21:56 -04:00
Gavin Andresen 18871d4785 Give a better error message than 'type mismatch' for complex JSON arguments 2012-07-17 12:02:31 -04:00
Philip Kaufmann ce2f66d9bf small update for BitcoinGUI::setNumBlocks() function
- re-work code parts that check if we have a Statusbar warning
- use same variable names in the header
2012-07-17 14:54:01 +02:00
Wladimir J. van der Laan d67badd9ce Make sort and filters for transactions and labels case-insensitive 2012-07-17 11:38:18 +02:00
Wladimir J. van der Laan ab0d6428b1 Merge pull request #1604 from Diapolo/fix_comment_net
fix a comment in net.cpp
2012-07-17 02:05:30 -07:00
Wladimir J. van der Laan d47afc7f4c Merge pull request #1564 from Diapolo/IPC-server
IPC-server hardening and update
2012-07-17 00:54:12 -07:00
Philip Kaufmann c95d9a9482 fix a comment in net.cpp 2012-07-17 09:53:53 +02:00