Diffusion Bitcoin ABC staging 19366be186a9

Merge remote-tracking branch 'satoshi/qtui'
19366be186a9Unpublished
Actions

Tags

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'satoshi/qtui'

Conflicts (resolved by copying files from remote branch):
.gitignore
src/cryptopp/cpu.cpp
src/cryptopp/cpu.h
src/cryptopp/cryptlib.h
src/cryptopp/iterhash.h
src/cryptopp/misc.h
src/cryptopp/secblock.h
src/cryptopp/sha.cpp
src/cryptopp/sha.h
src/cryptopp/smartptr.h
src/json/json_spirit_reader.cpp
src/json/json_spirit_value.cpp
src/json/json_spirit_writer.cpp

Details

Provenance

Wladimir J. van der Laan <laanwj@gmail.com>	Authored on Jul 15 2011, 13:12
schancel	Pushed on Jan 5 2018, 21:58
schancel	Pushed on Jan 5 2018, 21:39
schancel	Pushed on Jan 5 2018, 21:17

Parents

rSTAGINGa35ee9633690: Add call to request unconfirmed balance
rSTAGING249c6818f171: fix quoting

Branches

Unknown

Tags

Unknown

Event Timeline

Wladimir J. van der Laan <laanwj@gmail.com> committed rSTAGING19366be186a9: Merge remote-tracking branch 'satoshi/qtui' (authored by Wladimir J. van der Laan <laanwj@gmail.com>).Jul 15 2011, 13:12

Merged Changes

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

a35ee9633690 Add call to request unconfirmed balance
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
fa989f42c1e2 remove magic number: change threshold for nLockTime to constant
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
42c405ad2340 temp patch for qtui
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
33c75fd9aaaf CKeyStore::AddKey must return a boolean
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
e94010b23956 Merge pull request #383 from sipa/syncdefault
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
bb0d9ce2264c Merge pull request #384 from TheBlueMatt/upnp
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
09923991e58e Enable UPnP by default on bitcoin, but not on bitcoind (on gitian)
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
3f0950ea019a Revert "Make UPnP default on Bitcoin but not on Bitcoind."
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
e9f61c8787af Fix synchronization of default key
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
9390431ce498 Merge pull request #379 from gavinandresen/nocommas
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
06c903b26c5e Merge pull request #380 from TheBlueMatt/buildupdates
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
fa105b1d3a05 Added a couple minor things to match newer build process.
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
59f9c8e8c9a1 Do not use comma as thousands separator Using the comma as thousands separator…
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
d547a4433217 Block-chain lock-in at 134444
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
fc27eb188fce Bump OSX version to 0.3.24 (missed in previous commit)
Author
Jeff Garzik <jeff@garzik.org>
Browse Repository
No Builds
No Audits
b4b536d78232 Bump version to 0.3.24.
Author
Jeff Garzik <jeff@garzik.org>
Browse Repository
No Builds
No Audits
a76899624ab4 Merge branch 'tmp2' into tmp3
Author
Jeff Garzik <jeff@garzik.org>
Browse Repository
No Builds
No Audits
1a19fc17b27e Merge pull request #374 from TheBlueMatt/neterror
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
013df1cc3b1f Give more detailed error messages for connection failure.
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
9cd1dfe8987e Merge pull request #372 from TheBlueMatt/upnp
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
cfbcb1de66b7 Merge pull request #373 from EricJ2190/master
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
58d9badfe217 Add keystore.h to makefile.vs's header list.
Author
Eric Hosmer <EricJ2190@gmail.com>
Browse Repository
No Builds
No Audits
12a4af47c28e Further updated Visual C++ makefile.
Author
Eric Hosmer <EricJ2190@gmail.com>
Browse Repository
No Builds
No Audits
ee1f88422973 Make UPnP default on Bitcoin but not on Bitcoind.
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
c4286dc6eeea Merge pull request #343 from muggenhor/proper-http-server-rejection
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
b73ab2d88501 Merge pull request #368 from TheBlueMatt/dnsseed
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
056d2ad3121b Merge pull request #371 from EricJ2190/master
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
362efb24c14b Enable DNS seeding by default.
Author
Jeff Garzik <jeff@garzik.org>
Browse Repository
No Builds
No Audits
7fbeca05c9fc Merge pull request #369 from sipa/limitblocksend
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
f8b5028cd109 Updated Visual C++ makefile.
Author
Eric Hosmer <EricJ2190@gmail.com>
Browse Repository
No Builds
No Audits
ce8f78a7bba7 Only use dnsseeds and static seeds when not on testnet.
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
497317453422 Limit response to getblocks to half of output buffer size
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
44d16327c19f Merge pull request #367 from TheBlueMatt/dnsseed
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
f03c31db8210 Add new DNSSeed dnsseed.bluematt.me.
Author
Matt Corallo <matt@bluematt.me>
Browse Repository
No Builds
No Audits
20f3f4ac1697 Merge pull request #357 from jrmithdobbs/osx-appbundle
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
786bfc3bb761 Merge pull request #361 from spiechu/polish-translation
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
3a3eabb57ae4 Merge pull request #362 from ius/issue340
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
ecd3e728b782 Fix connection failure debug output
Author
Joerie de Gram <j.de.gram@gmail.com>
Browse Repository
No Builds
No Audits
3e76df748178 added polish translation
Author
Dawid Spiechowicz <spiechu@gmail.com>
Browse Repository
No Builds
No Audits
4d410cfce967 Fix AddressBook syncrhonization between a CWallet and CWalletDB
Author
Stéphane Gimenez <dev@gim.name>
Browse Repository
No Builds
No Audits
8111e27905de Merge pull request #356 from gavinandresen/unitTest
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
d8dda9de84ee Add OSX App bundle and correct build instructions to reflect reality.
Author
Doug Huff <mith@jrbobdobbs.org>
Browse Repository
No Builds
No Audits
8baf865c9465 Boost unit-testing framework. make -f makefile.{unix,osx,mingw} test_bitcoin to…
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
e913574e027d rpc: don't send 403 when using SSL to prevent DoS
Author
Giel van Schijndel <me@mortis.eu>
Browse Repository
No Builds
No Audits
c9e70d4c0a05 rpc server: send '403 Forbidden' to rejected clients
Author
Giel van Schijndel <me@mortis.eu>
Browse Repository
No Builds
No Audits
d0d80170a2ca Merge pull request #347 from sipa/delkeyuser
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
d3800d59d557 Fix segfault when creating new wallet
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
c774b1697690 Merge branch 'totalblocksestimate1' of https://github.com/laanwj/bitcoin
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
77ba3ab99c08 Merge pull request #342 from jburkle/datadir_check
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
ed2c01405f5a Edited init.cpp to include a check that -datadir exists
Author
James Burkle <james.burkle@gmail.com>
Browse Repository
No Builds
No Audits

