DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
7,546 Commits 6 Branches 7 Tags
b7a4ecc1535e4e154b2ca5da16afecc096e152e8
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wladimir J. van der Laan 41cced2106 Merge pull request #5267 
34318d7 RPC-test based on invalidateblock for mempool coinbase spends (Gavin Andresen)
7fd6219 Make CTxMemPool::remove more effecient by avoiding recursion (Matt Corallo)
b7b4318 Make CTxMemPool::check more thourough by using CheckInputs (Matt Corallo)
723d12c Remove txn which are invalidated by coinbase maturity during reorg (Matt Corallo)
868d041 Remove coinbase-dependant transactions during reorg. (Matt Corallo)
 2014-12-11 15:24:00 +01:00
Wladimir J. van der Laan 7c001bb49c qt: translations pull from transifex 2014-12-11 11:10:23 +01:00
Wladimir J. van der Laan 5e521d3e4e Merge pull request #5391 
932ef50 [REST] JSON output: remove block infos from tx details if it is nested in block (Jonas Schnelli)
cae5486 [REST] added /rest/block/notxdetails/<hash> into REST-interface.md documentation (Jonas Schnelli)
73351c3 [REST] /rest/block response with full tx details (Jonas Schnelli)
 2014-12-11 10:33:11 +01:00
Wladimir J. van der Laan 34468066ff Merge pull request #5399 
4be639e Use RPC_INVALID_PARAMETER instead of RPC_WALLET_ERROR for invalid amount. No return at the end of void function. (Pavel Janík)
b93173d Move SendMoney() to rpcwallet.cpp. (Pavel Janík)
 2014-12-10 08:22:20 +01:00
Wladimir J. van der Laan 12c05ee938 Merge pull request #5395 
4c69ebe Add /opt/local/include/db48 only if it exists. (Pavel Janík)
 2014-12-10 08:16:42 +01:00
Wladimir J. van der Laan 0a1d03ca52 Merge pull request #5449 
6e6a36c contrib: show pull # in prompt for github-merge script (Wladimir J. van der Laan)
 2014-12-09 15:34:02 +01:00
Wladimir J. van der Laan 09ac7f9e6d Merge pull request #5427 
1577df9 Port of walletbackup.sh to Python. (mrbandrews)
 2014-12-09 11:09:31 +01:00
Wladimir J. van der Laan 6e6a36ce30 contrib: show pull # in prompt for github-merge script 2014-12-09 10:16:58 +01:00
Wladimir J. van der Laan 7f76dda903 Merge pull request #5216 
5ec654b [Qt] update paymentserver license and cleanup ordering (Philip Kaufmann)
4333e26 [Qt] add BIP70 DoS protection test (Philip Kaufmann)
31f8494 [Qt] add BIP70 payment request size DoS protection for URIs (Philip Kaufmann)
2284ccb [Qt] remove dup lock that is done in SetAddressBook() (Philip Kaufmann)
1ec753f [Qt] ensure socket is set to NULL in PaymentServer::ipcSendCommandLine (Philip Kaufmann)
814429d [Qt] add BIP70/BIP71 constants for all messages and mime types (Philip Kaufmann)
b82695b [Qt] make PaymentServer::ipcParseCommandLine void (Philip Kaufmann)
 2014-12-09 10:16:16 +01:00
Wladimir J. van der Laan 4f85383cb3 Merge pull request #5409 
65b0328 newlines in strings are invalid JSON (Ryan X. Charles)
 2014-12-09 10:07:35 +01:00
Wladimir J. van der Laan 4b5b263ac0 Merge pull request #5434 
683dc40 Disable SSLv3 (in favor of TLS) for the RPC client and server. (Gregory Maxwell)
 2014-12-08 13:31:13 +01:00
Wladimir J. van der Laan 053038e5ba Merge pull request #5436 
11d7a7d [RPC] add rpc-test for http keep-alive (persistent connections) (Jonas Schnelli)
 2014-12-08 09:25:18 +01:00
