Wladimir J. van der Laan
010c4fc0b5
Change define to determine use of DBUS to USE_DBUS, to prevent overlap with Qt-defined QT_DBUS
2011-09-24 11:56:33 +02:00
Wladimir J. van der Laan
99cec89cb3
make qmake build system more configurable (as suggested by lukejr)
2011-09-24 11:43:58 +02:00
Wladimir J. van der Laan
0961c2fc0d
Merge branch 'master' of https://github.com/bitcoin/bitcoin
2011-09-23 13:42:04 +02:00
Gavin Andresen
c7eb151ad0
Merge pull request #527 from TheBlueMatt/gitian-downloader
...
Restructure gitian files and add download config files.
2011-09-22 13:54:42 -07:00
Matt Corallo
0920ad152f
Restructure gitian files and add download config files.
2011-09-22 16:52:49 -04:00
Gavin Andresen
16d6963ef6
Fix QA email address
2011-09-22 16:50:32 -04:00
Gavin Andresen
da799d92fa
Merge pull request #526 from sipa/nl
...
Updated dutch translation
2011-09-22 13:45:48 -07:00
Pieter Wuille
90efeb5ddb
Updated dutch translation
2011-09-22 19:22:17 +02:00
Wladimir J. van der Laan
b8afa21fad
show balance in sendcoins screen (issue #24 )
2011-09-22 19:05:04 +02:00
Jeff Garzik
864e49a12c
Merge pull request #525 from TheBlueMatt/master
...
Update binary mo to match latest po translation.
2011-09-22 09:48:02 -07:00
Matt Corallo
2fc80399b7
Update binary mo to match latest po translation.
2011-09-22 12:45:52 -04:00
Jeff Garzik
700f942692
Merge pull request #522 from sipa/minorfix
...
SocketHandler thread can be detached
2011-09-20 11:47:02 -07:00
Nils Schneider
2d294e080c
Merge pull request #520 from tcatm/less-logging
...
log low-level network messages only when fDebug is set
2011-09-19 12:19:15 -07:00
Wladimir J. van der Laan
9b490f71b0
put Q_OBJECT everywhere it should be (removes warnings when running lupdate)
2011-09-19 13:08:24 +02:00
Pieter Wuille
88367a5fb8
SocketHandler thread can be detached
2011-09-19 13:08:22 +02:00
Wladimir J. van der Laan
e122e42354
assure that base bitcoind and bitcoin still build
2011-09-18 12:44:38 +02:00
Wladimir J. van der Laan
3c66913cd2
move qt-specific scripts to qt-specific directory in scripts/
2011-09-18 12:44:32 +02:00
Nils Schneider
e674680ddd
missed printf in AbortMessage(); merged printfs in EndMessage
2011-09-17 21:36:58 +02:00
Nils Schneider
59090133c0
log low-level network messages only when fDebug is set
2011-09-17 18:29:41 +02:00
Jeff Garzik
7337b343cd
Merge pull request #519 from dabaopku/master
...
Chinese Simp translation update
2011-09-17 09:24:54 -07:00
Dean Lee
67c6994370
Update to the Chinese Simp translation
2011-09-17 19:11:29 +08:00
Wladimir J. van der Laan
5dd7318db7
Merge branch 'master' of https://github.com/bitcoin/bitcoin
2011-09-16 06:55:47 +02:00
Gavin Andresen
217208a36d
Merge pull request #516 from TheBlueMatt/nsisiconfix
...
Update bitcoin icon to make nsis setup exe deterministic.
2011-09-14 08:03:36 -07:00
Matt Corallo
6083295f46
Update bitcoin icon to make nsis setup exe deterministic.
...
This adds a 32x32 16-bit icon to the bitcoin.ico file.
Though this realistically probably looks worse than the 32-bit
32x32 being displayed on a 16-bit monitor, it makes the nsis
setup exe deterministic in gitian output (go figure) which makes
the slight visual loss for users of very old monitors/computers
worth it.
2011-09-14 10:59:54 -04:00
Jeff Garzik
53c6c12886
Merge pull request #512 from paraipanakos/master
...
Spanish translation update
2011-09-13 13:21:09 -07:00
flower
c1e667222a
make German translation up-to-date
2011-09-13 18:55:50 +02:00
Jeff Garzik
38fd861fff
Merge pull request #511 from mibe/translation-de
...
Updated German translation
2011-09-11 18:45:00 -07:00
Michael Bemmerl
c4149423f9
Updated German translation
2011-09-12 01:16:44 +02:00
Alex B
b4af75c07f
Spanish translation update
2011-09-11 22:08:43 +02:00
Wladimir J. van der Laan
83312d7c6c
remove transparency effect and windows-specific code for now, it's not working as supposed
2011-09-11 21:06:23 +02:00
Wladimir J. van der Laan
1837644c4a
Merge pull request #22 from p2k/master
...
Some improvements for Mac OS X
2011-09-11 08:52:57 -07:00
p2k
2c1fd3c395
Some Mac OS X specific things
...
* Added application icon for Mac OS X * Added instructions for compiling
under Mac OS X * Added Portfile for compiling miniupnpc with MacPorts
2011-09-11 17:42:20 +02:00
Wladimir J. van der Laan
d33cc2b5e3
clarify function signature (GetNumBlocksOfPeers) and use number of 'frozen' blocks as initial value for number of peer blocks
2011-09-11 10:49:30 +02:00
Janne Pulkkinen
78b3bf56f7
The synchronization progress bar now compares the amount of total blocks to amount of blocks downloaded at application start-up. Could be probably implemented better.
2011-09-11 10:29:29 +02:00
Gavin Andresen
95cea79e39
Merge pull request #509 from cjdelisle/walletCrypto-wx-minVersion
...
wxWidgets needs to be at least version 2.9.1 because wallet crypto uses T
2011-09-09 11:46:04 -07:00
Gavin Andresen
b56658bdad
Merge pull request #508 from TheBlueMatt/master
...
Update gitian build descriptors to produce proper builds.
2011-09-09 11:45:46 -07:00
Matt Corallo
0295912479
Update gitian build descriptors to produce proper builds.
...
Thanks to makomk for finding the bugs here and devrandom
for passing them along (see
https://bitcointalk.org/index.php?topic=42198.msg514312#msg514312 )
2011-09-09 12:35:42 -04:00
Gavin Andresen
b7598ceefa
Merge pull request #505 from gavinandresen/unique_coinbase
...
Unique coinbase: Fixes #482
2011-09-09 06:34:37 -07:00
cjdelisle
3448ce56f4
wxWidgets needs to be at least version 2.9.1 because wallet crypto uses ToStdString() which is not in 2.9.0
2011-09-08 20:50:00 -04:00
Wladimir J. van der Laan
9b9e2f1748
http -> https
2011-09-08 18:07:07 +02:00
Wladimir J. van der Laan
a0d2f9a12d
Merge branch 'master' of https://github.com/bitcoin/bitcoin
...
Conflicts:
.gitignore
2011-09-07 18:57:11 +02:00
Wladimir J. van der Laan
f077d1ad62
fix the build (moved code use 'this' instead of 'window')
2011-09-07 18:16:38 +02:00
Janne Pulkkinen
94723e27ad
Pull request #21 : windows fixes/cleanup by Matoking
2011-09-07 17:45:07 +02:00
Gavin Andresen
5a3dea451d
Merge branch 'unique_coinbase' of git://gitorious.org/~Luke-Jr/bitcoin/luke-jr-bitcoin into unique_coinbase
2011-09-07 10:51:57 -04:00
Gavin Andresen
f92f022eda
Merge pull request #500 from gavinandresen/txndeadlock
...
Fix AddAddress cs_mapaddresses/db transaction deadlock
2011-09-07 07:29:44 -07:00
Gavin Andresen
9406696578
Fix AddAddress cs_mapaddresses/db transaction deadlock
2011-09-06 20:28:15 -04:00
Luke Dashjr
83f4cd156e
Bugfix: Use timestamp in coinbase rather than "bits", needed to ensure coinbase txn is unique even if address is the same
2011-09-06 16:43:40 -04:00
Luke Dashjr
49c8e53ee2
Save coinbase, not just extraNonce
2011-09-06 16:43:35 -04:00
Luke Dashjr
b760e25458
Merge branch 'getwork_dedupe' into unique_coinbase
2011-09-06 16:43:32 -04:00
Jeff Garzik
0535644b30
Merge branch 'master' of git://github.com/bitcoin/bitcoin
2011-09-06 16:20:24 -04:00