aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-01-08c++11: add scoped enum fallbacks to CPPFLAGS rather than defining them locallyCory Fields
Due to include ordering, defining in one place was not enough to ensure correct usage. Use global defines so that we don't have to worry abou this ordering. Also add a comment in configure about the test.
2016-01-08Merge pull request #7306Wladimir J. van der Laan
f61766b Make sure conflicted wallet tx's update balances (Alex Morcos)
2016-01-08Merge pull request #7317Wladimir J. van der Laan
8a7f000 [RPC] remove the option of having multiple timer interfaces (Jonas Schnelli) db198d5 Fix RPCTimerInterface ordering issue Dispatching a QThread from a non Qt thread is not allowed. Always use the HTTPRPCTimerInterface (non QT) to dispatch RPCRunLater threads. (Jonas Schnelli)
2016-01-08[RPC] remove the option of having multiple timer interfacesJonas Schnelli
2016-01-08Fix RPCTimerInterface ordering issueJonas Schnelli
Dispatching a QThread from a non Qt thread is not allowed. Always use the HTTPRPCTimerInterface (non QT) to dispatch RPCRunLater threads.
2016-01-07Merge pull request #7298Jonas Schnelli
faf3299 [qt] Intro: Display required space (MarcoFalke)
2016-01-07Merge pull request #7266Wladimir J. van der Laan
6cd198f Removed comment about IsStandard for P2SH scripts (Marcel Krüger)
2016-01-07Merge pull request #7293Wladimir J. van der Laan
faf538b [trivial] Merge test cases and replace CENT with COIN (MarcoFalke) fa3c7e6 [wallet] Add regression test for vValue sort order (MarcoFalke)
2016-01-07Merge pull request #7229Wladimir J. van der Laan
fa33d97 [walletdb] Add missing LOCK() in Recover() for dummyWallet (MarcoFalke) fa14d99 [qa] check if wallet or blochchain maintenance changes the balance (MarcoFalke) fa0765d [qa] Cleanup wallet.py test (MarcoFalke)
2016-01-07Merge pull request #7257Wladimir J. van der Laan
5e10922 Combine common error strings for different options so translations can be shared and reused (Luke Dashjr)
2016-01-07Merge pull request #7302Wladimir J. van der Laan
3968922 c++11: fix libbdb build against libc++ in c++11 mode (Cory Fields) 57d2f62 c++11: CAccountingEntry must be defined before use in a list (Cory Fields) 89f71c6 c++11: don't throw from the reverselock destructor (Cory Fields) 76ac35f c++11: detect and correct for boost builds with an incompatible abi (Cory Fields)
2016-01-06Make sure conflicted wallet tx's update balancesAlex Morcos
2016-01-05c++11: fix libbdb build against libc++ in c++11 modeCory Fields
atomic_init clashes with
2016-01-05c++11: CAccountingEntry must be defined before use in a listCory Fields
c++11ism. This fixes builds against libc++.
2016-01-05c++11: don't throw from the reverselock destructorCory Fields
noexcept is default for destructors as of c++11. By throwing in reverselock's destructor if it's lock has been tampered with, the likely result is std::terminate being called. Indeed that happened before this change. Once reverselock has taken another lock (its ctor didn't throw), it makes no sense to try to grab or lock the parent lock. That is be broken/undefined behavior depending on the parent lock's implementation, but it shouldn't cause the reverselock to fail to re-lock when destroyed. To avoid those problems, simply swap the parent lock's contents with a dummy for the duration of the lock. That will ensure that any undefined behavior is caught at the call-site rather than the reverse lock's destruction. Barring a failed mutex unlock which would be indicative of a larger problem, the destructor should now never throw.
2016-01-05c++11: detect and correct for boost builds with an incompatible abiCory Fields
This is ugly, but temporary. boost::filesystem will likely be dropped soon after c++11 is enabled. Otherwise, we could simply roll our own copy_file. I've fixed this at the buildsystem level for now in order to avoid mixing in functional changes. Explanation: If boost (prior to 1.57) was built without c++11, it emulated scoped enums using c++98 constructs. Unfortunately, this implementation detail leaked into the abi. This was fixed in 1.57. When building against that installed version using c++11, the headers pick up on the native c++11 scoped enum support and enable it, however it will fail to link. This can be worked around by disabling c++11 scoped enums if linking will fail. Add an autoconf test to determine incompatibility. At build-time, if native enums are being used (a c++11 build), and force-disabling them causes a successful link, we can be sure that there's an incompatibility and enable the work-around.
2016-01-05[trivial] Merge test cases and replace CENT with COINMarcoFalke
2016-01-05[qt] Intro: Display required spaceMarcoFalke
Required space depends on the user's choice: -prune=0 -prune=<n>
2016-01-05Merge pull request #7205Wladimir J. van der Laan
fa71669 [devtools] Use git pretty-format for year parsing (MarcoFalke) fa24439 Bump copyright headers to 2015 (MarcoFalke) fa6ad85 [devtools] Rewrite fix-copyright-headers.py (MarcoFalke)
2016-01-05Merge pull request #7282Jonas Schnelli
621bd69 [Qt] fix coincontrol update issue when deleting a send coin entry (Jonas Schnelli)
2016-01-05Merge pull request #7193Wladimir J. van der Laan
fafd093 [wallet] Adjust pruning test (MarcoFalke)
2016-01-05Merge pull request #7217Wladimir J. van der Laan
5246180 Mark blocks with too many sigops as failed (Suhas Daftuar)
2016-01-05[wallet] Add regression test for vValue sort orderMarcoFalke
2016-01-04Merge pull request #7253Wladimir J. van der Laan
0d59589 Bugfix: update-translations: Allow numerus translations to omit %n specifier (usually when it only has one possible value) (Luke Dashjr)
2016-01-04Merge pull request #7250Wladimir J. van der Laan
fa0a974 [qa] Move gen_return_txouts() to util.py (MarcoFalke)
2016-01-04Merge pull request #7263Wladimir J. van der Laan
a5a0831 Double semicolon cleanup. (21E14)
2016-01-04Merge pull request #7274Wladimir J. van der Laan
fa6ce44 [debian] Update bitcoind manpage description (MarcoFalke) fae7a36 [debian] Bump manpages and only mention -? (MarcoFalke)
2016-01-04qt: periodic translations pull from transifexWladimir J. van der Laan
2016-01-04[Qt] fix coincontrol update issue when deleting a send coin entryJonas Schnelli
2016-01-04Merge pull request #7251Wladimir J. van der Laan
fa09562 [gitian] Set reference date to something more recent (MarcoFalke)
2016-01-04Merge pull request #7255Jonas Schnelli
6fd0a07 Remove hardcoded fee from CoinControl ToolTip (fanquake) 5fdf32d Replace some instances of formatWithUnit with formatHtmlWithUnit (fanquake)
2016-01-04Merge pull request #7256Wladimir J. van der Laan
33877ed Add note to CoinControl Dialog workaround (fanquake)
2016-01-04Merge pull request #7276Wladimir J. van der Laan
7ef8f3c Report non-mandatory script failures correctly (Pieter Wuille)
2016-01-03Report non-mandatory script failures correctlyPieter Wuille
2016-01-03[debian] Update bitcoind manpage descriptionMarcoFalke
Update the description to match that description in the main bitcoin README.md
2016-01-03[debian] Bump manpages and only mention -?MarcoFalke
The manpages are outdated and are very rarely updated when changes to the code happen.
2016-01-03Remove hardcoded fee from CoinControl ToolTipfanquake
2016-01-02[gitian] Set reference date to something more recentMarcoFalke
2016-01-02Add note to CoinControl Dialog workaroundfanquake
2015-12-30Removed comment about IsStandard for P2SH scriptsMarcel Krüger
Since #4365 (62599373883a66a958136f48ab0e2b826e3d5bf8) P2SH scripts do not have to be IsStandard scripts.
2015-12-30Double semicolon cleanup.21E14
2015-12-26[devtools] Use git pretty-format for year parsingMarcoFalke
2015-12-26Combine common error strings for different options so translations can be ↵Luke Dashjr
shared and reused
2015-12-26Replace some instances of formatWithUnit with formatHtmlWithUnitfanquake
Strings in a HTML context should be using formatHtmlWithUnit.
2015-12-25Bugfix: update-translations: Allow numerus translations to omit %n specifier ↵Luke Dashjr
(usually when it only has one possible value)
2015-12-24[qa] Move gen_return_txouts() to util.pyMarcoFalke
2015-12-23Merge pull request #7214Jonas Schnelli
fa2f4bc qt5: Use the fixed font the system recommends (MarcoFalke)
2015-12-22Merge pull request #7153Wladimir J. van der Laan
7632cf6 [Tests] Refactor some shared functions (Jonas Schnelli) 110ff11 [Tests] Add mempool_limit.py test (Jonas Schnelli)
2015-12-22Merge pull request #7218Jonas Schnelli
fa5769e [qt] Fix misleading translation (MarcoFalke) fa8c8d7 torcontrol debug: Change to a blanket message that covers both cases (MarcoFalke)
2015-12-22Merge pull request #7213Wladimir J. van der Laan
37d271d Rename OP_NOP2 to OP_CHECKLOCKTIMEVERIFY. (mb300sd)