aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | 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 #3103 from gavinandresen/appbundleGavin Andresen2013-10-181-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | make appbundle target for OSX developmentGavin Andresen2013-10-081-3/+3
* | | | | | | | | | | | | | | | 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-162-9/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Rename -tor to -onion to better reflect what it does.Gregory Maxwell2013-09-082-9/+14
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | 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 #3098 from super3/masterWladimir J. van der Laan2013-10-1617-49/+102
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Finished /Contrib Index. Standardized READMEs.super32013-10-1517-49/+102
* | | | | | | | | | | | | | | | | | 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 #3097 from super3/masterGavin Andresen2013-10-151-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Broken Link in /Doc READMEShawn Wilkinson2013-10-151-2/+1
* | | | | | | | | | | | | | | | | | | Merge pull request #3085 from super3/masterGavin Andresen2013-10-156-39/+67
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Documentation Cleanup in /Docsuper32013-10-126-39/+67
* | | | | | | | | | | | | | | | | | | Merge pull request #3086 from Michagogo/update-pgpGavin Andresen2013-10-151-25/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Update michagogo's gitian pgp key, adding UIDsMicha2013-10-121-25/+57
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #3092 from laanwj/2013_10_remove_readme_qtGavin Andresen2013-10-152-103/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | doc: build with qt5 is currently not possibleWladimir J. van der Laan2013-10-151-5/+1
| * | | | | | | | | | | | | | | | | | | doc: remove readme-qt.mdWladimir J. van der Laan2013-10-152-103/+29
* | | | | | | | | | | | | | | | | | | | 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
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #3093 from Diapolo/printf_formatWladimir J. van der Laan2013-10-151-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | replace %zu with %"PRIszu" macro to prevent compiler warningsPhilip Kaufmann2013-10-151-9/+9
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #2924 from sje397/TrafficGraphWladimir J. van der Laan2013-10-1513-9/+618
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Add network traffic graphScott Ellis2013-10-1413-9/+618
* | | | | | | | | | | | | | | | | | | Merge pull request #3091 from Diapolo/miscWladimir J. van der Laan2013-10-153-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | misc spelling / space / style fixesPhilip Kaufmann2013-10-153-4/+4
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Avoid core dump if rpc port is in use.Gavin Andresen2013-10-151-1/+2