highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-29 02:11:24 +02:00
Code Issues Packages Projects Releases Wiki Activity
6,986 Commits 7 Branches 328 Tags
2b5261c63690fd545a8dcf742e32ed1bb519183a
Commit Graph

6986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wladimir J. van der Laan
2b5261c636 Merge pull request #5041 
1f9be98 Disable App Nap on OSX 10.9+ (Michael Ford)
 2014-10-07 10:17:55 +02:00
Wladimir J. van der Laan
3eaa9462f8 Merge pull request #5047 
3e61eb9 minor txindex documentation improvement (Cozz Lovan)
 2014-10-07 10:17:05 +02:00
Wladimir J. van der Laan
cd3269e38e contrib: revert changes to github-merge.sh in #5038 2014-10-07 10:00:12 +02:00
Wladimir J. van der Laan
ca067dc937 Merge pull request #5053 
27368e7 Homebrew lang fix (Dominyk Tiller)
 2014-10-07 09:58:21 +02:00
Wladimir J. van der Laan
d4b571a5d3 Merge pull request #5038 
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)
 2014-10-07 08:53:07 +02:00
Wladimir J. van der Laan
953f16cb4e Merge pull request #4954 
9d7cd4c Don't return an address for invalid pubkeys (Andy Alness)
 2014-10-07 08:51:20 +02:00
Andy Alness
9d7cd4c598 Don't return an address for invalid pubkeys 2014-10-06 21:54:34 -04:00
Pieter Wuille
a2a5fe3b72 Merge pull request #5049 
4dc5eb0 fix a lock indentation in main.cpp (Philip Kaufmann)
5eed8c2 minor license, header end comment etc. cleanup in /script (Philip Kaufmann)
 2014-10-06 23:51:45 +02:00
Dominyk Tiller
27368e7626 Homebrew lang fix 
Very small tweak to correct the language on Homebrew's sandboxing process.

Discussed in [this commit](9fedafba4b).
 2014-10-06 21:36:24 +01:00
Cozz Lovan
3e61eb9c51 minor txindex documentation improvement 2014-10-06 18:52:51 +02:00
Philip Kaufmann
4dc5eb057c fix a lock indentation in main.cpp 
- also ensure alphabetical ordering in file header
 2014-10-06 13:04:02 +02:00
Philip Kaufmann
5eed8c21c7 minor license, header end comment etc. cleanup in /script 
- ensure all licenses are just MIT
- add a missing header end comment
- ensure alphabetical ordering
 2014-10-06 13:00:55 +02:00
Wladimir J. van der Laan
5505a1b13f Merge pull request #5036 
eb6b3b2 Update English translation (Wladimir J. van der Laan)
b9b2e3f Don't translate state.Abort() messages (Wladimir J. van der Laan)
 2014-10-06 04:42:09 +02:00
Wladimir J. van der Laan
5f1aee066a Merge pull request #4890 
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)
 2014-10-06 04:39:17 +02:00
Michael Ford
1f9be984db Disable App Nap on OSX 10.9+ 2014-10-04 19:34:15 +08:00
Wladimir J. van der Laan
5bf029603c Merge pull request #5035 
c9c51cb Make comptool more deterministic (Matt Corallo)
 2014-10-04 08:51:56 +02:00
Luke Dashjr
0b17964131 Bugfix: Replace bashisms with standard sh in tests/tools 2014-10-03 23:45:26 +00:00
Luke Dashjr
ab72068565 Bugfix: Replace bashisms with standard sh in gitian descriptors 2014-10-03 23:45:26 +00:00
Luke Dashjr
b77b4eda8d Bugfix: Replace bashisms with standard sh to fix build on non-BASH systems 2014-10-03 23:45:26 +00:00
Cory Fields
d6b0539f45 travis: add non-default shell testing to travis. 2014-10-03 18:56:04 -04:00
Wladimir J. van der Laan
cd91ed4f5f Merge pull request #4982 
b5ec5fe update getnetworkinfo help with subversion (Philip Kaufmann)
 2014-10-03 15:27:58 +02:00
Pieter Wuille
5ccd735d30 Merge pull request #4887 
4bb30a1 Correct logging AcceptBlock()->AcceptBlockHeader() (R E Broadley)
 2014-10-03 04:31:44 +02:00
Matt Corallo
c9c51cba4e Make comptool more deterministic 2014-10-02 13:52:19 -07:00
Wladimir J. van der Laan
29f96e8bc6 Merge pull request #4994 
54510f2 DRY: Avoid repetitions in script_test (jtimon)
 2014-10-02 22:41:54 +02:00
Wladimir J. van der Laan
0e64566a82 Merge pull request #4978 
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)
 2014-10-02 22:35:36 +02:00
Wladimir J. van der Laan
eb6b3b245c Update English translation 2014-10-02 22:20:23 +02:00
Wladimir J. van der Laan
b9b2e3fabd Don't translate state.Abort() messages 
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.
 2014-10-02 22:20:16 +02:00