Changes (144)

Path

Size

BitcoinAppIcon.icns

gitian-win32.yml

toplevel.cpp.diff

toplevel.h.diff

doc/

README_windows.txt

release-process.txt

addressbook16.bmp

addressbook16mask.bmp

addressbook20.bmp

addressbook20mask.bmp

send16masknoshadow.bmp

src/

cryptopp/

json/

json_spirit_reader.cpp

json_spirit_value.cpp

json_spirit_writer.cpp

makefile.linux-mingw

test_bitcoin.cpp

uint160_tests.cpp

uint256_tests.cpp

addressbook16.xpm

addressbook20.xpm

send16noshadow.xpm

rSTAGING19366be186a9

.gitignore

Loading...

README

Loading...

README.md

Loading...

contrib/Bitcoin.app/Contents/Info.plist

Loading...

contrib/Bitcoin.app/Contents/MacOS/.higit

Loading...

contrib/Bitcoin.app/Contents/Resources/BitcoinAppIcon.icns

Loading...

contrib/gitian-win32.yml

Loading...

contrib/gitian.yml

Loading...

contrib/wx-patches/README

Loading...

contrib/wx-patches/toplevel.cpp.diff

Loading...

contrib/wx-patches/toplevel.h.diff

Loading...

doc/README

Loading...

doc/README_windows.txt

Loading...

doc/build-msw.txt

Loading...

doc/build-osx.txt

Loading...

doc/build-unix.txt

Loading...

doc/coding.txt

Loading...

doc/release-process.txt

Loading...

locale/cs/LC_MESSAGES/bitcoin.mo

Loading...

locale/cs/LC_MESSAGES/bitcoin.po

Loading...

locale/de/LC_MESSAGES/bitcoin.mo

Loading...

locale/de/LC_MESSAGES/bitcoin.po

Loading...

locale/eo/LC_MESSAGES/bitcoin.mo

