aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge pull request #3085 from super3/masterGavin Andresen2013-10-156-39/+67
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation Cleanup and Contrib Index
| * | | | | | | | | | | | Documentation Cleanup in /Docsuper32013-10-126-39/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added some help text, and bumped version numbers. Added a Readable Index for /Contrib Fixing /Contrib Index URLs Revert Version Numbers.
* | | | | | | | | | | | | Merge pull request #3086 from Michagogo/update-pgpGavin Andresen2013-10-151-25/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update michagogo's gitian pgp key, adding UIDs
| * | | | | | | | | | | | | Update michagogo's gitian pgp key, adding UIDsMicha2013-10-121-25/+57
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #3092 from laanwj/2013_10_remove_readme_qtGavin Andresen2013-10-152-103/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc: remove readme-qt.md
| * | | | | | | | | | | | | doc: build with qt5 is currently not possibleWladimir J. van der Laan2013-10-151-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add as a separate commit so that it can be easily reverted once Qt5 is supported again.
| * | | | | | | | | | | | | doc: remove readme-qt.mdWladimir J. van der Laan2013-10-152-103/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that autotools is used as a build system there is nothing special about building the GUI anymore. Merge the salvageable parts into build-unix.md
* | | | | | | | | | | | | | Merge pull request #3083 from sipa/chainlocatorGavin Andresen2013-10-156-144/+86
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | CBlockLocator improvements & move to core
| * | | | | | | | | | | | | Move CBlockLocator to core.hPieter Wuille2013-10-152-38/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As CBlockLocator is a P2P data structure, and independent from the validation logic, it can be moved to core.
| * | | | | | | | | | | | | Reimplement CBlockLocator's chain-related logic in CChain.Pieter Wuille2013-10-155-108/+54
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes a few unused CBlockLocator methods, and moves the construction and fork-finding logic to CChain (which can do these more efficiently, as it has a height-indexable chain available). It also makes CBlockLocator independent from the validation code.
* | | | | | | | | | | | | Merge pull request #3080 from Diapolo/sendcoins-paymentreqWladimir J. van der Laan2013-10-153-16/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bitcoin-Qt: misc changes for sendcoins and paymentsever
| * | | | | | | | | | | | | paymentserver: use own HTML-esc / add new header constPhilip Kaufmann2013-10-111-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - make processPaymentRequest() use our own HTML-escaping function from GUIUtil - make string "application/bitcoin-payment" a constant (below similar constant strings in the .cpp file)
| * | | | | | | | | | | | | sendcoinsdialog: display real failed address stringPhilip Kaufmann2013-10-111-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - display the real string (faulty address), which causes the valid address check to fail, instead of a stringified "nonsense" CBitcoinAddress
| * | | | | | | | | | | | | sendcoinsentry: small clear() and setValue() changesPhilip Kaufmann2013-10-111-8/+17
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - clear(): clear all UI elements (for secure and insecure payments) - setValue(): only modify UI elements, which need to be set (for secure or insecure payments)
* | | | | | | | | | | | | Merge pull request #3093 from Diapolo/printf_formatWladimir J. van der Laan2013-10-151-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | replace %zu with %"PRIszu" macro to prevent compiler warnings
| * | | | | | | | | | | | replace %zu with %"PRIszu" macro to prevent compiler warningsPhilip Kaufmann2013-10-151-9/+9
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #2924 from sje397/TrafficGraphWladimir J. van der Laan2013-10-1513-9/+618
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | [QT] Add network traffic graph to debug window
| * | | | | | | | | | | | Add network traffic graphScott Ellis2013-10-1413-9/+618
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3091 from Diapolo/miscWladimir J. van der Laan2013-10-153-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | misc spelling / space / style fixes
| * | | | | | | | | | | | misc spelling / space / style fixesPhilip Kaufmann2013-10-153-4/+4
|/ / / / / / / / / / / /
* | | | | | | | | | | | Avoid core dump if rpc port is in use.Gavin Andresen2013-10-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cleanup code needs to check for NULL rpcworkers thread group.
* | | | | | | | | | | | Merge pull request #3077 from sipa/chainGavin Andresen2013-10-1419-213/+217
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor/encapsulate chain globals into a CChain class
| * | | | | | | | | | | | Refactor/encapsulate chain globals into a CChain classPieter Wuille2013-10-1119-213/+217
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #2933 from sipa/leveldb113Gavin Andresen2013-10-1413-67/+363
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Merge upstream LevelDB 1.13
| * \ \ \ \ \ \ \ \ \ \ \ Merge src/leveldb changes for LevelDB 1.13Pieter Wuille2013-08-2413-67/+363
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Squashed 'src/leveldb/' changes from be1b0ff..936b461Pieter Wuille2013-08-2413-67/+363
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 936b461 Merge upstream LevelDB 1.13. 748539c LevelDB 1.13 git-subtree-dir: src/leveldb git-subtree-split: 936b4613ea4551992e6096b1e05eeefc09a20e3b
* | | | | | | | | | | | | | Merge pull request #3089 from gmaxwell/hsportGavin Andresen2013-10-141-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | [doc] Add testnet hidden service port to the example tor config.
| * | | | | | | | | | | | | [doc] Add testnet hidden service port to the example tor config.Gregory Maxwell2013-10-141-0/+1
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems like there are a lot of advertised testnet HS nodes that don't actually work. Lack of the testnet port on the example HS config might be one reason.
* | | | | | | | | | | | | Merge pull request #2937Pieter Wuille2013-10-136-4/+131
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | 971bb3e Added ping time measurement. New RPC "ping" command to request ping. Implemented "pong" message handler. New "pingtime" field in getpeerinfo, to provide results to user. New "pingwait" field, to show pings still in flight, to better see newly lagging peers. (Josh Lehan)
| * | | | | | | | | | | | Added ping time measurement.Josh Lehan2013-10-046-4/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New RPC "ping" command to request ping. Implemented "pong" message handler. New "pingtime" field in getpeerinfo, to provide results to user. New "pingwait" field, to show pings still in flight, to better see newly lagging peers.
* | | | | | | | | | | | | Merge pull request #3081 from Diapolo/silence_compilerWladimir J. van der Laan2013-10-111-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | prevent compiler redefinition warnings
| * | | | | | | | | | | | prevent compiler redefinition warningsPhilip Kaufmann2013-10-111-0/+6
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - I observed a massive amount of redefinition warnings after #3071, which are silenced by this patch - uses the same style as we do in other places, where we define _WIN32_WINNT
* | | | | | | | | | | | Merge pull request #3071 from gavinandresen/windows_hWladimir J. van der Laan2013-10-113-54/+68
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Remove include of windows.h from allocators.h
| * | | | | | | | | | | | Remove include of windows.h from allocators.hGavin Andresen2013-10-093-54/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create an allocators.cpp, and move all of the #ifdef WIN32 code and the #include of windows.h into it. Two motives for this cleanup: 1. I'm getting a weird error in windows.h in my smartfee branch. 2. allocators.h is included (indirectly) just about everywhere, so this should speed up Windows compiles quite a lot.
* | | | | | | | | | | | | Merge pull request #3078 from gavinandresen/pulltesterGavin Andresen2013-10-102-20/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | Rework pull-tester scripts, disable blockchain tester
| * | | | | | | | | | | | Disable code-coverage builds for nowGavin Andresen2013-10-111-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not working on the pull-tester machine, 'make cov' hangs there.
| * | | | | | | | | | | | Rework pull-tester scripts, disable blockchain testerGavin Andresen2013-10-112-13/+45
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-organize the pull-tester scripts a bit. And disables running the blockchain tester, it is not working properly on the pull-tester machine for reasons I cannot explain (fails to start).
* | | | | | | | | | | | Merge pull request #3066 from Diapolo/rem_globalWladimir J. van der Laan2013-10-093-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | make fCommandLine a local variable in AppInit()
| * | | | | | | | | | | make fCommandLine a local variable in AppInit()Philip Kaufmann2013-10-083-2/+1
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #3068 from Diapolo/qt-iconWladimir J. van der Laan2013-10-081-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Bitcoin-Qt: ensure Qt icon is shown with Qt >= 5.0
| * | | | | | | | | | Bitcoin-Qt: ensure Qt icon is shown with Qt >= 5.0Philip Kaufmann2013-10-081-0/+4
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'pulltestwin32'Gavin Andresen2013-10-081-11/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Re-enable win32 pull-testingGavin Andresen2013-10-081-11/+12
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #3059 from Diapolo/ShutdownGavin Andresen2013-10-071-4/+13
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | add missing Boost Thread join_all() call during shutdown
| * | | | | | | | | | | add missing Boost Thread join_all() call during shutdownPhilip Kaufmann2013-10-071-4/+13
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixes #3037 by adding missing join_all() call and brings bitcoind shutdown code in line with Bitcoin-Qt shutdown code - added a comment for the if (!fRet) case
* | | | | | | | | | | Merge pull request #3064 from Diapolo/styleWladimir J. van der Laan2013-10-071-4/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | style-police: fixed badly readable code in ProcessMessage()
| * | | | | | | | | | style-police: fixed badly readable code in ProcessMessage()Philip Kaufmann2013-10-071-4/+6
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - I introduced the problem and fixed it with better readable code
* | | | | | | | | | Merge pull request #3056 from Diapolo/stuck_debug_windowWladimir J. van der Laan2013-10-061-0/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Bitcoin-Qt: prevent stuck/unusable debug window on exit
| * | | | | | | | | | Bitcoin-Qt: prevent stuck/unusable debug window on exitPhilip Kaufmann2013-10-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - when closing the client with an open debug window, that window could become stuck/unsuable (it was still shown wherea the main window was hidden already) - fix this by hiding the debug window, when quitting the the client
* | | | | | | | | | | Merge pull request #3053 from dajohi/masterGavin Andresen2013-10-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Hurricane Electric uses block 2001:470::, not 2011:470::