Diffusion Bitcoin ABC 07368a9e3c60

Merge branch 'master' into async-ipv6-rpc
07368a9e3c60Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'master' into async-ipv6-rpc

Conflicts:
src/bitcoinrpc.cpp

Signed-off-by: Giel van Schijndel <me@mortis.eu>

Details

Provenance

Giel van Schijndel <me@mortis.eu>	Authored on Jun 17 2012, 12:30
deadalnix	Pushed on May 14 2017, 22:04

Parents

rABCfbf9df2ea325: Use the QueueShutdown signal to stop accepting new RPC connections
rABCfab7858a350d: Document how to build/run unit tests

Branches

Unknown

Tags

Unknown

Event Timeline

Giel van Schijndel <me@mortis.eu> committed rABC07368a9e3c60: Merge branch 'master' into async-ipv6-rpc (authored by Giel van Schijndel <me@mortis.eu>).Jun 17 2012, 12:30

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

fab7858a350d Document how to build/run unit tests
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
194ea3186a33 Merge pull request #1463 from sipa/fix_1455
Author
Gregory Maxwell <greg@xiph.org>
Browse Repository
No Builds
No Audits
c971112dfaea Use a 64-bit nonce in ping
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
d59bce21e5db Merge pull request #1459 from laanwj/2012_06_trayiconmenu
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
641cfb145634 Fix build of testcases after commit 0f10b21719e1b0d9683a142f0a7105e65f095694
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
64d46e7c6af7 Merge pull request #1002 from Diapolo/URL-handling_2
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
0f10b21719e1 Merge pull request #1439 from Diapolo/ClientShutdown
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
f5f2d7410def Reorganize tray icon menu into more logical order
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
93b7af309904 URI-handling code update: added safety checks and tray-notifications
Author
Philip Kaufmann <phil.kaufmann@t-online.de>
Browse Repository
No Builds
No Audits
7a98f19fb6e4 Merge pull request #1420 from Diapolo/extend_showNormalIfMinimized
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
d518e444f83c Merge branch 'refactor_coinselect' of https://github.com/luke-jr/bitcoin
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
7d1490576dc4 Merge pull request #1448 from Diapolo/2012-06-13_translation_updates
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
1bdc992a5931 Merge pull request #1449 from laanwj/2012_06_bitcoinstrings
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
15094f7654f6 Update bitcoinstrings from core and English source translation file
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
66654ab02ec3 update translation files (fetched from Transifex) and remove translation for…
Author
Philip Kaufmann <phil.kaufmann@t-online.de>
Browse Repository
No Builds
No Audits
44c89996c8a9 Merge pull request #1433 from Diapolo/tabbed_optionsdialog
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
c4443c2be141 re-work optionsdialog to a tabbed UI based on an ui-file
Author
Philip Kaufmann <phil.kaufmann@t-online.de>
Browse Repository
No Builds
No Audits
c4879a0c2fea Merge pull request #1444 from laanwj/2012_06_opendebuglog
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
609046df6a4f Merge pull request #1445 from Diapolo/RPCCon_Button_noAutoDefault
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
c17e60e270eb Merge pull request #1446 from TheBlueMatt/changelog
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
992a2e2e799e Update wiki changelog at doc/release-process.txt
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
d2e6dd6c9939 merge toggleHidden() code into showNormalIfMinimized() to extend the…
Author
Philip Kaufmann <phil.kaufmann@t-online.de>
Browse Repository
No Builds
No Audits
d4b2f3c45b5c make buttons in debug window non autoDefault
Author
Philip Kaufmann <phil.kaufmann@t-online.de>
Browse Repository
No Builds
No Audits
9b1732baae6e Cross-platform "Open debug logfile"
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
12718ce767ac Merge pull request #1440 from Diapolo/overviewpage_InitialBalance
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
de29f9b444d5 Merge pull request #1441 from TheBlueMatt/gitian-downloader
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
e5ad8de2d94e Merge pull request #1443 from laanwj/2012_06_addressbook_noautoselect
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
2842fe4aa340 Do not select first address automatically in the address book
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
b6ef8d5a4006 Merge pull request #1412 from Diapolo/string_wait_mature
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
9247134eaba9 introduce a new StartShutdown() function, which starts a thread with Shutdown()…
Author
Philip Kaufmann <phil.kaufmann@t-online.de>
Browse Repository
No Builds
No Audits
993928cfcc32 Fix broken config files
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
59e0f445cea4 change initial Balance on overviewpage from "123.456 BTC" to "0 BTC" to not…
Author
Philip Kaufmann <phil.kaufmann@t-online.de>
Browse Repository
No Builds
No Audits
883a310904b3 Merge pull request #1435 from TheBlueMatt/mingwbuild
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
b065976007a1 Fix Mingw64 build (missing headers according to M$ documentation)
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
40d23dafb70b update info string in GUI for generated blocks and change "must wait" into…
Author
Philip Kaufmann <phil.kaufmann@t-online.de>
Browse Repository
No Builds
No Audits
11f73c728afc Merge pull request #1421 from Diapolo/netbase_fix_sign_warnings
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
0ed0806bb492 Update comment about secure_allocator<>
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
1b7cd74a495a Merge pull request #1424 from TheBlueMatt/lockcontention
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
afdd59416ed6 Merge pull request #1418 from Diapolo/GUI_fix_default_proxy_addr
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
4d009243cbc2 Fix DEBUG_LOCKCONTENTION
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
45268208aec6 Merge pull request #1422 from Diapolo/add_used_datadir_debug_log
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
618b250e34e9 add used datadir to debug.log
Author
Philip Kaufmann <phil.kaufmann@t-online.de>
Browse Repository
No Builds
No Audits
b69dd08ae76c fix two signed/unsigned comparison warnings in netbase.cpp
Author
Philip Kaufmann <phil.kaufmann@t-online.de>
Browse Repository
No Builds
No Audits
4e16306ae3ca fix default Proxy address in Qt options (no hostname allowed currently)
Author
Philip Kaufmann <phil.kaufmann@t-online.de>
Browse Repository
No Builds
No Audits
46e06b875d86 Merge branch 'netopt' of https://github.com/sipa/bitcoin
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
831f59ce8b17 Fix coin selection to only include change when it's necessary.
Author
dooglus
Browse Repository
No Builds
No Audits
d650f96d5f48 Preserve the shuffled order of coins with equal value to give more randomized…
Author
dooglus
Browse Repository
No Builds
No Audits
4ce190a01578 Test that the coin selection code is suitably random, and add tests re. sub…
Author
dooglus
Browse Repository
No Builds
No Audits
e333ab56d5b9 Move the random_shuffle call back into SelectCoinsMinConf() so we can unit test…
Author
dooglus
Browse Repository
No Builds
No Audits
9b0369c773c1 Refactor SelectCoinsMinConf() and add unit tests.
Author
dooglus
Browse Repository
No Builds
No Audits