jtimon
54510f2672 DRY: Avoid repetitions in script_test 2014-10-02 21:48:29 +02:00
Pieter Wuille
e790c370b5 Replace SCRIPT_VERIFY_NOCACHE by flag directly to checker 2014-10-02 20:26:58 +02:00
Pieter Wuille
5c1e798a8e Make signature cache optional 2014-10-02 20:26:17 +02:00
Pieter Wuille
c7829ea797 Abstract out SignatureChecker 2014-10-02 20:26:16 +02:00
Wladimir J. van der Laan
6faee79426 Merge pull request #5034 
609adc7 depends: disable unused bdb replication manager. Fixes new mingw builds (Cory Fields)
 2014-10-02 20:00:59 +02:00
Cory Fields
609adc7660 depends: disable unused bdb replication manager. Fixes new mingw builds 
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.
 2014-10-02 13:41:31 -04:00
R E Broadley
4bb30a1eb8 Correct logging AcceptBlock()->AcceptBlockHeader() 2014-10-03 01:35:51 +08:00
Wladimir J. van der Laan
20a4b69360 Merge pull request #4985 
bc470c4 Changed mixed indentation to four spaces (Eric Shaw)
31d6390 Fixed setaccount accepting foreign address (Eric Shaw)
 2014-10-02 19:31:50 +02:00
Eric Shaw
bc470c43ee Changed mixed indentation to four spaces 
Put `test/rpc_wallet_tests.cpp` through clang-format.
 2014-10-02 19:23:30 +02:00
Eric Shaw
31d6390fd1 Fixed setaccount accepting foreign address 
Fixed issue #4209 where using setaccount with a foreign
address causes the address to be added to your receiving addresses.
 2014-10-02 19:21:46 +02:00
Gavin Andresen
4b73b758a3 Merge pull request #5026 
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 <gavinandresen@gmail.com>
 2014-10-02 11:49:13 -04:00
Wladimir J. van der Laan
45c41c05a0 Merge pull request #5030 
fbd36d8 Avoid introducing a virtual into CChainParams (Wladimir J. van der Laan)
f0fd00c Switch testing framework from MAIN to new UNITTEST network (SergioDemianLerner)
 2014-10-02 15:28:27 +02:00
Wladimir J. van der Laan
fbd36d8fb5 Avoid introducing a virtual into CChainParams 
Treat fSkipProofOfWorkCheck the same as other parameters.
 2014-10-02 13:54:26 +02:00
SergioDemianLerner
f0fd00cb77 Switch testing framework from MAIN to new UNITTEST network 
UNITTEST inherites from MAIN but allows synamically changing its parameters using the ModifiableParams() interface
 2014-10-02 13:51:39 +02:00
Wladimir J. van der Laan
2dc37e7a49 Merge pull request #4991 
0dcb0a5 doc: Add instructions for consistent Mac OS X build names (Saivann)
 2014-10-02 12:07:13 +02:00
Wladimir J. van der Laan
b76a767906 Merge pull request #5031 
e2efdf3 amount.h: update license, add header end comment + rem from util.h (Philip Kaufmann)
 2014-10-02 11:48:38 +02:00
Philip Kaufmann
e2efdf3937 amount.h: update license, add header end comment + rem from util.h 2014-10-02 11:25:21 +02:00
Philip Kaufmann
938bccebf1 CAutoFile: make file private 2014-10-02 10:59:28 +02:00
Philip Kaufmann
0c35486dc9 CBufferedFile: add explicit close function 
- also use identical close function for CAutoFile (avoids setting file to
  NULL under wrong conditions)
 2014-10-02 10:56:10 +02:00
Philip Kaufmann
c9fb27da0a CBufferedFile: convert into a non-refcounted RAII wrapper 
- 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
 2014-10-02 10:46:31 +02:00
Wladimir J. van der Laan
8d132431b4 Revert merge of pull #4845 
It breaks the new mingw tests!

See

- https://travis-ci.org/bitcoin/bitcoin/jobs/36845581
- https://travis-ci.org/bitcoin/bitcoin/jobs/36845582

This reverts commit 4705902777, 5e2e7fcb99, a25fd6be13.
 2014-10-02 10:39:55 +02:00
Wladimir J. van der Laan
ad51e14583 Merge pull request #4845 
4705902 Avoid introducing a virtual into CChainParams (Wladimir J. van der Laan)
5e2e7fc Suggested corrections on comments, variable names. Also new test case testing the PoW skip in UNITTEST. (SergioDemianLerner)
a25fd6b Switch testing framework from MAIN to new UNITTEST network (SergioDemianLerner)
 2014-10-02 09:47:54 +02:00
Wladimir J. van der Laan
3b390723c1 Merge pull request #5025 
5ad450a travis: If the comparison-tool fails, dump the tail of the debug log (Cory Fields)
 2014-10-02 09:08:33 +02:00