Luke Dashjr
38297ba90a
Merge branch '0.5.x' into 0.6.0.x
...
Conflicts:
src/qt/locale/bitcoin_da.ts
src/qt/locale/bitcoin_de.ts
src/qt/locale/bitcoin_en.ts
src/qt/locale/bitcoin_es.ts
src/qt/locale/bitcoin_es_CL.ts
src/qt/locale/bitcoin_hu.ts
src/qt/locale/bitcoin_it.ts
src/qt/locale/bitcoin_nb.ts
src/qt/locale/bitcoin_nl.ts
src/qt/locale/bitcoin_pt_BR.ts
src/qt/locale/bitcoin_ru.ts
src/qt/locale/bitcoin_uk.ts
src/qt/locale/bitcoin_zh_CN.ts
src/qt/locale/bitcoin_zh_TW.ts
2012-10-09 23:40:25 +00:00
Luke Dashjr
6ec7ac15ff
Update supported translations
2012-10-09 23:28:53 +00:00
Luke Dashjr
4cf9b4c6fa
Merge branch '0.5.x' into 0.6.0.x
...
Conflicts:
src/qt/transactiondesc.cpp
2012-10-09 23:17:43 +00:00
Luke Dashjr
cef36fad89
Merge branch '0.4.x' into 0.5.x
...
Conflicts:
src/bitcoinrpc.cpp
src/init.cpp
2012-10-09 23:16:24 +00:00
Gavin Andresen and Luke Dashjr
b3f8f6ab94
Avoid crashes at shutdown due to printf() in global destructors.
2012-10-09 23:12:50 +00:00
Wladimir J. van der Laan and Luke Dashjr
d37a2fd808
Send --help message to stdout i.s.o stderr
...
This allows fun stuff such as `bitcoin --help | less`, and more
easy piping to files.
Looking at other tools such as bash, gcc, they all send their help
text to stdout.
2012-10-09 23:04:59 +00:00
Wladimir J. van der Laan and Luke Dashjr
638cecee77
When datadir missing, show messagebox instead of printing error to stderr
2012-10-09 23:01:16 +00:00
Rune K. Svendsen and Luke Dashjr
a7642282f6
When encrypting the wallet, warn user that old backups will become useless.
...
Don't include HTML in translation strings. Do split the huge message over several lines.
Prettier lines
2012-10-09 22:57:34 +00:00
kjj2 and Luke Dashjr
bced903ae5
Add a backup warning to the encryptwallet RPC command
2012-10-09 22:57:11 +00:00
xanatos and Luke Dashjr
cc57473222
toHTML won't add empty wtx.mapValue elements
...
As the code was before, toHTML added empty elements to mapValue to check for their existance. Now first it check for their existance and then for their non-emptiness.
Removed a duplicated identical if
There are two equal ifs, one inside another. If the first one is true, then the second one is true.
2012-10-09 22:52:35 +00:00
Philip Kaufmann and Luke Dashjr
207ef3008c
additional fix for #1843
...
- a shortcut on "receive coins" was used twice
2012-10-09 22:22:07 +00:00
fanquake and Luke Dashjr
e25f0f0e53
Update Bugreport Links
...
Update Qt Links
Revert Qt source link
Update Qt links
PARTIAL of e1eb3d4
2012-10-09 18:18:21 +00:00
fanquake and Luke Dashjr
599ec1e115
Update Bugreport Links
...
Update Qt Links
Revert Qt source link
Update Qt links
PARTIAL of e1eb3d4
2012-10-09 18:17:31 +00:00
Philip Kaufmann and Luke Dashjr
9769d14f03
Change hotkey for "Send" button to "e" since "S" is already used for "Settings" menu
...
Partial of upstream da9413d913
2012-10-09 18:13:58 +00:00
Luke Dashjr
e7770992ab
Merge branch '0.5.x' into 0.6.0.x
2012-09-17 02:07:03 +00:00
Luke Dashjr
3a9899f6a8
Merge branch '0.4.x' into 0.5.x
2012-09-17 02:06:27 +00:00
Gregory Maxwell and Luke Dashjr
a53b07313f
Apply BIP30 checks to all blocks except the two historic violations.
...
Matt pointed out some time ago that there existed a minor DOS
attack where a node in its initial block download could be wedged
by an overwrite attack in a fork created between checkpoints before
a time where BIP30 was enforced. Now that the BIP30 timestamp
is irreversibly past the check can be more aggressive and apply to
all blocks except the two historic violations.
2012-09-17 02:03:44 +00:00
Luke Dashjr
be2e2845ec
Merge branch '0.5.x' into 0.6.0.x
...
Conflicts:
src/qt/locale/bitcoin_da.ts
src/qt/locale/bitcoin_zh_CN.ts
2012-09-11 01:32:18 +00:00
Luke Dashjr
ea3e34dc3d
Update supported translations
2012-09-11 00:59:16 +00:00
Luke Dashjr
2ff8456c11
Bugfix: Correct doubled-up & in translations and remove extra spaces after ampersand in translations (this fixes hotkeys)
...
Partial of upstream 4ee706243c .
2012-09-10 23:53:28 +00:00
Luke Dashjr
4c1bc22013
Bugfix: Correct doubled-up & in translations and remove extra spaces after ampersand in translations (this fixes hotkeys)
...
Partial of upstream 4ee706243c .
2012-09-10 23:52:27 +00:00
xanatos and Luke Dashjr
7648cd46a4
Wrong address added to collection in test
...
The wrong address is added to the collection. As was written a second copy of address1 was added (and so address2 was useless).
2012-09-10 23:50:18 +00:00
Luke Dashjr
9c82c574a0
Merge branch '0.5.x' into 0.6.0.x
...
Conflicts:
src/net.cpp
2012-09-10 23:42:59 +00:00
Luke Dashjr
6321b515f2
Merge branch '0.4.x' into 0.5.x
2012-09-10 23:42:15 +00:00
Jeff Garzik and Luke Dashjr
4ad495c243
select(): Use precise fd presence check, rather than imprecise hSocketMax test
2012-09-10 23:42:06 +00:00
Luke Dashjr
1ce15535f0
Bugfix: Don't consider invalid listening socket in hSocketMax
...
Fixed upstream in 8f10a28890 .
2012-09-10 23:40:27 +00:00
Luke Dashjr
423cece29d
Update supported translations
2012-09-07 00:32:15 +00:00
Luke Dashjr
3b5c5b817f
Merge branch '0.5.x' into 0.6.0.x
...
Conflicts:
src/qt/locale/bitcoin_da.ts
src/qt/locale/bitcoin_de.ts
src/qt/locale/bitcoin_es.ts
src/qt/locale/bitcoin_es_CL.ts
src/qt/locale/bitcoin_hu.ts
src/qt/locale/bitcoin_it.ts
src/qt/locale/bitcoin_nb.ts
src/qt/locale/bitcoin_nl.ts
src/qt/locale/bitcoin_pt_BR.ts
src/qt/locale/bitcoin_ru.ts
src/qt/locale/bitcoin_uk.ts
src/qt/locale/bitcoin_zh_CN.ts
src/qt/locale/bitcoin_zh_TW.ts
2012-09-06 23:14:53 +00:00
Luke Dashjr
fc1cd74b86
Update supported translations
2012-09-06 22:49:23 +00:00
Luke Dashjr
f210c74398
Merge branch '0.4.x' into 0.5.x
2012-09-06 22:09:37 +00:00
xanatos and Luke Dashjr
c1124277c5
Correct LoadWallet() return value (false -> DB_LOAD_OK)
...
Equivalent code. (false == 0 == DB_LOAD_OK). Fixes #1706 .
2012-09-06 20:39:12 +00:00
Luke Dashjr
7355f00756
Update supported translations
2012-08-28 21:21:30 +00:00
Luke Dashjr
4c93f17e9e
Update supported translations
2012-08-28 07:30:52 +00:00
Luke Dashjr
d011dc270a
Update supported translations
2012-08-28 03:12:43 +00:00
Luke Dashjr
f08ad34e0c
Merge branch '0.5.x' into 0.6.0.x
...
Conflicts:
bitcoin-qt.pro
doc/README
doc/README_windows.txt
share/setup.nsi
src/serialize.h
2012-08-27 19:14:59 +00:00
Luke Dashjr
d31e24aeaa
Merge branch '0.4.x' into 0.5.x
...
Conflicts:
contrib/Bitcoin.app/Contents/Info.plist
doc/README
doc/README_windows.txt
share/setup.nsi
src/serialize.h
2012-08-27 19:10:41 +00:00
Luke Dashjr
b9b15578bb
Bump version to 0.4.8
2012-08-27 19:07:05 +00:00
Gavin Andresen and Luke Dashjr
e0adf13897
Special-case the last alert for alert-key-compromised case
...
Hard-code a special nId=max int alert, to be broadcast if the
alert key is ever compromised. It applies to all versions, never
expires, cancels all previous alerts, and has a fixed message:
URGENT: Alert key compromised, upgrade required
Variations are not allowed (ignored), so an attacker with
the private key cannot broadcast empty-message nId=max alerts.
2012-08-27 19:01:17 +00:00
Gavin Andresen and Luke Dashjr
e1c2163fb7
Alert system DoS prevention
...
This fixes two alert system vulnerabilities found by
Sergio Lerner; you could send peers unlimited numbers
of invalid alert message to try to either fill up their
debug.log with messages and/or keep their CPU busy
checking signatures.
Fixed by disconnecting/banning peers if they send 10 or more
bad (invalid/expired/cancelled) alerts.
2012-08-27 18:56:54 +00:00
Luke Dashjr
2eaeb17fe1
Merge branch '0.4.x' into 0.5.x
2012-08-26 22:44:23 +00:00
Luke Dashjr
01cc7bf0c5
Support sending to script (P2SH) addresses
...
Upstream partials from 9e470585b3 , e679ec969c , and 922e8e2929 .
2012-08-26 22:43:42 +00:00
Luke Dashjr
12217fb61d
Merge branch '0.5.x' into 0.6.0.x
2012-08-26 22:20:34 +00:00
Luke Dashjr
cd76166b4b
Merge commit '52153a6' into 0.6.0.x
...
Conflicts:
src/bitcoinrpc.cpp
2012-08-26 22:20:26 +00:00
Luke Dashjr
680c3c8565
Merge commit '689b878' into 0.6.0.x
2012-08-26 22:19:46 +00:00
Luke Dashjr
4c063c11ff
Merge commit '9adab76' into 0.6.0.x
...
Conflicts:
src/main.cpp
2012-08-26 22:19:14 +00:00
Luke Dashjr
0eca21c5fa
Merge commit 'd710ed5' into 0.6.0.x
2012-08-26 22:18:26 +00:00
Luke Dashjr
cd24f37092
Merge commit 'b958999' into 0.6.0.x
...
Conflicts:
src/makefile.osx
src/makefile.unix
2012-08-26 22:17:35 +00:00
Luke Dashjr
7c08c1a5df
Merge commit 'a259baa' into 0.6.0.x
2012-08-26 22:15:56 +00:00
Luke Dashjr
f498701444
Merge branch '0.4.x' into 0.5.x
2012-08-26 22:14:37 +00:00
Gavin Andresen and Luke Dashjr
bfd2ddfc47
Checkpoint at block 185333 (and remove a couple of intermediate checkpoints)
2012-08-26 22:14:06 +00:00