Changes (123)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

bitcoin-qt.pro

contrib/

bitcoind.bash-completion

debian/

bin/

bitcoin-qt

bitcoind

bitcoin-qt.install

bitcoind.bash-completion

changelog

control

rules

gitian-downloader/

linux-download-config

win32-download-config

doc/

share/

qt/

extract_strings_qt.py

src/

qt/

addresstablemodel.cpp

forms/

verifymessagedialog.ui

guiutil.cpp

guiutil.h

locale/

bitcoin_bg.ts

	bitcoin_ca_ES.ts
	bitcoin_en.ts

bitcoin_cs.ts

	bitcoin_da.ts
	bitcoin_en.ts

bitcoin_de.ts

bitcoin_el_GR.ts

bitcoin_en.ts

	bitcoin_es.ts
	bitcoin_en.ts

	bitcoin_es_CL.ts
	bitcoin_en.ts

	bitcoin_et.ts
	bitcoin_en.ts

	bitcoin_eu_ES.ts
	bitcoin_en.ts

bitcoin_fa.ts

	bitcoin_fa_IR.ts
	bitcoin_en.ts

	bitcoin_fi.ts
	bitcoin_en.ts

bitcoin_fr.ts

	bitcoin_fr_CA.ts
	bitcoin_en.ts

