aboutsummaryrefslogtreecommitdiff
path: root/src/bitcoinrpc.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '0.6.x' into 0.7.xLuke Dashjr2012-10-201-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch '0.6.0.x' into 0.6.xLuke Dashjr2012-10-151-1/+1
| |\
| | * Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-10-151-1/+1
| | |\
| | | * fix wrong (signed/unsigned) printf format specifier in bitcoinrpc.cppPhilip Kaufmann2012-10-151-1/+1
| | | | | | | | | | | | | | | | - also includes the required bitcoinstrings.cpp update
| * | | Merge branch '0.6.0.x' into 0.6.xLuke Dashjr2012-10-091-1/+1
| |\| |
| | * | Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-10-091-1/+1
| | |\| | | | | | | | | | | | | | | | | Conflicts: src/qt/transactiondesc.cpp
| | | * Merge branch '0.4.x' into 0.5.xLuke Dashjr2012-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/bitcoinrpc.cpp src/init.cpp
| * | | Merge branch '0.6.0.x' into 0.6.xLuke Dashjr2012-08-261-0/+8
| |\| | | | | | | | | | | | | | | | | | Conflicts: src/init.cpp
| | * | Merge commit '52153a6' into 0.6.0.xLuke Dashjr2012-08-261-0/+8
| | |\| | | | | | | | | | | | | | | | | Conflicts: src/bitcoinrpc.cpp
| | | * Minimal adaptations to getmemorypool for BIP 34Luke Dashjr2012-08-261-0/+8
| | | | | | | | | | | | | | | | | | | | - As long as version 1 blocks are valid, provide them to getmemorypool clients (only) - Include BIP 22 "height" key in getmemorypool output
| * | | Merge branch '0.6.0.x' into 0.6.xLuke Dashjr2012-08-121-6/+24
| |\| |
| | * | Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-08-121-4/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/key.h src/keystore.h src/net.h src/protocol.cpp src/qt/guiutil.h src/test/DoS_tests.cpp
| | | * Bugfix: Fix a variety of misspellingsLuke Dashjr2012-08-121-1/+1
| | | |
| | | * Merge branch '0.4.x' into 0.5.xLuke Dashjr2012-08-121-3/+3
| | | | | | | | | | | | | | | | | | | | Conflicts: src/net.cpp
| | * | Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-08-121-2/+20
| | |\|
| | | * Merge branch 'bugfix_CNBerr' into 0.5.xLuke Dashjr2012-08-121-1/+11
| | | |\
| | | * | Merge branch '0.4.x' into 0.5.xLuke Dashjr2012-08-121-1/+9
| | | | |
| | | * | Use std::numeric_limits<> for typesafe INT_MAX/etcGavin Andresen2012-06-141-4/+4
| | | | | | | | | | | | | | | | | | | | (this fixes a Mac OS X gitian build error for 0.5.x)
| * | | | Merge branch '0.6.0.x' into 0.6.xLuke Dashjr2012-06-141-4/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore src/bitcoinrpc.cpp src/main.cpp src/qt/bitcoingui.cpp src/ui_interface.h src/util.cpp
| | * | | Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-06-141-8/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/main.h src/net.cpp src/serialize.h
| | | * | Bugfix: Fix various places where Bitcoin-Qt was being shutdown improperlyPhilip Kaufmann2012-06-141-8/+5
| | | | | | | | | | | | | | | | | | | | (Partial/merge of upstream 9247134eaba9a1d0fa74f22de238af1476663005, 1a3f0da9229a8e524d1010cdc8bd3b9da71fe529, and 3e343522226e6c249f5cb05436eec347b87c6361)
| | | * | Merge branch '0.4.x' into 0.5.xLuke Dashjr2012-05-221-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ui.cpp src/ui.h src/uibase.cpp src/xpm/about.xpm
| | | * | Update License in File HeadersFordy2012-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Merge branch '0.6.0.x' into 0.6.xLuke Dashjr2012-05-221-2/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | Update License in File HeadersFordy2012-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | Always check return values of TxnBegin() and TxnCommit()Jeff Garzik2012-05-181-2/+4
| | | | |
| | * | | Fixed non-sensical error messagePeter Todd2012-05-061-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)"
| | * | | Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-04-271-1/+1
| | |\| |
| | | * | fix compiler error in bitcoinrpc RE: boost::systemGavin Andresen2012-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | (Partial of 2232717cba9e9f06a01e8f37bcea4e79ee65205f)
| | * | | Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-04-271-3/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bitcoin-qt.pro doc/README doc/README_windows.txt share/setup.nsi src/serialize.h
| | | * | listsinceblock: rpc param blockid -> blockhashfreewil2012-04-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | This is more consistent with the rest of the labeling seen by the user when accessing the rpc commands.
| | | * | remove strange debug message from listsinceblockfreewil2012-04-271-1/+0
| | | | |
| | * | | Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-04-221-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/main.h src/net.cpp src/util.cpp
| | | * | Merge branch '0.4.x' into 0.5.xLuke Dashjr2012-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/main.cpp
| | * | | Fix loop index var types, fixing many minor sign comparison warningsJeff Garzik2012-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | foo.size() typically returns an unsigned integral type; make loop variables match those types' signedness.
| | * | | Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-04-151-15/+45
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | Merge branch '0.5.0.x' into 0.5.xLuke Dashjr2012-04-151-15/+49
| | | |\ \
| | | | * | Merge branch '0.4.x' into 0.5.0.xLuke Dashjr2012-04-151-15/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/keystore.h
| | | | * | Show error message instead of exception crash when unable to bind RPC portWladimir J. van der Laan2012-04-111-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | Fixes issue #875
| | * | | | fix warnings: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses]Wladimir J. van der Laan2012-04-151-0/+4
| | | | | |
| | * | | | Merge branch '0.5.x' into 0.6.0.xLuke Dashjr2012-04-041-2/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/bitcoinrpc.cpp
| | | * | | Merge branch '0.5.0.x' into 0.5.xLuke Dashjr2012-04-041-2/+3
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qt/bitcoingui.h
| | | | * | Use a messagebox to display the error when -server is provided without ↵Wladimir J. van der Laan2012-04-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | providing a rpc password (plus part of 7cfbe1fee465e82ddbdc8ed17dfcce791bd765f5)
| | | * | | Merge branch '0.5.0.x' into 0.5.xLuke Dashjr2012-03-161-2/+2
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bitcoin-qt.pro doc/README doc/README_windows.txt share/setup.nsi src/serialize.h
| | | | * | Fix issue #848 : broken mining on testnetGavin Andresen2012-03-161-2/+2
| | | | | |
| | | * | | Merge branch '0.5.0.x' into 0.5.xv0.5.3rc4v0.5.3Luke Dashjr2012-03-111-3/+3
| | | |\| |
| | | | * | Merge branch '0.4.x' into 0.5.0.xLuke Dashjr2012-03-111-3/+3
| | | | | |
| | | * | | Merge branch '0.5.0.x' into 0.5.xLuke Dashjr2012-03-031-8/+16
| | | |\| |
| | | | * | Merge branch '0.4.x' into 0.5.0.xLuke Dashjr2012-03-031-8/+16
| | | | | |
| | | * | | Merge branch '0.5.0.x' into 0.5.xLuke Dashjr2012-02-171-16/+14
| | | |\| |