aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* instance of 'mem pool' to 'mempool'S. Matthew English2016-10-272-2/+2
* Merge #9020: rpc: Remove invalid explanation from wallet fee messageWladimir J. van der Laan2016-10-261-1/+1
|\
| * rpc: Remove invalid explanation from wallet fee messageWladimir J. van der Laan2016-10-261-1/+1
|/
* Merge #9015: release: bump required osx version to 10.8. (jonasschnelli)Wladimir J. van der Laan2016-10-261-1/+1
|\
| * release: bump required osx version to 10.8. Credit jonasschnelli.Cory Fields2016-10-251-1/+1
|/
* Merge #8515: A few mempool removal optimizationsWladimir J. van der Laan2016-10-257-50/+51
|\
| * Add some missing includesPieter Wuille2016-10-211-0/+4
| * Return shared_ptr<CTransaction> from mempool removesPieter Wuille2016-10-215-15/+15
| * Make removed and conflicted arguments optional to removePieter Wuille2016-10-217-35/+31
| * Bypass removeRecursive in removeForReorgPieter Wuille2016-10-211-7/+8
* | Merge #8948: [TRIVIAL] reorder Windows gitian build order to match LinuxWladimir J. van der Laan2016-10-251-1/+1
|\ \
| * | [TRIVIAL] reorder Windows gitian build order to match LinuxMicha2016-10-181-1/+1
* | | Merge #9008: [net] Remove assert(nMaxInbound > 0)Wladimir J. van der Laan2016-10-251-1/+0
|\ \ \
| * | | [net] Remove assert(nMaxInbound > 0)MarcoFalke2016-10-241-1/+0
* | | | Merge #9002: Make connect=0 disable automatic outbound connections.Wladimir J. van der Laan2016-10-252-5/+6
|\ \ \ \
| * | | | Make connect=0 disable automatic outbound connections.Gregory Maxwell2016-10-252-5/+6
| | |_|/ | |/| |
* | | | Merge #9004: Clarify `listenonion`Wladimir J. van der Laan2016-10-251-4/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Clarify `listenonion`unsystemizer2016-10-241-4/+4
* | | | Merge #8995: Add missing cs_main lock to ::GETBLOCKTXN processingWladimir J. van der Laan2016-10-241-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Add missing cs_main lock to ::GETBLOCKTXN processingMatt Corallo2016-10-211-0/+2
* | | | Merge #8993: Trivial: Fix doxygen comment: the transaction is returned in txOutWladimir J. van der Laan2016-10-241-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix doxygen comment: the transaction is returned in txOutPavel Janík2016-10-211-1/+1
|/ / /
* | | Merge #8982: Eliminating Inconsistencies in Textual OutputMarcoFalke2016-10-211-3/+3
|\ \ \ | |/ / |/| |
| * | Eliminating Inconsistencies in Textual OutputS. Matthew English2016-10-201-3/+3
* | | Merge #8968: Don't hold cs_main when calling ProcessNewBlock from a cmpctblockWladimir J. van der Laan2016-10-211-21/+26
|\ \ \
| * | | Don't hold cs_main when calling ProcessNewBlock from a cmpctblockMatt Corallo2016-10-181-21/+26
* | | | Merge #8975: Chainparams: Trivial: In AppInit2(), s/Params()/chainparams/Wladimir J. van der Laan2016-10-211-4/+4
|\ \ \ \
| * | | | Chainparams: Trivial: In AppInit2(), s/Params()/chainparams/Jorge Timón2016-10-191-4/+4
* | | | | Merge #8990: moveonly: move `coincontrol` to `src/wallet`Wladimir J. van der Laan2016-10-215-7/+7
|\ \ \ \ \
| * | | | | moveonly: move `coincontrol` to `src/wallet`Wladimir J. van der Laan2016-10-215-7/+7
* | | | | | Merge #8985: Use pindexBestHeader instead of setBlockIndexCandidates for Noti...Jonas Schnelli2016-10-214-12/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [Qt] use NotifyHeaderTip's height and date for the progress updateJonas Schnelli2016-10-203-9/+7
| * | | | | Use pindexBestHeader instead of setBlockIndexCandidates for NotifyHeaderTip()Jonas Schnelli2016-10-201-3/+2
| | |_|/ / | |/| | |
* | | | | Merge #8980: RPC: importmulti: Avoid using boost::variant::operator!=, which ...Wladimir J. van der Laan2016-10-201-4/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | RPC: importmulti: Avoid using boost::variant::operator!=, which is only in ne...Luke Dashjr2016-10-201-4/+4
|/ / / /
* | | | Merge #7551: Add importmulti RPC callWladimir J. van der Laan2016-10-207-0/+797
|\ \ \ \ | |/ / / |/| | |
| * | | Add consistency check to RPC call importmultiPedro Branco2016-10-192-9/+108
| * | | Add importmulti rpc callPedro Branco2016-10-197-0/+698
* | | | Merge #8928: Fix init segfault where InitLoadWallet() calls ATMP before genesisWladimir J. van der Laan2016-10-192-2/+7
|\ \ \ \
| * | | | Fix init segfault where InitLoadWallet() calls ATMP before genesisMatt Corallo2016-10-152-2/+7
* | | | | Merge #8927: Add script tests for FindAndDelete in pre-segwit and segwit scriptsWladimir J. van der Laan2016-10-193-2/+51
|\ \ \ \ \
| * | | | | Add script tests for FindAndDelete in pre-segwit and segwit scriptsJohnson Lau2016-10-163-2/+51
| |/ / / /
* | | | | Merge #8774: Qt refactors to better abstract wallet accessJonas Schnelli2016-10-195-6/+19
|\ \ \ \ \
| * | | | | Qt/splash: Specifically keep track of which wallet(s) we are connected to for...Luke Dashjr2016-10-042-5/+12
| * | | | | Qt: Get the private key for signing messages via WalletModelLuke Dashjr2016-10-043-1/+7
* | | | | | Merge #7948: RPC: augment getblockchaininfo bip9_softforks dataWladimir J. van der Laan2016-10-197-44/+121
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | RPC: augment getblockchaininfo bip9_softforks datamruddy2016-10-197-44/+121
* | | | | | Merge #8788: [RPC] Give RPC commands more information about the RPC requestWladimir J. van der Laan2016-10-1916-554/+570
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [RPC] pass HTTP basic authentication username to the JSONRequest objectJonas Schnelli2016-10-193-5/+10
| * | | | | [RPC] Give RPC commands more information about the RPC requestJonas Schnelli2016-10-1913-547/+558