Wladimir J. van der Laan 4d8bea0dc3 Merge pull request #5435 
a26bf47 Add a new test for FormatParagraph (string longer than the default width). (Pavel Janík)
83b81f6 Format paragraphs properly - count the space between words. (Pavel Janík)
 2014-12-08 09:19:35 +01:00
Wladimir J. van der Laan b5fa132329 Merge pull request #5181 
afd4b94 Move CMerkleBlock and CPartialMerkleTree to their own file (Matt Corallo)
 2014-12-05 16:50:48 +01:00
Wladimir J. van der Laan dbf1dc239e Merge pull request #5398 
8a20cd3 prioritisetransaction RPC: Restore compatibility with existing implementations by using satoshis for fee offset rather than BTC (Luke Dashjr)
 2014-12-05 11:41:06 +01:00
Wladimir J. van der Laan 800458eddd Merge pull request #5408 
35e408f Regard connection failures as attempt for addrman (Wladimir J. van der Laan)
 2014-12-05 11:39:18 +01:00
Wladimir J. van der Laan 7a88e3b0fc Merge pull request #5425 
87bddb7 Squashed 'src/secp256k1/' changes from ad2028f..b0210a9 (Pieter Wuille)
ffe3291 Remove gmp dependency and doc mentions (Pieter Wuille)
 2014-12-05 11:30:26 +01:00
Wladimir J. van der Laan 7d42644dda Merge pull request #5207 
8487790 bitcoin-tx: Add the "-txid" option. Also add the hex-encoded transaction to the JSON output as the "hex" property. (mruddy)
 2014-12-05 11:24:39 +01:00
Wladimir J. van der Laan c78a18087f Merge pull request #5308 
60d1ecd change nSubsidy's type from int64_t to CAmount (HarryWu)
 2014-12-05 11:11:24 +01:00
Wladimir J. van der Laan c932c47e34 Merge pull request #5329 
199627c [REST] adding basic documentation (Jonas Schnelli)
 2014-12-05 11:06:50 +01:00
Wladimir J. van der Laan 68705996a9 Merge pull request #5419 
12a49ca Limit the number of new addressses to accumulate (Pieter Wuille)
 2014-12-05 11:01:19 +01:00
Wladimir J. van der Laan 9ddc8c63ab Merge pull request #5394 
307f7d4 Report script evaluation failures in log and reject messages (Pieter Wuille)
 2014-12-04 16:43:35 +01:00
Wladimir J. van der Laan 4d2ecc4f94 Merge pull request #5417 
be7b0bf Package libqt5core5 replaced with libqt5core5a (LongShao007)
 2014-12-04 16:25:16 +01:00
Wladimir J. van der Laan a0417b8cc8 Merge pull request #5306 
d227011 MOVEONLY: core/ -> primitives/ (Luke Dashjr)
 2014-12-03 12:05:43 +01:00
Wladimir J. van der Laan c2d7c6134e Merge pull request #5407 
9e56532 Coinbases-in-mempool regression test (Gavin Andresen)
 2014-12-03 10:51:36 +01:00
Wladimir J. van der Laan 7eb0667384 Merge pull request #5403 
c5b390b Make comments in main an init doxygen compatible (Michael Ford)
 2014-12-03 10:48:53 +01:00
Wladimir J. van der Laan 133344208c Merge pull request #5400 
32b93a1 Extra explanation for getchaintips (Pieter Wuille)
 2014-12-03 10:17:13 +01:00
Wladimir J. van der Laan 1863deae5f Merge pull request #5406 
5fdbe67 Add 0.10 release notes on improvement to signing security. (Gregory Maxwell)
 2014-12-03 10:03:57 +01:00
Wladimir J. van der Laan 35e408f8a4 Regard connection failures as attempt for addrman 
This avoids connecting to them again too soon in ThreadOpenConnections.

Make an exception for connection failures to the proxy as these
shouldn't affect the status of specific nodes.
 2014-12-02 17:54:16 +01:00