bitcoin_fr_FR.ts

bitcoin_he.ts

	bitcoin_hr.ts
	bitcoin_en.ts

	bitcoin_hu.ts
	bitcoin_en.ts

bitcoin_it.ts

bitcoin_lt.ts

	bitcoin_nb.ts
	bitcoin_en.ts

bitcoin_nl.ts

	bitcoin_pl.ts
	bitcoin_en.ts

	bitcoin_pt_BR.ts
	bitcoin_en.ts

bitcoin_pt_PT.ts

	bitcoin_ro_RO.ts
	bitcoin_en.ts

bitcoin_ru.ts

	bitcoin_sk.ts
	bitcoin_en.ts

	bitcoin_sr.ts
	bitcoin_en.ts

	bitcoin_sv.ts
	bitcoin_en.ts

	bitcoin_tr.ts
	bitcoin_en.ts

bitcoin_uk.ts

	bitcoin_zh_CN.ts
	bitcoin_en.ts

	bitcoin_zh_TW.ts
	bitcoin_en.ts

transactionrecord.cpp

transactiontablemodel.cpp

verifymessagedialog.cpp

verifymessagedialog.h

test/

data/

script_P2SH_tests.cpp

sigopcount_tests.cpp

test_bitcoin.cpp

transaction_tests.cpp

rABC07368a9e3c60

View Options

bitcoin-qt.pro

Load File

View Options

contrib/bitcoind.bash-completion

Load File

View Options

contrib/debian/bin/bitcoin-qt

Load File

View Options

contrib/debian/bin/bitcoind

Load File

View Options

contrib/debian/bitcoin-qt.install

Load File

View Options

contrib/debian/bitcoind.bash-completion

Load File

View Options

contrib/debian/changelog

Load File

View Options

contrib/debian/control

Load File

View Options

contrib/debian/rules

Load File

View Options

contrib/gitian-downloader/linux-download-config

Load File

View Options

contrib/gitian-downloader/win32-download-config

Load File

View Options

doc/build-msw.txt

Load File

View Options

doc/build-unix.txt

Load File

View Options

doc/release-process.txt

Load File

View Options

doc/unit-tests.txt

Load File

View Options

share/qt/extract_strings_qt.py

Load File

View Options

src/allocators.h

Load File

View Options

src/base58.h

Load File

View Options

src/bitcoinrpc.cpp

Load File

View Options

src/checkpoints.cpp

Load File

View Options

src/init.cpp

Load File

View Options

src/init.h

Load File

View Options

src/irc.cpp

Load File

View Options

src/key.cpp

Load File

View Options

src/key.h

Load File

View Options

src/keystore.cpp

Load File

View Options

src/keystore.h

Load File

View Options

src/main.cpp

Load File

View Options

src/net.cpp

Load File

View Options

src/net.h

Load File

View Options

src/netbase.cpp

Load File

View Options

src/netbase.h

Load File

View Options

src/noui.cpp

Load File

View Options

src/qt/addressbookpage.cpp

Load File

View Options

src/qt/addresstablemodel.cpp

Load File

View Options

src/qt/bitcoin.cpp

Load File

View Options

src/qt/bitcoin.qrc

Load File

View Options

src/qt/bitcoingui.cpp

Load File

View Options

src/qt/bitcoingui.h

Load File

View Options

src/qt/bitcoinstrings.cpp

Load File

View Options

src/qt/clientmodel.cpp

Load File

View Options

src/qt/clientmodel.h

Load File

View Options

src/qt/forms/optionsdialog.ui

Load File

View Options

src/qt/forms/overviewpage.ui

Load File

View Options

src/qt/forms/rpcconsole.ui

