aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | Add sane fallback for fee estimationAlex Morcos2016-01-054-2/+27
| * | | | | | | | | | | | | | | | | | | | Always respect GetRequiredFee for wallet txsAlex Morcos2016-01-051-8/+3
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #7081Wladimir J. van der Laan2016-01-093-8/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch bytespersigopLuke Dashjr2016-01-093-8/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | -bytespersigop option to additionally limit sigops in transactions we relay a...Luke Dashjr2015-12-013-8/+14
* | | | | | | | | | | | | | | | | | | | | Merge pull request #7306Wladimir J. van der Laan2016-01-081-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Make sure conflicted wallet tx's update balancesAlex Morcos2016-01-061-0/+7
| | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | [RPC] remove the option of having multiple timer interfacesJonas Schnelli2016-01-084-17/+25
* | | | | | | | | | | | | | | | | | | | Fix RPCTimerInterface ordering issueJonas Schnelli2016-01-081-1/+1
| |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #7298Jonas Schnelli2016-01-071-5/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | [qt] Intro: Display required spaceMarcoFalke2016-01-051-5/+15
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #7266Wladimir J. van der Laan2016-01-071-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Removed comment about IsStandard for P2SH scriptsMarcel Krüger2015-12-301-3/+0
| | |_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #7293Wladimir J. van der Laan2016-01-071-6/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | [trivial] Merge test cases and replace CENT with COINMarcoFalke2016-01-051-15/+10
| * | | | | | | | | | | | | | | | | | [wallet] Add regression test for vValue sort orderMarcoFalke2016-01-051-0/+18
* | | | | | | | | | | | | | | | | | | Merge pull request #7229Wladimir J. van der Laan2016-01-071-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | [walletdb] Add missing LOCK() in Recover() for dummyWalletMarcoFalke2015-12-191-1/+6
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #7257Wladimir J. van der Laan2016-01-071-7/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Combine common error strings for different options so translations can be sha...Luke Dashjr2015-12-261-7/+17
* | | | | | | | | | | | | | | | | | | | c++11: CAccountingEntry must be defined before use in a listCory Fields2016-01-051-84/+80
* | | | | | | | | | | | | | | | | | | | c++11: don't throw from the reverselock destructorCory Fields2016-01-052-11/+10
* | | | | | | | | | | | | | | | | | | | c++11: detect and correct for boost builds with an incompatible abiCory Fields2016-01-051-0/+6
| |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #7205Wladimir J. van der Laan2016-01-05253-253/+253
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Bump copyright headers to 2015MarcoFalke2015-12-13253-253/+253
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #7282Jonas Schnelli2016-01-051-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | [Qt] fix coincontrol update issue when deleting a send coin entryJonas Schnelli2016-01-041-3/+3
* | | | | | | | | | | | | | | | | | | | Merge pull request #7193Wladimir J. van der Laan2016-01-051-8/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | [wallet] Adjust pruning testMarcoFalke2015-12-091-8/+10
* | | | | | | | | | | | | | | | | | | | Merge pull request #7217Wladimir J. van der Laan2016-01-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Mark blocks with too many sigops as failedSuhas Daftuar2015-12-151-1/+1
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #7263Wladimir J. van der Laan2016-01-046-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Double semicolon cleanup.21E142015-12-306-9/+9
| | |_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | qt: periodic translations pull from transifexWladimir J. van der Laan2016-01-0475-237/+5302
* | | | | | | | | | | | | | | | | | | | Merge pull request #7255Jonas Schnelli2016-01-044-12/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Remove hardcoded fee from CoinControl ToolTipfanquake2016-01-031-2/+2
| * | | | | | | | | | | | | | | | | | | | Replace some instances of formatWithUnit with formatHtmlWithUnitfanquake2015-12-264-11/+5
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge pull request #7256Wladimir J. van der Laan2016-01-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Add note to CoinControl Dialog workaroundfanquake2016-01-021-1/+1
| |/ / / / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / / / Report non-mandatory script failures correctlyPieter Wuille2016-01-031-2/+2
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #7214Jonas Schnelli2015-12-231-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | qt5: Use the fixed font the system recommendsMarcoFalke2015-12-141-0/+8
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #7218Jonas Schnelli2015-12-223-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | [qt] Fix misleading translationMarcoFalke2015-12-162-2/+2
| * | | | | | | | | | | | | | | | | | torcontrol debug: Change to a blanket message that covers both casesMarcoFalke2015-12-161-1/+1
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #7213Wladimir J. van der Laan2015-12-227-39/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Rename OP_NOP2 to OP_CHECKLOCKTIMEVERIFY.mb300sd2015-12-157-39/+39
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #7062Wladimir J. van der Laan2015-12-215-90/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | / / / / / / / / / / | |_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Remove GetMinRelayFeeSuhas Daftuar2015-12-022-37/+0
| * | | | | | | | | | | | | | | | Use fee deltas for determining mempool acceptanceSuhas Daftuar2015-12-021-7/+11