aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge pull request #1433 from Diapolo/tabbed_optionsdialogWladimir J. van der Laan2012-06-135-345/+646
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | re-work optionsdialog to a tabbed UI based on an ui-filePhilip Kaufmann2012-06-135-345/+646
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #1444 from laanwj/2012_06_opendebuglogWladimir J. van der Laan2012-06-122-10/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Cross-platform "Open debug logfile"Wladimir J. van der Laan2012-06-122-10/+2
* | | | | | | | | | | | Merge pull request #1445 from Diapolo/RPCCon_Button_noAutoDefaultWladimir J. van der Laan2012-06-121-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | make buttons in debug window non autoDefaultPhilip Kaufmann2012-06-121-0/+6
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1446 from TheBlueMatt/changelogGavin Andresen2012-06-121-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Update wiki changelog at doc/release-process.txtMatt Corallo2012-06-131-0/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #1440 from Diapolo/overviewpage_InitialBalanceWladimir J. van der Laan2012-06-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | change initial Balance on overviewpage from "123.456 BTC" to "0 BTC" to not c...Philip Kaufmann2012-06-111-1/+1
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #1441 from TheBlueMatt/gitian-downloaderPieter Wuille2012-06-122-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix broken config filesMatt Corallo2012-06-122-2/+2
* | | | | | | | | | | | Merge pull request #1443 from laanwj/2012_06_addressbook_noautoselectWladimir J. van der Laan2012-06-121-5/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Do not select first address automatically in the address bookWladimir J. van der Laan2012-06-121-5/+0
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #1412 from Diapolo/string_wait_matureWladimir J. van der Laan2012-06-112-3/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | update info string in GUI for generated blocks and change "must wait" into "m...Philip Kaufmann2012-06-092-3/+2
* | | | | | | | | | | Merge pull request #1435 from TheBlueMatt/mingwbuildJeff Garzik2012-06-091-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix Mingw64 build (missing headers according to M$ documentation)Matt Corallo2012-06-091-0/+2
* | | | | | | | | | | Merge pull request #1421 from Diapolo/netbase_fix_sign_warningsPieter Wuille2012-06-081-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix two signed/unsigned comparison warnings in netbase.cppPhilip Kaufmann2012-06-051-2/+2
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Update comment about secure_allocator<>Pieter Wuille2012-06-081-1/+0
* | | | | | | | | | | Merge pull request #1424 from TheBlueMatt/lockcontentionPieter Wuille2012-06-082-2/+13
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix DEBUG_LOCKCONTENTIONMatt Corallo2012-06-052-2/+13
* | | | | | | | | | | Merge pull request #1418 from Diapolo/GUI_fix_default_proxy_addrPieter Wuille2012-06-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | fix default Proxy address in Qt options (no hostname allowed currently)Philip Kaufmann2012-06-041-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #1422 from Diapolo/add_used_datadir_debug_logGavin Andresen2012-06-051-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | add used datadir to debug.logPhilip Kaufmann2012-06-051-0/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'netopt' of https://github.com/sipa/bitcoinGavin Andresen2012-06-0411-164/+237
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rework network config settingsPieter Wuille2012-05-3111-164/+237
* | | | | | | | | | Merge pull request #1411 from TheBlueMatt/debianGavin Andresen2012-06-045-24/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update contrib/debian.Matt Corallo2012-06-025-24/+15
* | | | | | | | | | | Merge pull request #1415 from dooglus/fix-build-unix.txtGavin Andresen2012-06-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | "USE_UPNP=-" is needed to remove UPnP support.Chris Moore2012-06-031-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #837 from sje397/ShowImmatureBalanceWladimir J. van der Laan2012-06-029-24/+87
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added 'immature balance' for miners. Only displayed if the balance is greater...sje3972012-05-259-24/+87
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #1368 from Diapolo/verifymessagepageWladimir J. van der Laan2012-06-024-80/+105
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | change verifymessagepage behaviour to match RPC-call "verifymessage" (input a...Philip Kaufmann2012-06-014-80/+105
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #1364 from Diapolo/move_HelpMessage_GUIUtil_add_RPCCon_ButtonWladimir J. van der Laan2012-06-026-54/+93
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | move class HelpMessageBox to guiutil.cpp/.h / add button to show Bitcoin comm...Philip Kaufmann2012-06-016-54/+93
|/ / / / / / / / /
* | | | | | | | | Use ConvertTo to simplify sendmany/addmultisigaddress argument handlingGavin Andresen2012-05-311-18/+5
* | | | | | | | | Make sendrawtx return txid to be consistent with other send methods.Gavin Andresen2012-05-311-1/+1
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #1403 from Diapolo/translation_master_fileNils Schneider2012-05-311-278/+304
|\ \ \ \ \ \ \ \
| * | | | | | | | sync english translation master file with current master branchPhilip Kaufmann2012-05-311-278/+304
|/ / / / / / / /
* | | | / / / / Update bitcoinstrings.cppPieter Wuille2012-05-301-49/+48
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge pull request #1394 from grimd34th/patch-1Gregory Maxwell2012-05-281-3/+3
|\ \ \ \ \ \ \
| * | | | | | | incorrect openssl when compared to makefilegrimd34th2012-05-281-3/+3
|/ / / / / / /
* | | | | | | Merge pull request #1392 from gavinandresen/testnet_resetGregory Maxwell2012-05-274-17/+20
|\ \ \ \ \ \ \
| * | | | | | | Add a testnet checkpoint at block 546Gavin Andresen2012-05-251-7/+12
| * | | | | | | Fix issue#1082, testnet difficulty unsigned integer underflowGavin Andresen2012-05-251-3/+3
| * | | | | | | Testnet, Mark IIIGavin Andresen2012-05-253-7/+5