Loading...

locale/eo/LC_MESSAGES/bitcoin.po

Loading...

locale/es/LC_MESSAGES/bitcoin.mo

Loading...

locale/es/LC_MESSAGES/bitcoin.po

Loading...

locale/fr/LC_MESSAGES/bitcoin.mo

Loading...

locale/fr/LC_MESSAGES/bitcoin.po

Loading...

locale/it/LC_MESSAGES/bitcoin.mo

Loading...

locale/it/LC_MESSAGES/bitcoin.po

Loading...

locale/lt/LC_MESSAGES/bitcoin.mo

Loading...

locale/lt/LC_MESSAGES/bitcoin.po

Loading...

locale/nl/LC_MESSAGES/bitcoin.mo

Loading...

locale/nl/LC_MESSAGES/bitcoin.po

Loading...

locale/pl/LC_MESSAGES/bitcoin.po

Loading...

locale/pt/LC_MESSAGES/bitcoin.mo

Loading...

locale/pt/LC_MESSAGES/bitcoin.po

Loading...

locale/readme.txt

Loading...

locale/ru/LC_MESSAGES/bitcoin.mo

Loading...

locale/ru/LC_MESSAGES/bitcoin.po

Loading...

locale/sv/LC_MESSAGES/bitcoin.po

Loading...

locale/zh_cn/LC_MESSAGES/bitcoin.mo

Loading...

locale/zh_cn/LC_MESSAGES/bitcoin.po

Loading...

share/pixmaps/addressbook16.bmp

Loading...

share/pixmaps/addressbook16mask.bmp

Loading...

share/pixmaps/addressbook20.bmp

Loading...

share/pixmaps/addressbook20mask.bmp

Loading...

share/pixmaps/bitcoin-bc.ico

Loading...

share/pixmaps/bitcoin.ico

Loading...

share/pixmaps/check.ico

Loading...

share/pixmaps/favicon.ico

Loading...

share/pixmaps/send16.bmp

Loading...

share/pixmaps/send16mask.bmp

Loading...

share/pixmaps/send16masknoshadow.bmp

Loading...

share/pixmaps/send20.bmp

Loading...

share/pixmaps/send20mask.bmp

Loading...

share/setup.nsi

Loading...

share/ui.rc

Loading...

share/uiproject.fbp

Loading...

src/cryptopp/License.txt

Loading...

src/cryptopp/Readme.txt

Loading...

src/cryptopp/cpu.cpp

Loading...

src/cryptopp/cpu.h

Loading...

src/cryptopp/cryptlib.h

Loading...

src/cryptopp/iterhash.h

Loading...

src/cryptopp/misc.h

Loading...

src/cryptopp/obj/.gitignore

Loading...

src/cryptopp/secblock.h

Loading...

src/cryptopp/sha.cpp

Loading...

src/cryptopp/sha.h

Loading...

src/cryptopp/smartptr.h

Loading...

src/json/LICENSE.txt

Loading...

src/json/json_spirit_reader.cpp

Loading...

src/json/json_spirit_value.cpp

Loading...

src/json/json_spirit_writer.cpp

Loading...

src/makefile.linux-mingw

Loading...

src/makefile.mingw

Loading...

src/makefile.osx

Loading...

src/makefile.unix

Loading...

src/makefile.vc

Loading...

src/obj/.gitignore

Loading...

src/obj/nogui/.gitignore

Loading...

src/obj/test/.gitignore

Loading...

src/test/README

Loading...

src/test/test_bitcoin.cpp

Loading...

src/test/uint160_tests.cpp

Loading...

src/test/uint256_tests.cpp

Loading...

src/ui.cpp

Loading...

src/ui.h

Loading...

src/uibase.cpp

Loading...

src/uibase.h

Loading...

src/xpm/about.xpm

Loading...

src/xpm/addressbook16.xpm

Loading...

src/xpm/addressbook20.xpm

Loading...

src/xpm/bitcoin16.xpm

Loading...

src/xpm/bitcoin20.xpm

Loading...

src/xpm/bitcoin32.xpm

Loading...

src/xpm/bitcoin48.xpm

Loading...

src/xpm/bitcoin80.xpm

Loading...

src/xpm/check.xpm

Loading...

src/xpm/send16.xpm

Loading...

src/xpm/send16noshadow.xpm

Loading...

src/xpm/send20.xpm

Loading...