Wladimir J. van der Laan 90f7aa7778 Fix rest.py test after #5376 2014-12-02 15:57:20 +01:00
Wladimir J. van der Laan fec0d100d5 Merge pull request #5376 
8a5c951 [REST] make selection of output-format mandatory, support dot url syntax (Jonas Schnelli)
 2014-12-02 15:34:43 +01:00
Wladimir J. van der Laan 7026cbd6db Merge pull request #5379 
01dc2d8 [REST] add REST interface tests in rpc-test section (Jonas Schnelli)
 2014-12-01 20:24:50 +01:00
Wladimir J. van der Laan f0877f8b62 Merge pull request #5227 
4cdaa95 Resize after succesful result (Pieter Wuille)
9d8604f Header define style cleanups (Pieter Wuille)
a53fd41 Deterministic signing (Pieter Wuille)
3060e36 Add the RFC6979 PRNG (Pieter Wuille)
a8f5087 Add HMAC-SHA256 (Pieter Wuille)
36fa4a7 Split up crypto/sha2 (Pieter Wuille)
 2014-12-01 14:57:58 +01:00
Wladimir J. van der Laan 89151d9f29 Merge pull request #5390 
43422a0 [Qt] Fix wallet-lock in CWallet::GetAccountAddresses(..) (Cozz Lovan)
 2014-12-01 12:44:26 +01:00
Wladimir J. van der Laan 0ddf4416cc Merge pull request #5386 
1b91be4 Report status of chain tips (Pieter Wuille)
 2014-12-01 11:49:35 +01:00
Wladimir J. van der Laan b248a38aa5 Merge pull request #5388 
1cf23f6 Update the intent on SI-style separators. (21E14)
 2014-12-01 10:17:58 +01:00
Wladimir J. van der Laan d7c8a830c4 Merge pull request #5316 
f86a24b Move `setmocktime` to hidden category (Wladimir J. van der Laan)
bd9aebf Introduce a hidden category (Pieter Wuille)
0dd06b2 Delay writing block indexes in invalidate/reconsider (Pieter Wuille)
9b0a8d3 Add 'invalidateblock' and 'reconsiderblock' RPC commands. (Pieter Wuille)
 2014-11-28 11:19:15 +01:00
Wladimir J. van der Laan f86a24b368 Move setmocktime to hidden category 
Another testing-only potential footgun command.
 2014-11-28 10:57:14 +01:00
Wladimir J. van der Laan 631e698bb7 Merge pull request #5374 
a53d16a Use complete path to include bitcoin-config.h. (Pavel Janík)
 2014-11-28 09:46:39 +01:00
Wladimir J. van der Laan 2adce1f716 Merge pull request #5385 
57be955 Remove -printblock, -printblocktree, and -printblockindex (Pieter Wuille)
 2014-11-27 13:26:36 +01:00
Wladimir J. van der Laan faa1623a44 Merge pull request #5384 
e3f315a Fix python usage for arch's broken maintainers (Matt Corallo)
 2014-11-27 12:11:07 +01:00
Wladimir J. van der Laan 9ff0bc9beb Merge pull request #5158 
9ec75c5 Add a locking mechanism to IsInitialBlockDownload to ensure it never goes from false to true. (Ruben Dario Ponticelli)
a2d0fc6 Fix IsInitialBlockDownload which was broken by headers first. (Ruben Dario Ponticelli)
 2014-11-26 15:09:03 +01:00
Wladimir J. van der Laan b031137977 Merge pull request #5273 
cd4d3f1 Win32: change buffer size for gethotsname in Discover() (Philip Kaufmann)
8fa0494 Win32: log addresses found in Discover() calls (Philip Kaufmann)
 2014-11-26 14:36:50 +01:00
Wladimir J. van der Laan 108b19f7ef Merge pull request #5326 
5dc713b [REST] set REST API behind "-rest" option (Jonas Schnelli)
78bdc81 [REST] give an appropriate response in warmup phase (Jonas Schnelli)
210eba9 [REST] fix headersonly flag for BINARY responses (Jonas Schnelli)
 2014-11-26 14:30:11 +01:00