Load File

View Options

src/qt/forms/verifymessagedialog.ui

Load File

View Options

src/qt/guiutil.cpp

Load File

View Options

src/qt/guiutil.h

Load File

View Options

src/qt/locale/bitcoin_bg.ts

Load File

View Options

src/qt/locale/bitcoin_ca_ES.ts

Load File

View Options

src/qt/locale/bitcoin_cs.ts

Load File

View Options

src/qt/locale/bitcoin_da.ts

Load File

View Options

src/qt/locale/bitcoin_de.ts

Load File

View Options

src/qt/locale/bitcoin_el_GR.ts

Load File

View Options

src/qt/locale/bitcoin_en.ts

Load File

View Options

src/qt/locale/bitcoin_es.ts

Load File

View Options

src/qt/locale/bitcoin_es_CL.ts

Load File

View Options

src/qt/locale/bitcoin_et.ts

Load File

View Options

src/qt/locale/bitcoin_eu_ES.ts

Load File

View Options

src/qt/locale/bitcoin_fa.ts

Load File

View Options

src/qt/locale/bitcoin_fa_IR.ts

Load File

View Options

src/qt/locale/bitcoin_fi.ts

Load File

View Options

src/qt/locale/bitcoin_fr.ts

Load File

View Options

src/qt/locale/bitcoin_fr_CA.ts

Load File

View Options

src/qt/locale/bitcoin_fr_FR.ts

Load File

View Options

src/qt/locale/bitcoin_he.ts

Load File

View Options

src/qt/locale/bitcoin_hr.ts

Load File

View Options

src/qt/locale/bitcoin_hu.ts

Load File

View Options

src/qt/locale/bitcoin_it.ts

Load File

View Options

src/qt/locale/bitcoin_lt.ts

Load File

View Options

src/qt/locale/bitcoin_nb.ts

Load File

View Options

src/qt/locale/bitcoin_nl.ts

Load File

View Options

src/qt/locale/bitcoin_pl.ts

Load File

View Options

src/qt/locale/bitcoin_pt_BR.ts

Load File

View Options

src/qt/locale/bitcoin_pt_PT.ts

Load File

View Options

src/qt/locale/bitcoin_ro_RO.ts

Load File

View Options

src/qt/locale/bitcoin_ru.ts

Load File

View Options

src/qt/locale/bitcoin_sk.ts

Load File

View Options

src/qt/locale/bitcoin_sr.ts

Load File

View Options

src/qt/locale/bitcoin_sv.ts

Load File

View Options

src/qt/locale/bitcoin_tr.ts

Load File

View Options

src/qt/locale/bitcoin_uk.ts

Load File

View Options

src/qt/locale/bitcoin_zh_CN.ts

Load File

View Options

src/qt/locale/bitcoin_zh_TW.ts

Load File

View Options

src/qt/messagepage.cpp

Load File

View Options

src/qt/optionsdialog.cpp

Load File

View Options

src/qt/optionsdialog.h

Load File

View Options

src/qt/optionsmodel.cpp

Load File

View Options

src/qt/optionsmodel.h

Load File

View Options

src/qt/overviewpage.cpp

Load File

View Options

src/qt/overviewpage.h

Load File

View Options

src/qt/rpcconsole.cpp

Load File

View Options

src/qt/rpcconsole.h

Load File

View Options

src/qt/sendcoinsdialog.cpp

Load File

View Options

src/qt/sendcoinsdialog.h

Load File

View Options

src/qt/transactiondesc.cpp

Load File

View Options

src/qt/transactionrecord.cpp

Load File

View Options

src/qt/transactiontablemodel.cpp

Load File

View Options

src/qt/verifymessagedialog.cpp

Load File

View Options

src/qt/verifymessagedialog.h

Load File

View Options

src/qt/walletmodel.cpp

Load File

View Options

src/qt/walletmodel.h

Load File

View Options

src/rpcdump.cpp

Load File

View Options

src/script.cpp

Load File

View Options

