Commit graph

2788 commits

Author SHA1 Message Date
Gavin Andresen
9700f212ad Merge pull request #1496 from xanatos/patch-2
= instead of == in multisig_tests.cpp
2012-06-21 12:51:05 -07:00
xanatos
fdfdb5cd7d = instead of == in multisig_tests.cpp 2012-06-21 21:37:49 +03:00
Philip Kaufmann
a3d12f445a fix a memory leak in key.cpp
- add EC_KEY_free() in CKey::Reset() when pkey != NULL
- init pkey with NULL in CKey constructor
2012-06-21 14:43:13 +02:00
Michael Ford
b768a38b76 Update master 2012-06-21 09:36:20 +08:00
Luke Dashjr
0783bcceef gitian-downloader: Update luke-jr's key 2012-06-20 16:15:46 +00:00
Pieter Wuille
d65e959bae Update my GPG key 2012-06-20 18:13:16 +02:00
Jeff Garzik
219abac227 Merge pull request #1488 from sipa/noowner
Remove CTxDB::ReadOwnerTxes.
2012-06-20 06:46:39 -07:00
Pieter Wuille
70f6049f71 Remove CTxDB::ReadOwnerTxes.
It seems it wasn't ever used since 0.1.5.
2012-06-20 15:07:48 +02:00
Wladimir J. van der Laan
703db97d80 Merge pull request #1483 from Diapolo/txtablemodel_updateDisplayUnit
GUI: ensure a changed bitcoin unit immediately updates the tx list amounts
2012-06-19 22:34:03 -07:00
Philip Kaufmann
229c34f818 GUI: ensure a changed bitcoin unit immediately updates the tx list amounts 2012-06-20 06:51:38 +02:00
Gavin Andresen
c283b3c569 print large orphan warning BEFORE deleting pvMsg 2012-06-19 17:14:29 -04:00
Pieter Wuille
451c3957fe Merge pull request #1485 from xanatos/patch-1
Small logical error in mruset
2012-06-19 05:37:21 -07:00
xanatos
16d5671943 If (for example) the new max_size must be 5 then at the end the queue.size() must be <= 5, so the exit condition must be <=, so the continuing condition must be > (and not >= as it was). 2012-06-19 09:48:00 +03:00
Pieter Wuille
4c6b210af0 Fix netbase tests
* Do not rely on "a.b.c" being interpreted as "a.0.b.c"
* Parse numeric addresses for address families for which no device is configured
2012-06-19 02:22:09 +02:00
Luke Dashjr
0f5a2a82d9 CBigNum: Convert negative int64 values in a more well-defined way
Since the minimum signed integer cannot be represented as positive so long as its type is signed, and it's not well-defined what happens if you make it unsigned before negating it, we instead increment the negative integer by 1, convert it, then increment the (now positive) unsigned integer by 1 to compensate
2012-06-18 20:37:57 +00:00
Gavin Andresen
c5532e188e Merge pull request #1399 from sipa/ipparse
Improve parsing of IPv6 addresses
2012-06-18 11:39:16 -07:00
Gavin Andresen
7596a030c6 Merge branch 'master' of https://github.com/fanquake/bitcoin 2012-06-18 14:29:32 -04:00
Gavin Andresen
550c73f4c8 Merge branch 'signbugs' of https://github.com/wizeman/bitcoin
Resolved minor conflict in main.cpp
2012-06-18 10:48:40 -04:00
fanquake
baf814f3da OS X not OSX 2012-06-18 22:09:19 +08:00
fanquake
8b7b3be765 Further updates to build instructions 2012-06-18 21:58:20 +08:00
Gavin Andresen
5204ca87e2 Merge pull request #1480 from fanquake/master
Update OSX build instructions
2012-06-18 06:44:51 -07:00
Fordy
2bbfcd2d02 Update OSX build instructions 2012-06-18 14:57:28 +08:00
Pieter Wuille
432d28d3bb Merge pull request #1477 from gmaxwell/master
Fix inverted logic for !Discover/!UPNP when !Listen.
2012-06-17 17:07:08 -07:00
Giel van Schijndel
896899e0d6 *Always* send a shutdown signal to enable custom shutdown actions
NOTE: This is required to be sure that we can properly shut down the RPC
      thread.