Wladimir J. van der Laan 8ba38aba42 qt: Update translations from transifex 2014-11-26 13:47:49 +01:00
Wladimir J. van der Laan 53a87c0355 Merge pull request #5321 
34559c7 Make PruneBlockIndexCandidates safer (Pieter Wuille)
cca48f6 Reset setBlockIndexCandidates once block index db loaded (21E14)
 2014-11-26 13:31:03 +01:00
Wladimir J. van der Laan 4baa9f0c9b Merge pull request #5323 
a328dd6 [Qt] small changes to sendcoinsdialog (Philip Kaufmann)
 2014-11-26 13:00:50 +01:00
Wladimir J. van der Laan 686fa79cae Merge pull request #5363 
7a9cf80 docs: add/update docs for osx dmg signing (Cory Fields)
914868a build: add a deterministic dmg signer (Cory Fields)
d69ed2b build: Clean up the dmg layout (Cory Fields)
2f327a3 build: add the deploydir target for gitian (Cory Fields)
 2014-11-26 11:29:23 +01:00
Wladimir J. van der Laan ce7204bf2e Merge pull request #5371 
dfef929 release: update docs to reflect new layout (Cory Fields)
52bb7a7 gitian: update descriptors to use a sane uniform output (Cory Fields)
 2014-11-26 11:15:35 +01:00
Wladimir J. van der Laan 91eaedd4ce Merge pull request #5370 
b7f2cdc build: disable static lib stripping during osx make install-strip (Cory Fields)
 2014-11-26 11:07:25 +01:00
Wladimir J. van der Laan 124b4895b8 Merge pull request #5209 
9b1627d [Wallet] Reduce minTxFee for transaction creation to 1000 satoshis (Cozz Lovan)
 2014-11-26 10:58:20 +01:00
Wladimir J. van der Laan e6751ca68a Merge pull request #5361 
3223179 libbitcoinconsensus: don't require any global constructors (Cory Fields)
 2014-11-26 10:44:42 +01:00
Wladimir J. van der Laan 70f9e33fa0 Merge pull request #5340 
c8ed613 Include missing config/bitcoin-config.h. (Pavel Janík)
494f6e7 Check for strnlen and provide it if it is not found. (Pavel Janík)
 2014-11-26 09:51:05 +01:00
Wladimir J. van der Laan ac0b2393a4 Merge pull request #5351 
3d0a1ce Process help and version arguments before datadir. (Pavel Janík)
 2014-11-25 14:44:30 +01:00
Wladimir J. van der Laan 397b9011c9 Merge pull request #5241 
a206950 Introduce separate flushing modes (Pieter Wuille)
51ce901 Improve chainstate/blockindex disk writing policy (Pieter Wuille)
 2014-11-25 12:18:00 +01:00
Wladimir J. van der Laan 97bef1203d Merge pull request #5362 
d61dc25 qt: osx: fix hidden symbol visibility (Cory Fields)
 2014-11-25 10:22:01 +01:00
Wladimir J. van der Laan 6f9e67aca7 Merge pull request #5358 
3c77714 Make -proxy set all network types, avoiding a connect leak. (Gregory Maxwell)
 2014-11-24 15:30:31 +01:00
Wladimir J. van der Laan 1ee685f984 Merge pull request #5154 
730b1ed Check pindexBestForkBase for null (21E14)
 2014-11-24 15:29:52 +01:00
Wladimir J. van der Laan f24bcce2ac Merge pull request #1816 
b867e40 CreateNewBlock: Stick height in coinbase so we pass template sanity check (Luke Dashjr)
60755db submitblock: Check for duplicate submissions explicitly (Luke Dashjr)
bc6cb41 QA RPC tests: Add tests block block proposals (Luke Dashjr)
9765a50 Implement BIP 23 Block Proposal (Luke Dashjr)
3dcbb9b Abstract DecodeHexBlk and BIP22ValidationResult functions out of submitblock (Luke Dashjr)
132ea9b miner_tests: Disable checkpoints so they don't fail the subsidy-change test (Luke Dashjr)
df08a62 TestBlockValidity function for CBlock proposals (used by CreateNewBlock) (Luke Dashjr)
4ea1be7 CreateNewBlock and miner_tests: Also check generated template is valid by CheckBlockHeader, ContextualCheckBlockHeader, CheckBlock, and ContextualCheckBlock (Luke Dashjr)
a48f2d6 Abstract context-dependent block checking from acceptance (Luke Dashjr)
 2014-11-24 14:43:10 +01:00
