Commit graph

11696 commits

Author SHA1 Message Date
Pavel Janík 4731cab8fb Do not shadow variables 2016-09-27 09:25:15 +02:00
MarcoFalke 2f71490d21
Merge #8805: Trivial: Grammar and capitalization
c9ce17b Trivial: Grammar and capitalization (Derek Miller)
2016-09-26 22:27:45 +02:00
Wladimir J. van der Laan 8f1fbf36a7
Merge #8796: [trivial] fix mempool comment (outdated by BIP125)
c14ffd5 [trivial] fix mempool comment (outdated by BIP125) (jonnynewbs)
2016-09-26 15:11:02 +02:00
Wladimir J. van der Laan dd20ed1223
Merge #8780: [rpc] Deprecate getinfo
fa6e71b [qa] Add getinfo smoke tests and rework versionbits test (MarcoFalke)
ddddaaf [rpc] Deprecate getinfo (MarcoFalke)
2016-09-26 15:03:06 +02:00
Wladimir J. van der Laan bb843adc8d
Merge #8722: bitcoin-cli: More detailed error reporting
381826d bitcoin-cli: More detailed error reporting (Wladimir J. van der Laan)
2016-09-26 14:53:38 +02:00
jonnynewbs c14ffd524b [trivial] fix mempool comment (outdated by BIP125) 2016-09-26 08:52:52 -04:00
Wladimir J. van der Laan ab0b411868
Merge #8486: [wallet] Add high transaction fee warnings
faef293 [wallet] Add high transaction fee warnings (MarcoFalke)
2016-09-26 13:57:10 +02:00
Wladimir J. van der Laan 4e1567acff
Merge #8249: Enable (and check for) 64-bit ASLR on Windows
62c2915 build: supply `-Wl,--high-entropy-va` (Wladimir J. van der Laan)
9a75d29 devtools: Check for high-entropy ASLR in 64-bit PE executables (Wladimir J. van der Laan)
2016-09-26 13:34:38 +02:00
Wladimir J. van der Laan 62c291596b build: supply -Wl,--high-entropy-va
This should enable high-entropy ASLR on 64-bit targets, for better
mitigation of exploits.
2016-09-26 12:57:55 +02:00
Wladimir J. van der Laan 9a75d29b6f devtools: Check for high-entropy ASLR in 64-bit PE executables
check_PE_PIE only checked for DYNAMIC_BASE, this is not enough
for (secure) ASLR on 64-bit.
2016-09-26 12:57:55 +02:00
MarcoFalke faef293cf3 [wallet] Add high transaction fee warnings 2016-09-26 01:11:27 +02:00
Wladimir J. van der Laan 37871f216e
Merge #8807: [univalue] Pull subtree from upstream
3650668 Squashed 'src/univalue/' changes from f32df99..daf1285 (MarcoFalke)
2016-09-25 16:21:43 +02:00
MarcoFalke 9bf41af708 Merge commit '3650668cdbbf369dd8f30c8e8eb5bb883325942d' into HEAD 2016-09-25 15:19:23 +02:00
MarcoFalke 3650668cdb Squashed 'src/univalue/' changes from f32df99..daf1285
daf1285 Merge pull request #2 from jgarzik/master
d9e62d3 Merge pull request #24 from MarcoFalke/Mf1608-cleanup
faf260f Rem unused vars and prefer prefix operator for non-primitive type
09a2693 Merge pull request #22 from laanwj/2016_04_unicode
c74a04c Merge pull request #23 from paveljanik/20160527_Wshadow
fceb4f8 Do not shadow variables

