aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-08-01Merge pull request #1344 from rebroad/AskForTimeFormatJeff Garzik
Unless debugging, show a more useful format for the askfors
2012-08-01Merge pull request #1343 from rebroad/MisbehavingDeltaJeff Garzik
Show when node is misbehaving, not just at the point that it gets banned...
2012-07-28Merge pull request #1635 from Diapolo/update_helpMessageWladimir J. van der Laan
update HelpMessage()
2012-07-27Merge pull request #1594 from Diapolo/GUI_testnet3_fixWladimir J. van der Laan
small update for BitcoinGUI::setNumBlocks() function
2012-07-27update HelpMessage()Philip Kaufmann
- 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-27Merge pull request #1571 from Diapolo/optionsdialog_cleanupWladimir J. van der Laan
GUI: optionsdialog cleanup
2012-07-26Switch testnet3's message bytes to avoid connecting to old nodes.Gregory Maxwell
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-26Handle should-never-happen case of orphan in mempoolGavin Andresen
2012-07-26When creating new blocks, sort 'paid' area by fee-per-kbGavin Andresen
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-26Merge branch 'checknewblock' of git://github.com/luke-jr/bitcoinGavin Andresen
2012-07-26Merge branch 'bugfix_CNBerr' of git://github.com/luke-jr/bitcoinGavin Andresen
2012-07-25Merge pull request #1631 from laanwj/2012_07_translationsupdateWladimir J. van der Laan
Update translation messages
2012-07-26Update translation messagesWladimir J. van der Laan
- 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-25Merge pull request #1624 from Diapolo/fix_typo_log_fileWladimir J. van der Laan
fix typo "logfile" -> "log file"
2012-07-25Merge pull request #1630 from fanquake/masterWladimir J. van der Laan
Fix Typo
2012-07-26TypoMichael Ford
2012-07-25Merge pull request #1615 from Diapolo/net_noExtIp_IPv6onlyGregory Maxwell
do not use external IPv4 discovery, when -onlynet="IPv6"
2012-07-25Merge pull request #1628 from glondu/masterGregory Maxwell
Fix spelling of successfully
2012-07-24Fix spelling of successfullyStephane Glondu
2012-07-23fix typo "logfile" -> "log file"Philip Kaufmann
2012-07-22Merge pull request #1622 from fanquake/masterWladimir J. van der Laan
Fix Typos
2012-07-23Typofanquake
2012-07-23Fix Typofanquake
2012-07-22Merge pull request #1621 from luke-jr/WinCOPYINGGavin Andresen
Replace all occurances of license.txt with COPYING, including naming the file COPYING.txt on Windows
2012-07-22Replace all occurances of license.txt with COPYING, including naming the ↵Luke Dashjr
file COPYING.txt on Windows
2012-07-22optionsdialog cleanupPhilip Kaufmann
- 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-21Merge pull request #1616 from Diapolo/OpenSSL_typoJeff Garzik
fix OpenSSL not written as proper noun in some comments
2012-07-21fix OpenSSL not written as proper noun in some commentsPhilip Kaufmann
2012-07-20do not use external IPv4 discovery, when -onlynet="IPv6"Philip Kaufmann
2012-07-19Merge pull request #1611 from Diapolo/addressbookpage_sizeWladimir J. van der Laan
re-size addressbookpage.ui to fix #1062
2012-07-19re-size addressbookpage.ui to fix #1062Philip Kaufmann
2012-07-18Merge pull request #1610 from fanquake/masterJeff Garzik
Update a link to dev resources
2012-07-19Update a linkfanquake
2012-07-18Merge pull request #1609 from fanquake/masterJeff Garzik
Docs tidy up + fixes
2012-07-18Docs Tidy upfanquake
2012-07-18Merge pull request #1608 from runeksvendsen/masterGregory Maxwell
Update the comment in GetBlockValue() to better reflect the uncertainty about the time interval between subsidy reductions
2012-07-18Merge pull request #1563 from Diapolo/pro-fileWladimir J. van der Laan
update Boost version to 1.49 for Windows in the Qt project file
2012-07-18Let the comment in GetBlockValue() reflect the uncertainty about the time ↵Rune K. Svendsen
interval between subsidy reductions
2012-07-17Merge pull request #1605 from laanwj/2012_07_caseinsensitivesortWladimir J. van der Laan
Make sort and filters for transactions and labels case-insensitive
2012-07-17Merge branch 'master' of git://github.com/fanquake/bitcoinGavin Andresen
2012-07-17New feature for signrawtransaction: specify signature hash (ALL/NONE/etc)Gavin Andresen
2012-07-17Give a better error message than 'type mismatch' for complex JSON argumentsGavin Andresen
2012-07-17small update for BitcoinGUI::setNumBlocks() functionPhilip Kaufmann
- re-work code parts that check if we have a Statusbar warning - use same variable names in the header
2012-07-17Make sort and filters for transactions and labels case-insensitiveWladimir J. van der Laan
2012-07-17Merge pull request #1604 from Diapolo/fix_comment_netWladimir J. van der Laan
fix a comment in net.cpp
2012-07-17Merge pull request #1564 from Diapolo/IPC-serverWladimir J. van der Laan
IPC-server hardening and update
2012-07-17fix a comment in net.cppPhilip Kaufmann
2012-07-17IPC-server hardening and updatePhilip Kaufmann
- add IMPLEMENT_RANDOMIZE_STACK for ipcThread() - log / print boost interprocess exceptions - use MAX_URI_LENGTH in guiconstants.h (also used in qrcodedialog.cpp) - remove unneeded includes and ipcShutdown() from qtipcserver.cpp - fix a small mem-leak by deleting mq before re-using it - make ipcThread() and ipcThread2() static functions - add some more comments
2012-07-16Merge pull request #1591 from Diapolo/lang_sel_Qt4.8Wladimir J. van der Laan
enhance lang-selection in OptionsDialog, when compiling with Qt >= 4.8
2012-07-16Merge branch 'fix-commandline-warnings' of git://github.com/muggenhor/bitcoinGavin Andresen