| Commit message (Collapse) | Author | Age | Files | Lines |
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/bitcoinrpc.cpp
src/qt/bitcoinstrings.cpp
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_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_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
src/qt/locale/bitcoin_nl.ts
src/qt/locale/bitcoin_pl.ts
src/qt/locale/bitcoin_pt_BR.ts
src/qt/locale/bitcoin_ro_RO.ts
src/qt/locale/bitcoin_ru.ts
src/qt/locale/bitcoin_sk.ts
src/qt/locale/bitcoin_sr.ts
src/qt/locale/bitcoin_sv.ts
src/qt/locale/bitcoin_tr.ts
src/qt/locale/bitcoin_uk.ts
src/qt/locale/bitcoin_zh_CN.ts
src/qt/locale/bitcoin_zh_TW.ts
|
| | |\ |
|
| | | |\ |
|
| | | | |
| | | |
| | | |
| | | | |
- also includes the required bitcoinstrings.cpp update
|
| | |\| | |
|
| | | |\|
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/qt/transactiondesc.cpp
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/bitcoinrpc.cpp
src/init.cpp
|
| | |\| |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/init.cpp
|
| | | |\|
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/bitcoinrpc.cpp
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
- As long as version 1 blocks are valid, provide them to getmemorypool clients (only)
- Include BIP 22 "height" key in getmemorypool output
|
| | |\| | |
|
| | | |\|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/key.h
src/keystore.h
src/net.h
src/protocol.cpp
src/qt/guiutil.h
src/test/DoS_tests.cpp
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/net.cpp
|
| | | |\| |
|
| | | | |\ |
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
(this fixes a Mac OS X gitian build error for 0.5.x)
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
.gitignore
src/bitcoinrpc.cpp
src/main.cpp
src/qt/bitcoingui.cpp
src/ui_interface.h
src/util.cpp
|
| | | |\| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/main.h
src/net.cpp
src/serialize.h
|
| | | | | |
| | | | |
| | | | |
| | | | | |
(Partial/merge of upstream 9247134eaba9a1d0fa74f22de238af1476663005, 1a3f0da9229a8e524d1010cdc8bd3b9da71fe529, and 3e343522226e6c249f5cb05436eec347b87c6361)
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/ui.cpp
src/ui.h
src/uibase.cpp
src/xpm/about.xpm
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
I originally created a pull to replace the "COPYING" in crypter.cpp and
crypter.h, but it turned out that COPYING was actually the correct
file.
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
bitcoin-qt.pro
doc/README
doc/README_windows.txt
share/setup.nsi
src/bitcoinrpc.h
src/db.h
src/headers.h
src/init.cpp
src/main.cpp
src/main.h
src/noui.h
src/qt/bitcoin.cpp
src/qt/locale/bitcoin_en.ts
src/qt/walletmodel.cpp
src/script.cpp
src/ui_interface.h
src/util.cpp
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
I originally created a pull to replace the "COPYING" in crypter.cpp and
crypter.h, but it turned out that COPYING was actually the correct
file.
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Previously trying to create a multisig address that required less than
one signature would output something like the following:
"wrong number of keys(got 1, need at least 0)"
|
| | | |\| | |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
(Partial of 2232717cba9e9f06a01e8f37bcea4e79ee65205f)
|
| | | |\| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
bitcoin-qt.pro
doc/README
doc/README_windows.txt
share/setup.nsi
src/serialize.h
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This is more consistent with the rest of the labeling seen
by the user when accessing the rpc commands.
|
| | | | | | |
|
| | | |\| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/main.h
src/net.cpp
src/util.cpp
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/main.cpp
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
foo.size() typically returns an unsigned integral type; make loop variables
match those types' signedness.
|
| | | |\| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/qt/bitcoin.cpp
src/qt/bitcoingui.cpp
src/qt/guiutil.cpp
src/qt/guiutil.h
src/qt/sendcoinsdialog.cpp
src/qt/sendcoinsdialog.h
src/util.cpp
|
| | | | |\ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/keystore.h
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Fixes issue #875
|
| | | | | | | |
|
| | | |\| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/bitcoinrpc.cpp
|
| | | | |\| |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/qt/bitcoingui.h
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
providing a rpc password
(plus part of 7cfbe1fee465e82ddbdc8ed17dfcce791bd765f5)
|
| | | | |\| |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
bitcoin-qt.pro
doc/README
doc/README_windows.txt
share/setup.nsi
src/serialize.h
|
| | | | | | | |
|
| | | | |\| | |
|
| | | | | | | |
|
| | | | |\| | |
|
| | | | | | | |
|
| | | | |\| | |
|