aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '1.7.1-dev' into 1.7-maint1.7-archivelangerhans2014-06-088-22/+22
|\
| * Merge pull request #552 from patricklodder/1.7.1-dev-version_bumplangerhans2014-06-082-2/+2
| |\
| | * Bump version revision for 1.7.1Patrick Lodder2014-06-082-2/+2
| |/
| * Merge pull request #551 from patricklodder/1.7.1-dev-openssl-101hlangerhans2014-06-066-20/+20
|/|
| * gitian: upgrade OpenSSL to 1.0.1hWladimir J. van der Laan2014-06-066-20/+20
|/
* Merge pull request #514 from leofidus/1.7-slimsplashv1.7.0langerhans2014-05-122-0/+0
|\
| * change splash screen imageJannis Froese2014-05-102-0/+0
|/
* Merge pull request #512 from 51doge/patch-2leofidus2014-05-091-2/+2
|\
| * Update bitcoin_zh_CN.tsmahongbin2014-05-091-2/+2
|/
* Merge pull request #510 from leofidus/1.7-bitamountlangerhans2014-05-091-1/+1
|\
| * change step value for amount input fields to 1 DOGEJannis Froese2014-05-081-1/+1
|/
* Merge pull request #507 from leofidus/gitian-instructionslangerhans2014-05-061-13/+13
|\
| * update release process to dogecoin [ci skip]Jannis Froese2014-05-041-13/+13
|/
* Merge pull request #503 from leofidus/fee-testsv1.7.0-RC-1langerhans2014-05-041-0/+135
|\
| * remove unit tests for new fee modeJannis Froese2014-05-041-24/+0
| * add unit tests for GetMinFeeJannis Froese2014-05-041-0/+159
* | Merge pull request #506 from langerhans/1.7-oldfeelangerhans2014-05-041-1/+1
|\ \
| * | Revert "don't send feeless transactions"langerhans2014-05-041-1/+1
|/ /
* | Merge pull request #501 from leofidus/coverage-testslangerhans2014-05-042-7/+14
|\ \
| * | fix coverage tests to use new test binaryJannis Froese2014-05-031-1/+1
| * | make it possible to run coverage tests without java comparison toolJannis Froese2014-05-032-6/+13
| |/
* | Merge pull request #502 from patricklodder/1.7-dev-3-req-conflangerhans2014-05-042-3/+3
|\ \
| * | Changing the progress display to match 3 confirmsPatrick Lodder2014-05-041-2/+2
| * | Require 3 confirmations like in 1.6Patrick Lodder2014-05-041-1/+1
| |/
* | Merge pull request #505 from patricklodder/1.7-dev-qt-nlRoss Nicoll2014-05-041-149/+169
|\ \
| * | improved NL translation for qt clientPatrick Lodder2014-05-041-149/+169
| |/
* | Merge pull request #504 from patricklodder/1.7-dev-zhCN-transRoss Nicoll2014-05-041-0/+10
|\ \ | |/ |/|
| * fix zh_CN.ts closing tagPatrick Lodder2014-05-041-1/+1
| * Update bitcoin_zh_CN.tsmahongbin2014-05-041-0/+10
|/
* Merge pull request #496 from leofidus/1.7-feeslangerhans2014-05-021-34/+3
|\
| * don't send feeless transactionsJannis Froese2014-05-011-1/+1
| * refactor GetMinFee to remove dead codeJannis Froese2014-05-011-33/+2
* | Merge pull request #499 from leofidus/qtprojectlangerhans2014-05-022-21/+452
|\ \
| * | update and enhance qt project fileJannis Froese2014-05-022-21/+452
* | | Merge pull request #498 from leofidus/1.7-GetPoWHashlangerhans2014-05-021-7/+7
|\ \ \
| * | | move GetPoWHash to CBlockHeader classJannis Froese2014-05-021-7/+7
| |/ /
* | | Merge pull request #497 from leofidus/travis-nowalletlangerhans2014-05-021-3/+9
|\ \ \ | |/ / |/| |
| * | add ccache to Travis configJannis Froese2014-05-021-1/+4
| * | speed up Travis CI buildJannis Froese2014-05-021-2/+2
| * | add travis check for disable-wallet compile modeJannis Froese2014-05-021-1/+4
|/ /
* | Merge pull request #493 from rnicoll/1.7-dev-rclangerhans2014-04-293-2/+2
|\ \
| * | Marked build as production read and removed beta tag in preparation for RC re...Ross Nicoll2014-04-292-2/+2
| * | Renamed release notes to remove reference to alpha.Ross Nicoll2014-04-291-0/+0
* | | Merge pull request #492 from rnicoll/1.7-checkpointlangerhans2014-04-281-3/+8
|\ \ \ | |/ / |/| |
| * | Corrected timestamp on most recent checkpoint block; previous epoch value was...Ross Nicoll2014-04-281-1/+1
| * | Inserted checkpoints through the 100k-200k block range, with emphasis on the ...Ross Nicoll2014-04-281-3/+8
|/ /
* | Merge pull request #491 from rnicoll/1.7-dev-no-paymentlangerhans2014-04-281-6/+16
|\ \
| * | Replaced tabs with spaces.Ross Nicoll2014-04-271-3/+3
| * | Disable payment protocol pending further assessment and potential rework.Ross Nicoll2014-04-271-8/+18
* | | Merge pull request #490 from leofidus/1.7-subsidy-limit-testRoss Nicoll2014-04-241-19/+79
|\ \ \ | | |/ | |/|