git-subtree-dir: src/univalue
git-subtree-split: daf1285af60c2c73801c0f41469c9802c849343d
2016-09-25 15:19:23 +02:00
MarcoFalke fa6e71b27d [qa] Add getinfo smoke tests and rework versionbits test 2016-09-25 15:01:29 +02:00
Wladimir J. van der Laan bae178f3ca
Merge #8743: Remove old manpages from contrib/debian in favour of doc/man
b194872 Remove old manpages from contrib/debian (fanquake)
2016-09-25 13:35:24 +02:00
fanquake b1948723c9 Remove old manpages from contrib/debian 2016-09-25 13:33:57 +02:00
Wladimir J. van der Laan b694b0d5a5
Merge #8791: [travis] cross-mac: explicitly enable gui
fa16991 [travis] cross-mac: explicitly enable gui (MarcoFalke)
2016-09-25 13:16:55 +02:00
Wladimir J. van der Laan b8d10fd4ef
Merge #8802: Fix future copyright year
edeaf24 Fix future copyright year (Mitchell Cash)
2016-09-25 13:12:01 +02:00
Wladimir J. van der Laan bc9e3ab29f
Merge #8771: CONTRIBUTING: Mention not to open several pulls
faa91bc CONTRIBUTING: Mention not to open several pulls (MarcoFalke)
2016-09-25 13:10:11 +02:00
Wladimir J. van der Laan 279bbadc8b
Merge #8787: [Doc] Add missing autogen to example builds
3f58a28 [Doc] Add missing autogen to example builds (Amir Abrams)
2016-09-25 11:51:26 +02:00
Wladimir J. van der Laan 9da7366be1
Merge #8786: Mandatory copyright agreement
4b67402 Mandatory copyright agreement (Andrew Chow)
2016-09-25 09:22:40 +02:00
Derek Miller c9ce17beed Trivial: Grammar and capitalization 2016-09-24 12:22:47 -05:00
MarcoFalke 08cc5fd666
Merge #8790: [test] Remove redundant debug print in addrman_tests
3333bd2 [test] Remove redundant print in addrman_tests (MarcoFalke)
2016-09-24 15:38:38 +02:00
MarcoFalke e31a43c725
Merge #8789: [qa] pull-tester: Only print output when failed
fa427ce [qa] pull-tester: Only print output when failed (MarcoFalke)
2016-09-24 15:35:35 +02:00
Mitchell Cash edeaf24e4c Fix future copyright year 2016-09-24 13:46:08 +10:00
Jonas Schnelli 24f72e9f3f
Merge #8371: [Qt] Add out-of-sync modal info layer
08827df [Qt] modalinfolayer: removed unused comments, renamed signal, code style overhaul (Jonas Schnelli)
d8b062e [Qt] only update "amount of blocks left" when the header chain is in-sync (Jonas Schnelli)
e3245b4 [Qt] add out-of-sync modal info layer (Jonas Schnelli)
e47052f [Qt] ClientModel add method to get the height of the header chain (Jonas Schnelli)
a001f18 [Qt] Always pass the numBlocksChanged signal for headers tip changed (Jonas Schnelli)
bd44a04 [Qt] make Out-Of-Sync warning icon clickable (Jonas Schnelli)
0904c3c [Refactor] refactor function that forms human readable text out of a timeoffset (Jonas Schnelli)
2016-09-23 18:22:48 +02:00
Jonas Schnelli 08827df3ec
[Qt] modalinfolayer: removed unused comments, renamed signal, code style overhaul 2016-09-23 16:07:21 +02:00
Wladimir J. van der Laan d2e46558ba
Merge #8661: Do not set an addr time penalty when a peer advertises itself.
6d0ced1 Do not set an addr time penalty when a peer advertises itself. (Gregory Maxwell)
2016-09-23 13:56:01 +02:00
Wladimir J. van der Laan 5d0219d983
Merge #8793: Do not shadow in src/qt
f839350 Do not shadow in src/qt (Pavel Janík)
2016-09-23 12:44:35 +02:00
Pavel Janík f839350420 Do not shadow in src/qt 2016-09-23 12:42:00 +02:00
Amir Abrams 3f58a283ee [Doc] Add missing autogen to example builds 2016-09-22 22:35:13 -05:00
MarcoFalke faa91bc335 CONTRIBUTING: Mention not to open several pulls 2016-09-23 00:42:35 +02:00
Wladimir J. van der Laan 2b514aa2ea
Merge #8785: Comment on CNode::nLocalServices meaning
b5ccded Comment on CConnman::nLocalServices meaning (instagibbs)
2016-09-22 16:41:02 +02:00
Andrew Chow 4b6740204d Mandatory copyright agreement
All contributions to the repository will agree to use the MIT license
2016-09-22 08:28:14 -04:00
instagibbs b5ccded57f Comment on CConnman::nLocalServices meaning 2016-09-22 08:19:44 -04:00
MarcoFalke fa16991e7b [travis] cross-mac: explicitly enable gui 2016-09-22 13:00:56 +02:00
MarcoFalke 3333bd2d15 [test] Remove redundant print in addrman_tests 2016-09-22 12:50:39 +02:00
MarcoFalke fa427cef13 [qa] pull-tester: Only print output when failed 2016-09-22 12:39:39 +02:00
Wladimir J. van der Laan 26b370a937
Merge #8636: Implement NULLDUMMY softfork (BIP147)
482f852 Implement NULLDUMMY softfork (Johnson Lau)
2016-09-22 10:58:00 +02:00
Wladimir J. van der Laan 7008e28136
Merge #8779: [contrib] Delete spendfrom
fa81d09 [contrib] Delete spendfrom (MarcoFalke)
2016-09-22 07:56:31 +02:00
Wladimir J. van der Laan 3166dff48f
Merge #8423: [depends] expat 2.2.0, ccache 3.3.1, fontconfig 2.12.1
86d410d [depends] fontconfig 2.12.1 (fanquake)
9616ac8 [depends] ccache 3.3.1 (fanquake)
6b6cbdd [depends] expat 2.2.0 (fanquake)
2016-09-22 07:54:43 +02:00
Wladimir J. van der Laan 64dc645745
Merge #8783: [share] remove qt/protobuf.pri
fa13c5c [share] remove qt/protobuf.pri (MarcoFalke)
2016-09-22 07:44:49 +02:00
Wladimir J. van der Laan ca69ef4880
Merge #8781: [contrib] delete qt_translations.py
faf87af [contrib] delete qt_translations.py (MarcoFalke)
2016-09-22 07:44:10 +02:00
MarcoFalke fa13c5ce4f [share] remove qt/protobuf.pri
follow up of 35b8af9226 (#2943)
2016-09-22 00:43:41 +02:00
MarcoFalke faf87aff16 [contrib] delete qt_translations.py
follow-up of 1a97b22 #4185
2016-09-21 21:45:11 +02:00
MarcoFalke ddddaafa4a [rpc] Deprecate getinfo
This was replaced by getmininginfo, getnetworkinfo and getwalletinfo
2016-09-21 21:19:20 +02:00
MarcoFalke fa81d09e8d [contrib] Delete spendfrom 2016-09-21 19:57:20 +02:00
Wladimir J. van der Laan cf5ebaa921
Merge #8656: Trivial: Do not shadow global variable fileout
7c069a7 Do not shadow global variable (Pavel Janík)
2016-09-21 14:13:44 +02:00
Wladimir J. van der Laan 381826dfee bitcoin-cli: More detailed error reporting
Register a evhttp error handler to get a more detailed error message
if the HTTP request fails.
2016-09-21 14:02:42 +02:00