Wladimir J. van der Laan 6582f323f0 Merge pull request #5224 
f321d6b Add key generation/verification to ECC sanity check (Pieter Wuille)
d0c41a7 Add sanity check after key generation (Pieter Wuille)
 2014-11-24 14:39:25 +01:00
Wladimir J. van der Laan dfc8e1432a Merge pull request #5309 
4574248 [Qt] minor ordering cleanup after new fee selection (Philip Kaufmann)
a01fa30 minor style cleanup after HTTP rest interface merge (Philip Kaufmann)
 2014-11-24 14:35:50 +01:00
Wladimir J. van der Laan c24d07554b Merge pull request #5356 
7357893 Prioritize and display -testsafemode status in UI (dexX7)
 2014-11-24 08:52:31 +01:00
Wladimir J. van der Laan a574189e2a Merge pull request #4727 
246659a gitian: make tarballs deterministic and nuke .la files from build output (Cory Fields)
c54d647 travis: let travis use shared libs for tests (Cory Fields)
4bbbdf3 gitian: quick docs update (Cory Fields)
1aead42 gitian: descriptors overhaul (Cory Fields)
5f93ec2 depends: Add a package for qt4.6. Linux uses it by default. (Cory Fields)
4302fa6 depends: Use pic for all linux dependencies (Cory Fields)
 2014-11-21 17:42:46 +01:00
Wladimir J. van der Laan f2ada138c2 Merge pull request #5170 
092b58d CBlockIndex::GetBlockWork() + GetProofIncrement(nBits) -> GetBlockProof(CBlockIndex) (jtimon)
22c4272 MOVEONLY: Move void UpdateTime() from pow.o to miner.o (plus fix include main.h -> chain.h) (jtimon)
 2014-11-21 14:33:22 +01:00
Wladimir J. van der Laan ca6fb4e885 Merge pull request #5247 
ca81587 Test the exact order of CHECKMULTISIG sig/pubkey evaluation (Peter Todd)
98b135f Make STRICTENC invalid pubkeys fail the script rather than the opcode. (Pieter Wuille)
 2014-11-21 14:21:56 +01:00
Wladimir J. van der Laan cb83af9937 Merge pull request #5318 
77c38bb Truthier error message when rpcpassword is missing (Glenn Willen)
 2014-11-21 13:53:57 +01:00
Wladimir J. van der Laan 37c47e1809 Merge pull request #5333 
e4ef724 Edited rpc-tests to run python script not shell script. (mrbandrews)
189fb52 Port of wallet.sh to python (wallet.py). (mrbandrews)
 2014-11-21 13:48:41 +01:00
Wladimir J. van der Laan 9c3572b0ab Merge pull request #5317 
8656dbb Port/fix txnmall.sh regression test (Gavin Andresen)
 2014-11-21 13:43:48 +01:00
Wladimir J. van der Laan 4a106eeb33 qt: English translation update 2014-11-21 10:24:30 +01:00
Wladimir J. van der Laan db5308f447 Merge pull request #5322 
aabe61c [Qt] explicitly call proxy in GUI settings SOCKS5 proxy (Philip Kaufmann)
 2014-11-21 10:21:56 +01:00
Wladimir J. van der Laan 216685a6df Merge pull request #5332 
f618577 build: fix link error on some platforms. Fixes #5235 (Cory Fields)
 2014-11-21 10:03:17 +01:00
Wladimir J. van der Laan 5c4dffd188 Merge pull request #5270 
57425a2 Check block header before accepting it. (Daniel Kraft)
 2014-11-20 15:41:58 +01:00