src/script.h

Load File

View Options

src/sync.cpp

Load File

View Options

src/sync.h

Load File

View Options

src/test/DoS_tests.cpp

Load File

View Options

src/test/base58_tests.cpp

Load File

View Options

src/test/data/script_invalid.json

Load File

View Options

src/test/data/script_valid.json

Load File

View Options

src/test/key_tests.cpp

Load File

View Options

src/test/multisig_tests.cpp

Load File

View Options

src/test/script_P2SH_tests.cpp

Load File

View Options

src/test/sigopcount_tests.cpp

Load File

View Options

src/test/test_bitcoin.cpp

Load File

View Options

src/test/transaction_tests.cpp

Load File

View Options

src/test/wallet_tests.cpp

Load File

View Options

src/util.cpp

Load File

View Options

src/wallet.cpp

Load File

View Options

src/wallet.h

Load File

View Options

src/walletdb.cpp

Load File

View Options

src/walletdb.h

Load File

Merge branch 'master' into async-ipv6-rpc07368a9e3c60UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (123)Show All Changes

Very Large Commit

rABC07368a9e3c60

bitcoin-qt.pro

contrib/bitcoind.bash-completion

contrib/debian/bin/bitcoin-qt

contrib/debian/bin/bitcoind

contrib/debian/bitcoin-qt.install

contrib/debian/bitcoind.bash-completion

contrib/debian/changelog

contrib/debian/control

contrib/debian/rules

contrib/gitian-downloader/linux-download-config

contrib/gitian-downloader/win32-download-config

doc/build-msw.txt

doc/build-unix.txt

doc/release-process.txt

doc/unit-tests.txt

share/qt/extract_strings_qt.py

src/allocators.h

src/base58.h

src/bitcoinrpc.cpp

src/checkpoints.cpp

src/init.cpp

src/init.h

src/irc.cpp

src/key.cpp

src/key.h

src/keystore.cpp

src/keystore.h

src/main.cpp

src/net.cpp

src/net.h

src/netbase.cpp

src/netbase.h

src/noui.cpp

src/qt/addressbookpage.cpp

src/qt/addresstablemodel.cpp

src/qt/bitcoin.cpp

src/qt/bitcoin.qrc

src/qt/bitcoingui.cpp

src/qt/bitcoingui.h

src/qt/bitcoinstrings.cpp

src/qt/clientmodel.cpp

src/qt/clientmodel.h

src/qt/forms/optionsdialog.ui

src/qt/forms/overviewpage.ui

src/qt/forms/rpcconsole.ui

src/qt/forms/verifymessagedialog.ui

src/qt/guiutil.cpp

src/qt/guiutil.h

src/qt/locale/bitcoin_bg.ts

src/qt/locale/bitcoin_ca_ES.ts

src/qt/locale/bitcoin_cs.ts

src/qt/locale/bitcoin_da.ts

src/qt/locale/bitcoin_de.ts

src/qt/locale/bitcoin_el_GR.ts

src/qt/locale/bitcoin_en.ts

src/qt/locale/bitcoin_es.ts

src/qt/locale/bitcoin_es_CL.ts

src/qt/locale/bitcoin_et.ts

src/qt/locale/bitcoin_eu_ES.ts

src/qt/locale/bitcoin_fa.ts

src/qt/locale/bitcoin_fa_IR.ts

src/qt/locale/bitcoin_fi.ts

src/qt/locale/bitcoin_fr.ts

src/qt/locale/bitcoin_fr_CA.ts

src/qt/locale/bitcoin_fr_FR.ts

src/qt/locale/bitcoin_he.ts

src/qt/locale/bitcoin_hr.ts

src/qt/locale/bitcoin_hu.ts

src/qt/locale/bitcoin_it.ts

src/qt/locale/bitcoin_lt.ts

src/qt/locale/bitcoin_nb.ts

Merge branch 'master' into async-ipv6-rpc
07368a9e3c60Unpublished
Actions

Changes (123)
Show All Changes