aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge pull request #1587 from Diapolo/signverifymessagedialogWladimir J. van der Laan2012-07-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix a wrong string in signverifymessagedialog.uiPhilip Kaufmann2012-07-121-1/+1
* | | | | | | | | | | | Merge pull request #1593 from Diapolo/testnet_icon_aboutWladimir J. van der Laan2012-07-141-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | when on testnet, set testnet icon for about dialogPhilip Kaufmann2012-07-131-0/+3
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1595 from fanquake/masterGavin Andresen2012-07-131-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Correct OpenSSL versionfanquake2012-07-131-3/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'chashwriter' of https://github.com/sipa/bitcoinGavin Andresen2012-07-131-6/+42
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | CHashWriter that does SHA256 in-place during serializationPieter Wuille2012-07-071-6/+42
* | | | | | | | | | | | Merge pull request #1575 from laanwj/2012_07_persistentbalancecheckWladimir J. van der Laan2012-07-131-15/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Persistently poll for balance change when number of blocks changedWladimir J. van der Laan2012-07-111-15/+10
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Bug fix: sendrawtransaction was not relaying properlyGavin Andresen2012-07-121-10/+23
* | | | | | | | | | | Merge pull request #1572 from Diapolo/optionsmodel_cleanupWladimir J. van der Laan2012-07-122-58/+36
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | optionsmodel cleanupPhilip Kaufmann2012-07-122-58/+36
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1584 from Diapolo/trans_procWladimir J. van der Laan2012-07-111-15/+38
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | translation process file updatesPhilip Kaufmann2012-07-111-15/+38
* | | | | | | | | | | Merge pull request #1497 from luke-jr/bugfix_neguintGregory Maxwell2012-07-111-9/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | CBigNum: Convert negative int64 values in a more well-defined wayLuke Dashjr2012-06-181-9/+3
* | | | | | | | | | | Reorder dnsseed list, Jeff's seed list is static so put it last.Gregory Maxwell2012-07-111-2/+2
* | | | | | | | | | | Merge pull request #1581 from Diapolo/trans_fixpluralsWladimir J. van der Laan2012-07-111-9/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix some recently added translation pluralsPhilip Kaufmann2012-07-111-9/+9
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #1574 from Diapolo/pro-file2Wladimir J. van der Laan2012-07-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix for build.h regeneration failure when compiling on WindowsPhilip Kaufmann2012-07-111-1/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #1580 from laanwj/2012_07_bitcoinstringsWladimir J. van der Laan2012-07-112-750/+280
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Translation strings updateWladimir J. van der Laan2012-07-112-750/+280
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1569 from Diapolo/addressbookpageWladimir J. van der Laan2012-07-104-11/+16
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | replace some ugly code in addressbookpage.cppPhilip Kaufmann2012-07-084-11/+16
* | | | | | | | | | Fix Qt build on OSXGavin Andresen2012-07-092-6/+16
|/ / / / / / / / /
* | | | | | | | | Merge pull request #1464 from Diapolo/GUI_showSSLVersionWladimir J. van der Laan2012-07-082-21/+51
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | show used OpenSSL library version in debug windowPhilip Kaufmann2012-07-072-21/+51
* | | | | | | | | | Merge pull request #1566 from Diapolo/typoPieter Wuille2012-07-071-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | fix typo in optionsmodel.cppPhilip Kaufmann2012-07-071-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #1565 from jrmithdobbs/socks5-fixPieter Wuille2012-07-071-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix OBO in socks5 auth proposal. This fixes compatibility with openssh's sock...Douglas Huff2012-07-071-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #1469 from Diapolo/signverifymessagedialogWladimir J. van der Laan2012-07-0715-706/+822
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | GUI: merge sign/verify message into a single window with tabbed UIPhilip Kaufmann2012-07-0615-706/+822
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #1518 from Diapolo/qrcodedialogWladimir J. van der Laan2012-07-077-152/+215
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | update QRCodeDialogPhilip Kaufmann2012-07-067-152/+215
* | | | | | | | | | Merge pull request #1552 from Diapolo/txdescWladimir J. van der Laan2012-07-072-47/+39
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | enhance translation possibilities in TransactionDesc / misc other changesPhilip Kaufmann2012-07-032-47/+39
* | | | | | | | | | | Merge pull request #1559 from sje397/BalanceSignalFixWladimir J. van der Laan2012-07-073-14/+55
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add a timer to check for changes in immature or unconfirmed balances,Scott Ellis2012-07-063-14/+55
* | | | | | | | | | | Warn if blockchain majority doesn't match CBlock::CURRENT_VERSIONGavin Andresen2012-07-061-0/+18
* | | | | | | | | | | Treat non-version-1 transactions as non-standardGavin Andresen2012-07-062-2/+7
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #1304 from rebroad/ShowBlockTimestampJeff Garzik2012-07-052-4/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Show the timestamp for the block.R E Broadley2012-05-292-4/+13
* | | | | | | | | | | bitcoinrpc.cpp: Removed outdated commentJeff Garzik2012-07-051-4/+0
* | | | | | | | | | | Merge branch 'uri' of https://github.com/TheBlueMatt/bitcoinGavin Andresen2012-07-057-36/+43
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Revert "Disable bitcoin: URI handling on Windows for the 0.6 release"Matt Corallo2012-06-153-19/+5
| * | | | | | | | | | | Fix #956 the Boost 1.49 way.Matt Corallo2012-06-153-4/+25
| * | | | | | | | | | | Upgrade to Boost 1.49 on Win32Matt Corallo2012-06-154-17/+17