Wladimir J. van der Laan cf9c4887f1 Merge pull request #5324 
72fb3d2 Update comments in src/rpc* to be doxygen compatible (Michael Ford)
 2014-11-20 14:40:42 +01:00
Wladimir J. van der Laan 5c6b384502 Merge pull request #5320 
e0a25c5 qt: Make askpassphrase dialog behave more sanely (Wladimir J. van der Laan)
 2014-11-20 13:48:38 +01:00
Wladimir J. van der Laan 9842ed465b Merge pull request #5235 
9eb5a5f build: pad header for osx libs (Cory Fields)
9ed8979 build: fix static dll link for mingw (Cory Fields)
19df238 build: shared lib build should work reasonably well now (Cory Fields)
269efa3 build: add quick consensus lib tests (Cory Fields)
cdd36c6 build: add --with-libs so that libs are optional (Cory Fields)
2cf5f16 build: add libbitcoinconsensus files and hook up the lib build (Cory Fields)
ee64c53 build: remove internal/protected build attribute checks (Cory Fields)
f36a40f build: check visibility attributes (Cory Fields)
811a765 build: mingw needs libssp for hardening with dlls (Cory Fields)
e0077de build: make a distinction between static app ldflags and static lib ldflags (Cory Fields)
 2014-11-20 13:19:47 +01:00
Wladimir J. van der Laan e0a25c54eb qt: Make askpassphrase dialog behave more sanely 
Set minimum sizes appropriately, and make sure that they
are enforced. Replaces #5226.
 2014-11-20 12:28:34 +01:00
Wladimir J. van der Laan b5d1b10929 doc: add libgmp dependency for secp256k1 
Also reorganize the document a bit.
 2014-11-19 16:31:28 +01:00
Wladimir J. van der Laan b7fe9cd04c Merge pull request #5200 
c1c9d5b [Qt] Add Smartfee to GUI (Cozz Lovan)
e7876b2 [Wallet] Prevent user from paying a non-sense fee (Cozz Lovan)
ed3e5e4 [Wallet] Add global boolean whether to pay at least the custom fee (default=true) (Cozz Lovan)
0ed9675 [Wallet] Add global boolean whether to send free transactions (default=true) (Cozz Lovan)
 2014-11-19 16:27:04 +01:00
Wladimir J. van der Laan 18832ff8e1 Merge pull request #5313 
230f7a8 Remove unused ecwrapper code (Pieter Wuille)
 2014-11-19 15:24:01 +01:00
Wladimir J. van der Laan e587ecd8a6 Merge pull request #5296 
0ceab00 [Qt, OSX] move QProgressBarMac to guiutil.h (Jonas Schnelli)
6093aa1 [Qt, OSX] QProgressBar CPU-Issue workaround (Jonas Schnelli)
 2014-11-19 14:58:39 +01:00
Wladimir J. van der Laan 271061242b Merge pull request #5220 
f9e40fb revert part of 9eda1620b (Cory Fields)
4300876 build: secp256k1 as a subdir, since it's required (Cory Fields)
0dc8613 build: fixup configure to not export anything (Cory Fields)
54566de depends: quit exporting in config.site (Cory Fields)
ff1e5ba depends: add gmp package (Cory Fields)
cf61b54 Don't use bashisms in configure (Pieter Wuille)
dffb8f8 Use libsecp256k1 in key.cpp (Pieter Wuille)
4c97c64 Do not use EC code in global constructors (Pieter Wuille)
07a9901 Always build and link libsecp256k1 (Pieter Wuille)
d48555b Squashed 'src/secp256k1/' content from commit ad2028f (Pieter Wuille)
7a7e109 Delete src/secp256k1 before subtree import (Pieter Wuille)
 2014-11-19 12:02:29 +01:00
Wladimir J. van der Laan bf217e3adc Merge pull request #5279 
6c8c704 [docs] Add mini-"howto" using Qt Creator (osx) (Jonas Schnelli)
 2014-11-19 10:53:32 +01:00
