aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3104 from Diapolo/rpcssl-defaultciphersGavin Andresen2013-10-202-2/+2
|\
| * update default -rpcsslciphers to include TLSv1.2Philip Kaufmann2013-10-172-2/+2
* | Merge pull request #3074 from laanwj/2013_10_remove_default_key_1Gavin Andresen2013-10-201-19/+0
|\ \
| * | wallet: remove automatic update of default keyWladimir J. van der Laan2013-10-101-19/+0
* | | Merge pull request #2840 from sipa/nosendlockGavin Andresen2013-10-202-22/+38
|\ \ \
| * | | Push down cs_main locking in ProcessMessagePieter Wuille2013-10-151-5/+18
| * | | Run node deletions outside of cs_vNodesPieter Wuille2013-10-151-1/+2
| * | | Allow SendMessages to run partially without cs_mainPieter Wuille2013-10-151-16/+18
* | | | Merge pull request #3046 from sarchar/lockedpage-changeGavin Andresen2013-10-204-11/+45
|\ \ \ \
| * | | | Changing LockedPageManager to use a managed instanceChuck2013-10-204-11/+45
* | | | | Merge pull request #3117 from gavinandresen/debuglockprintGavin Andresen2013-10-201-2/+2
|\ \ \ \ \
| * | | | | Make -DDEBUGLOCKORDER + -debug less noisyGavin Andresen2013-10-201-2/+2
* | | | | | Merge pull request #3119Pieter Wuille2013-10-2052-52/+52
|\ \ \ \ \ \
| * | | | | | Bump Year Number to 2013super32013-10-2052-52/+52
* | | | | | | Merge pull request #3108 from Diapolo/paymentserver_styleWladimir J. van der Laan2013-10-203-26/+34
|\ \ \ \ \ \ \
| * | | | | | | paymentserver: style fixes / cleanupPhilip Kaufmann2013-10-193-26/+34
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #3109 from laanwj/2013_10_remove_walletstackWladimir J. van der Laan2013-10-209-340/+128
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | qt: remove awkward way of setting GUI pagesWladimir J. van der Laan2013-10-195-17/+23
| * | | | | | qt: merge walletstack and walletframeWladimir J. van der Laan2013-10-187-324/+106
| |/ / / / /
* | | | | | Merge pull request #2945 from gmaxwell/fee-logic_encourage_sweepingGavin Andresen2013-10-192-3/+23
|\ \ \ \ \ \
| * | | | | | [Fee logic] Don't count txins for priority to encourage sweeping.Gregory Maxwell2013-09-172-3/+23
* | | | | | | Merge pull request #2884 from gavinandresen/canonicalsizes2Gavin Andresen2013-10-193-1/+66
|\ \ \ \ \ \ \
| * | | | | | | Reject non-canonically-encoded sizesGavin Andresen2013-08-093-1/+66
* | | | | | | | Merge pull request #3008 from gavinandresen/CENTruleGavin Andresen2013-10-192-9/+13
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Lower maximum size for free transaction creationGavin Andresen2013-10-041-4/+5
| * | | | | | | Remove CENT-output free transaction rule when relayingGavin Andresen2013-10-042-5/+8
* | | | | | | | Merge pull request #3101 from Diapolo/sendcoinsentryWladimir J. van der Laan2013-10-182-6/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | add SendCoinsEntry::updateLabel() functionPhilip Kaufmann2013-10-162-6/+19
* | | | | | | | | Merge pull request #3084 from Diapolo/clientmodelWladimir J. van der Laan2013-10-171-3/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | clientmodel: remove 2 hard-coded values, use CChainParams insteadPhilip Kaufmann2013-10-151-3/+1
* | | | | | | | | Merge pull request #2981 from gmaxwell/tor2onionGavin Andresen2013-10-161-6/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rename -tor to -onion to better reflect what it does.Gregory Maxwell2013-09-081-6/+11
* | | | | | | | | | Merge pull request #2950 from pstratem/walletloadGavin Andresen2013-10-164-8/+66
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | comment explaining new wallet format for key/wkey entriesphantomcircuit2013-10-121-0/+6
| * | | | | | | | | | verify vchPubKey matches calculated public key unless fSkipCheck is setpatrick s2013-08-291-0/+6
| * | | | | | | | | | improve wallet load time by removing duplicated calls to EC_KEY_check_key and...patrick s2013-08-284-8/+54
* | | | | | | | | | | Merge pull request #2645 from sipa/inlinesighashGavin Andresen2013-10-165-48/+224
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Inline signature serializerPieter Wuille2013-09-285-48/+224
* | | | | | | | | | | Merge pull request #3069 from Diapolo/fix_addressbookWladimir J. van der Laan2013-10-151-14/+18
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | don't touch addressbook when using secure payment-requestsPhilip Kaufmann2013-10-111-14/+18
* | | | | | | | | | | | Merge pull request #3094 from Diapolo/btcamountfieldGavin Andresen2013-10-153-9/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | make BitcoinAmountField::setReadOnly() usablePhilip Kaufmann2013-10-153-9/+5
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3083 from sipa/chainlocatorGavin Andresen2013-10-156-144/+86
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Move CBlockLocator to core.hPieter Wuille2013-10-152-38/+34
| * | | | | | | | | | | Reimplement CBlockLocator's chain-related logic in CChain.Pieter Wuille2013-10-155-108/+54
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #3080 from Diapolo/sendcoins-paymentreqWladimir J. van der Laan2013-10-153-16/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | paymentserver: use own HTML-esc / add new header constPhilip Kaufmann2013-10-111-6/+3
| * | | | | | | | | | | sendcoinsdialog: display real failed address stringPhilip Kaufmann2013-10-111-2/+1
| * | | | | | | | | | | sendcoinsentry: small clear() and setValue() changesPhilip Kaufmann2013-10-111-8/+17
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | replace %zu with %"PRIszu" macro to prevent compiler warningsPhilip Kaufmann2013-10-151-9/+9