aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-10-22Revert "Switch to using raw_utf8"Jeff Garzik
This reverts commit 2ecb7555a9df1e843fd25f588819e4ca1d94b266.
2013-10-22Merge pull request #2740 from constantined/constantinedGavin Andresen
UTF-8 support for JSON-RPC
2013-10-22Merge pull request #3125 from Diapolo/splash_testnetWladimir J. van der Laan
splashscreen: use TestNet() instead of unneeded string processing
2013-10-22splashscreen: use TestNet() instead of unneeded string processingPhilip Kaufmann
2013-10-21Merge pull request #2738 from jgarzik/op_returnGavin Andresen
Relay OP_RETURN data TxOut as standard transaction type.
2013-10-22Merge branch 'bugfix_unknownoutputs' of git://github.com/luke-jr/bitcoinGavin Andresen
Conflicts: src/wallet.cpp Fixed LogPrint/printf merge conflict.
2013-10-21Merge pull request #2929 from Krellan/addrlocalWladimir J. van der Laan
Additional field to RPC getpeerinfo output: addrlocal
2013-10-21Adding new "addrlocal" field to RPC getpeerinfo.Josh Lehan
The existing CNode::addrLocal member is revealed to the user, as an address string, similar to the existing "addr" field. Instead of showing garbage or empty string, it simply will not appear in the output if local address not known yet.
2013-10-20Merge pull request #3104 from Diapolo/rpcssl-defaultciphersGavin Andresen
update default -rpcsslciphers to include TLSv1.2
2013-10-20Merge pull request #3074 from laanwj/2013_10_remove_default_key_1Gavin Andresen
Remove automatic update of default key
2013-10-20Merge pull request #2840 from sipa/nosendlockGavin Andresen
Allow SendMessages to run partially without cs_main
2013-10-20Merge pull request #3046 from sarchar/lockedpage-changeGavin Andresen
Changing LockedPageManager to use a managed instance
2013-10-20Merge pull request #3117 from gavinandresen/debuglockprintGavin Andresen
Make -DDEBUGLOCKORDER + -debug less noisy
2013-10-20Merge pull request #3119Pieter Wuille
db0e8cc Bump Year Number to 2013 (super3)
2013-10-20Bump Year Number to 2013super3
2013-10-20Merge pull request #3108 from Diapolo/paymentserver_styleWladimir J. van der Laan
paymentserver: style fixes / cleanup
2013-10-20Merge pull request #3109 from laanwj/2013_10_remove_walletstackWladimir J. van der Laan
qt: merge walletstack and walletframe
2013-10-20Changing LockedPageManager to use a managed instanceChuck
This ensures the allocator is ready no matter when it's needed (as some STL implementations allocate in constructors -- i.e., MSVC's STL in debug builds). Using boost::call_once to guarantee thread-safe static initialization. Adding some comments describing why the change was made. Addressing deinitialization of the LockedPageManager object by initializing it in a local static initializer and adding an assert in the base's destructor.
2013-10-19Merge pull request #3106 from super3/masterGavin Andresen
Added better WalletTools description.
2013-10-19Merge pull request #2945 from gmaxwell/fee-logic_encourage_sweepingGavin Andresen
[Fee logic] Don't count txins for priority to encourage sweeping.
2013-10-19Merge pull request #2884 from gavinandresen/canonicalsizes2Gavin Andresen
Reject non-canonically-encoded CompactSize
2013-10-19Merge pull request #3008 from gavinandresen/CENTruleGavin Andresen
Two small free transaction policy changes
2013-10-20Make -DDEBUGLOCKORDER + -debug less noisyGavin Andresen
Print out every mutex lock/unlock if compiled -DDEBUGLOCKORDER only if -debug=lock is set.
2013-10-19qt: remove awkward way of setting GUI pagesWladimir J. van der Laan
Selecting the button for a pages was going through bitcoingui->walletframe->walletview->bitcoingui. Because of this, the actions for the pages had to be exposed on the BitcoinGUI object.
2013-10-19paymentserver: style fixes / cleanupPhilip Kaufmann
- rename reportError() into message() to be in line with our default message() signal/slot naming (and can be used for all types of messages) - rename some QStrings to not collide with message() function - add a missing message for malformed URIs that IS also used in BitcoinGUI - fix / extend some comments and misc style fixes
2013-10-18Merge pull request #3103 from gavinandresen/appbundleGavin Andresen
make appbundle target for OSX development
2013-10-18qt: merge walletstack and walletframeWladimir J. van der Laan
There were too many levels of indirection here, and the functionality of walletframe and walletstack can easily be merged. This commit merges the two which cuts a lot of lines of boilerplate code.
2013-10-18Merge pull request #3101 from Diapolo/sendcoinsentryWladimir J. van der Laan
add SendCoinsEntry::updateLabel() function
2013-10-17Added better WalletTools description.super3
2013-10-17update default -rpcsslciphers to include TLSv1.2Philip Kaufmann
- this extends the accepted ciphersuites with TLSv1.2 ones - also removes !AH, as I could not find documentation on it and the change did not result in a changed ciphersuite list (checked via openssl ciphers -v) - closes #3096 (which also contains more details)
2013-10-17Merge pull request #3084 from Diapolo/clientmodelWladimir J. van der Laan
clientmodel: remove 2 hard-coded values, use CChainParams instead
2013-10-16Merge pull request #2981 from gmaxwell/tor2onionGavin Andresen
Rename -tor to -onion to better reflect what it does.
2013-10-16Merge pull request #2950 from pstratem/walletloadGavin Andresen
Walletload
2013-10-16Merge pull request #2645 from sipa/inlinesighashGavin Andresen
Inline signature serializer
2013-10-16add SendCoinsEntry::updateLabel() functionPhilip Kaufmann
- makes the code for updating a label reusable - no functional changes
2013-10-16Merge pull request #3098 from super3/masterWladimir J. van der Laan
Finished /Contrib Index. Standardized READMEs.
2013-10-15Merge pull request #3069 from Diapolo/fix_addressbookWladimir J. van der Laan
don't touch addressbook when using secure payment-requests
2013-10-15Merge pull request #3094 from Diapolo/btcamountfieldGavin Andresen
make BitcoinAmountField::setReadOnly() usable
2013-10-15Finished /Contrib Index. Standardized READMEs.super3
File and Link Fix.
2013-10-15Merge pull request #3097 from super3/masterGavin Andresen
Broken Link in /Doc README
2013-10-15Broken Link in /Doc READMEShawn Wilkinson
#3092 removed readme-qt.md, but it was still listed in the index for the /doc README.
2013-10-15Merge pull request #3085 from super3/masterGavin Andresen
Documentation Cleanup and Contrib Index
2013-10-15Merge pull request #3086 from Michagogo/update-pgpGavin Andresen
Update michagogo's gitian pgp key, adding UIDs
2013-10-15Merge pull request #3092 from laanwj/2013_10_remove_readme_qtGavin Andresen
doc: remove readme-qt.md
2013-10-15Merge pull request #3083 from sipa/chainlocatorGavin Andresen
CBlockLocator improvements & move to core
2013-10-15Push down cs_main locking in ProcessMessagePieter Wuille
2013-10-15Run node deletions outside of cs_vNodesPieter Wuille
2013-10-15Allow SendMessages to run partially without cs_mainPieter Wuille
SendMessages() tries to acquire a cs_main lock now, but this isn't nessecary for much of its functionality. Move those parts out of the locked section, so they can always be performed, and we hold cs_main for a shorter time.
2013-10-15doc: build with qt5 is currently not possibleWladimir J. van der Laan
Add as a separate commit so that it can be easily reverted once Qt5 is supported again.
2013-10-15doc: remove readme-qt.mdWladimir J. van der Laan
Now that autotools is used as a build system there is nothing special about building the GUI anymore. Merge the salvageable parts into build-unix.md