Wladimir J. van der Laan 5716808ca7 Merge pull request #5300 
a7f2941 [Qt, OSX] fix usage of osx 10.8+ user notification center (Jonas Schnelli)
 2014-11-19 10:51:59 +01:00
Wladimir J. van der Laan 3b4c7cdfc3 Merge pull request #5291 
7ab4358 Update bash-completion for v0.10 (Christian von Roques)
 2014-11-19 10:11:49 +01:00
Wladimir J. van der Laan 27b2288f33 Merge pull request #5290 
5d60b69 Coin Control: Make list mode default (Luke Dashjr)
4ff81d6 Bugfix: Clarify coin control dialog labels (Luke Dashjr)
 2014-11-18 14:41:02 +01:00
Wladimir J. van der Laan 8adf457047 Merge pull request #5212 
219a147 script: check ScriptError values in script tests (Cory Fields)
ab9edbd script: create sane error return codes for script validation and remove logging (Cory Fields)
 2014-11-17 21:15:09 +01:00
Wladimir J. van der Laan 20e4f654f5 Merge pull request #5237 
2db4c8a Fix node ranges in the test framework. (Daniel Kraft)
 2014-11-17 17:20:32 +01:00
Wladimir J. van der Laan 1f0436f8cb Merge pull request #5293 
c63a73d Update comments in util to be doxygen compatible (Michael Ford)
 2014-11-17 17:17:46 +01:00
Wladimir J. van der Laan dbbe00f008 Merge pull request #5289 
5617267 Fix typo in listreceivedbyaddress and listaccounts  help text (Michael Ford)
 2014-11-17 17:14:38 +01:00
Wladimir J. van der Laan 47cb3606a3 Merge pull request #5292 
7329fdd Update comments in txmempool to be doxygen compatible (Michael Ford)
 2014-11-17 16:36:45 +01:00
Wladimir J. van der Laan 09481eec88 Merge pull request #5282 
a7af983 don't override dir() in qa rpc tests (Bryan Bishop)
 2014-11-17 11:25:08 +01:00
Wladimir J. van der Laan 19f2aa9487 Merge pull request #5287 
7335ca1 [Qt] Fix height of BitcoinAmountField (Cozz Lovan)
 2014-11-17 11:09:08 +01:00
Wladimir J. van der Laan 3d3ce7421e Merge pull request #5198 
1c0aa91 Update serialize comments to be doxygen compatible (Michael Ford)
 2014-11-13 19:41:56 +01:00
Wladimir J. van der Laan 6c5c06eff7 Merge pull request #5252 
b9a36b1 Make comments in /src/script doxygen compatible (Michael Ford)
 2014-11-13 17:51:57 +01:00
Wladimir J. van der Laan ed98a6284b Merge pull request #5203 
0d91ae3 The first thing that SelectParams does is call SelectBaseParams. Therefore, we do not need to call SelectBaseParams immediately prior to calling SelectParams. (mruddy)
 2014-11-13 13:14:45 +01:00
Wladimir J. van der Laan 15bcc7055d Merge pull request #5268 
c8b115e travis: temporarily disable the forknotify test (Cory Fields)
1877390 depends: cleanup better after qt and force a bump (Cory Fields)
560e996 travis: attempt to fix unlikely build issue (Cory Fields)
 2014-11-13 11:01:50 +01:00
Wladimir J. van der Laan 0c7862e968 Merge pull request #5161 
845c86d Do not use third party services for IP detection. (Gregory Maxwell)
 2014-11-12 18:35:45 +01:00
Wladimir J. van der Laan 7ffb880775 Merge pull request #5240 
5e2dcae gather_inputs: use correct variable in error message (dexX7)
 2014-11-12 17:43:20 +01:00
Wladimir J. van der Laan 83f5daf2fe Merge pull request #5245 
d52f072 Don't show wallet options in the preferences menu when running with -disablewallet (sinetek)
 2014-11-10 20:51:38 +01:00
Wladimir J. van der Laan af3ec17f67 Merge pull request #5246 
a8a5e01 Adding license. (sinetek)
 2014-11-10 17:31:54 +01:00