aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5050Wladimir J. van der Laan2014-10-081-32/+39
|\ | | | | | | 772ab0e contrib: use batched JSON-RPC in linarize-hashes (Wladimir J. van der Laan)
| * contrib: use batched JSON-RPC in linarize-hashesWladimir J. van der Laan2014-10-061-32/+39
| | | | | | | | Batch up to 10000 requests for a ~30x speedup.
* | Merge pull request #4976Wladimir J. van der Laan2014-10-071-0/+2
|\ \ | | | | | | | | | 27c3e91 qt: add proxy to options overridden if necessary. (Cory Fields)
| * | qt: add proxy to options overridden if necessary.Cory Fields2014-09-251-0/+2
| | | | | | | | | | | | | | | If proxy is disabled in the gui but enabled via the command line, it needs to be added to the override list.
* | | Merge pull request #5041Wladimir J. van der Laan2014-10-071-0/+3
|\ \ \ | | | | | | | | | | | | 1f9be98 Disable App Nap on OSX 10.9+ (Michael Ford)
| * | | Disable App Nap on OSX 10.9+Michael Ford2014-10-041-0/+3
| | | |
* | | | Merge pull request #5047Wladimir J. van der Laan2014-10-072-3/+5
|\ \ \ \ | | | | | | | | | | | | | | | 3e61eb9 minor txindex documentation improvement (Cozz Lovan)
| * | | | minor txindex documentation improvementCozz Lovan2014-10-062-3/+5
| | | | |
* | | | | contrib: revert changes to github-merge.sh in #5038Wladimir J. van der Laan2014-10-071-13/+13
| | | | |
* | | | | Merge pull request #5053Wladimir J. van der Laan2014-10-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 27368e7 Homebrew lang fix (Dominyk Tiller)
| * | | | | Homebrew lang fixDominyk Tiller2014-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Very small tweak to correct the language on Homebrew's sandboxing process. Discussed in [this commit](https://github.com/bitcoin/bitcoin/commit/9fedafba4b903d7f3af044eb86dc313856e40b08).
* | | | | | Merge pull request #5038Wladimir J. van der Laan2014-10-0714-61/+65
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b17964 Bugfix: Replace bashisms with standard sh in tests/tools (Luke Dashjr) ab72068 Bugfix: Replace bashisms with standard sh in gitian descriptors (Luke Dashjr) b77b4ed Bugfix: Replace bashisms with standard sh to fix build on non-BASH systems (Luke Dashjr) d6b0539 travis: add non-default shell testing to travis. (Cory Fields)
| * | | | | | Bugfix: Replace bashisms with standard sh in tests/toolsLuke Dashjr2014-10-033-15/+15
| | | | | | |
| * | | | | | Bugfix: Replace bashisms with standard sh in gitian descriptorsLuke Dashjr2014-10-037-11/+11
| | | | | | |
| * | | | | | Bugfix: Replace bashisms with standard sh to fix build on non-BASH systemsLuke Dashjr2014-10-033-33/+36
| | | | | | |
| * | | | | | travis: add non-default shell testing to travis.Cory Fields2014-10-031-2/+3
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #4954Wladimir J. van der Laan2014-10-071-2/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 9d7cd4c Don't return an address for invalid pubkeys (Andy Alness)
| * | | | | | Don't return an address for invalid pubkeysAndy Alness2014-10-061-2/+13
| | | | | | |
* | | | | | | Merge pull request #5049Pieter Wuille2014-10-064-11/+11
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | 4dc5eb0 fix a lock indentation in main.cpp (Philip Kaufmann) 5eed8c2 minor license, header end comment etc. cleanup in /script (Philip Kaufmann)
| * | | | | | fix a lock indentation in main.cppPhilip Kaufmann2014-10-061-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - also ensure alphabetical ordering in file header
| * | | | | | minor license, header end comment etc. cleanup in /scriptPhilip Kaufmann2014-10-063-6/+6
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - ensure all licenses are just MIT - add a missing header end comment - ensure alphabetical ordering
* | | | | | Merge pull request #5036Wladimir J. van der Laan2014-10-064-220/+182
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb6b3b2 Update English translation (Wladimir J. van der Laan) b9b2e3f Don't translate state.Abort() messages (Wladimir J. van der Laan)
| * | | | | | Update English translationWladimir J. van der Laan2014-10-022-201/+161
| | | | | | |
| * | | | | | Don't translate state.Abort() messagesWladimir J. van der Laan2014-10-022-19/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is only one message passed to AbortNode() that makes sense to translate to the user specifically: Disk space is low. For the others show a generic message and refer to debug.log for details. Reduces the number of confusing jargon translation messages.
* | | | | | | Merge pull request #4890Wladimir J. van der Laan2014-10-0615-135/+215
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | e790c37 Replace SCRIPT_VERIFY_NOCACHE by flag directly to checker (Pieter Wuille) 5c1e798 Make signature cache optional (Pieter Wuille) c7829ea Abstract out SignatureChecker (Pieter Wuille)
| * | | | | | Replace SCRIPT_VERIFY_NOCACHE by flag directly to checkerPieter Wuille2014-10-0213-74/+64
| | | | | | |
| * | | | | | Make signature cache optionalPieter Wuille2014-10-029-88/+155
| | | | | | |
| * | | | | | Abstract out SignatureCheckerPieter Wuille2014-10-024-14/+37
| |/ / / / /
* | | | | | Merge pull request #5035Wladimir J. van der Laan2014-10-041-3/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | c9c51cb Make comptool more deterministic (Matt Corallo)
| * | | | | Make comptool more deterministicMatt Corallo2014-10-021-3/+3
| |/ / / /
* | | | | Merge pull request #4982Wladimir J. van der Laan2014-10-031-18/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | b5ec5fe update getnetworkinfo help with subversion (Philip Kaufmann)
| * | | | | update getnetworkinfo help with subversionPhilip Kaufmann2014-10-011-18/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add missing subversion field to getnetworkinfo help - fix style and format errors in help string - remove unneeded int casts
* | | | | | Merge pull request #4887Pieter Wuille2014-10-031-9/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 4bb30a1 Correct logging AcceptBlock()->AcceptBlockHeader() (R E Broadley)
| * | | | | | Correct logging AcceptBlock()->AcceptBlockHeader()R E Broadley2014-10-031-9/+9
| | | | | | |
* | | | | | | Merge pull request #4994Wladimir J. van der Laan2014-10-021-30/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 54510f2 DRY: Avoid repetitions in script_test (jtimon)
| * | | | | | | DRY: Avoid repetitions in script_testjtimon2014-10-021-30/+7
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #4978Wladimir J. van der Laan2014-10-022-16/+41
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 938bcce CAutoFile: make file private (Philip Kaufmann) 0c35486 CBufferedFile: add explicit close function (Philip Kaufmann) c9fb27d CBufferedFile: convert into a non-refcounted RAII wrapper (Philip Kaufmann)
| * | | | | | CAutoFile: make file privatePhilip Kaufmann2014-10-021-3/+4
| | | | | | |
| * | | | | | CBufferedFile: add explicit close functionPhilip Kaufmann2014-10-021-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - also use identical close function for CAutoFile (avoids setting file to NULL under wrong conditions)
| * | | | | | CBufferedFile: convert into a non-refcounted RAII wrapperPhilip Kaufmann2014-10-022-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - it now takes over the passed file descriptor and closes it in the destructor - this fixes a leak in LoadExternalBlockFile(), where an exception could cause the file to not getting closed - disallow copies (like recently added for CAutoFile) - make nType and nVersion private
* | | | | | | Merge pull request #5034Wladimir J. van der Laan2014-10-021-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | 609adc7 depends: disable unused bdb replication manager. Fixes new mingw builds (Cory Fields)
| * | | | | | depends: disable unused bdb replication manager. Fixes new mingw buildsCory Fields2014-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Newer mingw supports the features necessary to enable this api, whereas older versions didn't. However once enabled (automatically by configure), it triggers an unrelated build bug. Since it was not enabled previously anyway, and we don't depend on the functionality, just disable it across the board.
* | | | | | | Merge pull request #4985Wladimir J. van der Laan2014-10-022-79/+87
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | bc470c4 Changed mixed indentation to four spaces (Eric Shaw) 31d6390 Fixed setaccount accepting foreign address (Eric Shaw)
| * | | | | | Changed mixed indentation to four spacesEric Shaw2014-10-021-74/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Put `test/rpc_wallet_tests.cpp` through clang-format.
| * | | | | | Fixed setaccount accepting foreign addressEric Shaw2014-10-022-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue #4209 where using setaccount with a foreign address causes the address to be added to your receiving addresses.
* | | | | | | Merge pull request #5026Gavin Andresen2014-10-023-9/+49
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dd367ff build: macdeploy: filter out irrelevant qt5 frameworks and dylibs (Cory Fields) 9fedafb build: Fix OSX build when using Homebrew and qt5 (Cory Fields) Signed-off-by: Gavin Andresen <[email protected]>
| * | | | | | | build: macdeploy: filter out irrelevant qt5 frameworks and dylibsCory Fields2014-10-011-3/+23
| | | | | | | |
| * | | | | | | build: Fix OSX build when using Homebrew and qt5Cory Fields2014-10-012-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt5 is bottled, so configure won't find it without some help. Use brew to find out its prefix. Also, qt5 added the host_bins variable to pkg-config, use it.
* | | | | | | | Merge pull request #5030Wladimir J. van der Laan2014-10-0210-4/+95
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fbd36d8 Avoid introducing a virtual into CChainParams (Wladimir J. van der Laan) f0fd00c Switch testing framework from MAIN to new UNITTEST network (SergioDemianLerner)
| * | | | | | | | Avoid introducing a virtual into CChainParamsWladimir J. van der Laan2014-10-022-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Treat fSkipProofOfWorkCheck the same as other parameters.