Signed-off-by: Giel van Schijndel <me@mortis.eu>
2012-06-17 21:50:49 +02:00
Wladimir J. van der Laan
a54d2118be Merge pull request #1434 from Diapolo/GUI_fix_displayunit
GUI: init with correct display unit and update it, when user changes it via options dialog
2012-06-17 12:29:26 -07:00
Wladimir J. van der Laan
8ce04527f9 Merge pull request #1451 from Diapolo/sendcoins
GUI: set cursor for balance field to IBeamCursor (to show the user it IS selectable)
2012-06-17 12:26:20 -07:00
Wladimir J. van der Laan
6062de265a Merge pull request #1461 from laanwj/2012_06_helpmessage
Show command line options as dialog when opened from debug window
2012-06-17 12:24:35 -07:00
Gregory Maxwell
3bbb49de55 Fix inverted logic for !Discover/!UPNP when !Listen. 2012-06-17 12:13:34 -04:00
Philip Kaufmann
e0873dafc5 add the slot updateDisplayUnit() to overviewpage, sendcoinsdialog, sendcoinsentry and connect it to displayUnitChanged() - this ensures all fields in the GUI, who use a display unit are imediately updated, when the user changes this setting in the optionsdialog / ensure used fields init with the current set display unit 2012-06-17 15:20:42 +02:00
Giel van Schijndel
07368a9e3c Merge branch 'master' into async-ipv6-rpc
Conflicts:
	src/bitcoinrpc.cpp

Signed-off-by: Giel van Schijndel <me@mortis.eu>
2012-06-17 14:30:37 +02:00
Matt Corallo
ad5f29b743 Revert "Disable bitcoin: URI handling on Windows for the 0.6 release"
This reverts commit 7b90edb5a6.
2012-06-15 17:19:13 +02:00
Matt Corallo
1d42878adb Fix #956 the Boost 1.49 way. 2012-06-15 17:19:09 +02:00
Matt Corallo
39471861d5 Upgrade to Boost 1.49 on Win32 2012-06-15 17:15:37 +02:00
Gavin Andresen
fab7858a35 Document how to build/run unit tests 2012-06-14 20:44:04 -04:00
Gregory Maxwell
194ea3186a Merge pull request #1463 from sipa/fix_1455
Use a 64-bit nonce in ping
2012-06-14 09:48:10 -07:00
Pieter Wuille
c971112dfa Use a 64-bit nonce in ping
Former code sent '0' as nonce, which was serialized as 32-bit.
2012-06-14 18:31:08 +02:00
Pieter Wuille
c4971e24f9 Add netbase tests 2012-06-14 17:43:10 +02:00
Pieter Wuille
1e8aeae15a Improve parsing of IPv6 addresses
Implement the following rules:
* Interpret [X]:Y as host=X port=Y, if Y is an integer
* Interpret X:Y as host=X port=Y, if Y is an integer and X contains no colon
* Interpret X:Y as host=X:Y port=default otherwise
2012-06-14 17:37:15 +02:00
Wladimir J. van der Laan
7d72a8c36a Show command line options as dialog when opened from debug window
On Linux/Mac the command-line options were printed to stderr when the button
was pressed in the debug window, resulting in confusion. This is fixed
in this commit by adding a separate method.
2012-06-14 15:14:01 +02:00
Wladimir J. van der Laan
d59bce21e5 Merge pull request #1459 from laanwj/2012_06_trayiconmenu
Reorganize tray icon menu into more logical order
2012-06-14 05:52:33 -07:00
Wladimir J. van der Laan
641cfb1456 Fix build of testcases after commit 0f10b21719 2012-06-14 09:41:11 +02:00
Wladimir J. van der Laan
64d46e7c6a Merge pull request #1002 from Diapolo/URL-handling_2
URI-handling code update: added safety checks and notifications
2012-06-13 23:17:06 -07:00
Wladimir J. van der Laan
0f10b21719 Merge pull request #1439 from Diapolo/ClientShutdown
re-work Shutdown() function
2012-06-13 23:12:22 -07:00
Wladimir J. van der Laan
f5f2d7410d Reorganize tray icon menu into more logical order
The current order of menu options in the tray menu doesn't really match expected usage patterns, this commit changes it to more logical order.

- Toggle show/hide first (unchanged)
- Then, send/receive coins actions, which are the critical functionality of bitcoin
- Then, sign/verify message
- Then finally the options, and closing with the debug window
2012-06-14 08:01:41 +02:00
Philip Kaufmann
93b7af3099 URI-handling code update: added safety checks and tray-notifications 2012-06-14 07:59:27 +02:00
Wladimir J. van der Laan
7a98f19fb6 Merge pull request #1420 from Diapolo/extend_showNormalIfMinimized
GUI: merge toggleHidden() code into showNormalIfMinimized()
2012-06-13 22:49:38 -07:00
Gavin Andresen
d518e444f8 Merge branch 'refactor_coinselect' of https://github.com/luke-jr/bitcoin 2012-06-13 21:36:35 -04:00
Philip Kaufmann
b5782531ad set cursor for balance field to IBeamCursor (to show the user it IS selectable) and set autoDefault to false for the buttons that do not need this 2012-06-13 18:34:29 +02:00
Wladimir J. van der Laan
7d1490576d Merge pull request #1448 from Diapolo/2012-06-13_translation_updates
update translation files (fetched from Transifex - 2012-06-13)
2012-06-13 09:24:39 -07:00
Wladimir J. van der Laan
1bdc992a59 Merge pull request #1449 from laanwj/2012_06_bitcoinstrings
Update bitcoinstrings.cpp and English source translation file
2012-06-13 09:23:10 -07:00