Commit Graph
1629 Commits
Author SHA1 Message Date
Luke Dashjr 7de7913abd Merge branch '0.5.0.x' into 0.5.x v0.5.2 2012-01-05 18:19:29 -05:00
Luke Dashjr 780a182317 Merge branch '0.4.x' into 0.5.0.x 2012-01-05 18:17:58 -05:00
Matt CoralloandLuke Dashjr 99e9601e80 Fix horrific performance found by gmaxwell. 2012-01-05 12:11:28 -05:00
Wladimir J. van der LaanandLuke Dashjr 45099b19da Fix transaction type in UI: not all tx'es with "from"/"to" field are necessarily IP tx'es
- Also, prepare for OP_EVAL by calling all transactions without bitcoin address "SendToOther"/"RecvFromOther",
 (IP tx'es are so rare they can be put together with funky EV_EVAL scripts)
2012-01-04 01:09:09 -05:00
Luke Dashjr a2e9767225 Merge branch '0.5.0.x' into 0.5.x 2012-01-03 12:23:09 -05:00
Wladimir J. van der LaanandLuke Dashjr 20e3f2aefc Fix typo (#734) 2012-01-03 12:23:07 -05:00
Luke Dashjr fb88f1cc97 Fix typo (#734)
Conflicts:

	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
2012-01-03 12:21:04 -05:00
Luke Dashjr eb2a10afd6 Merge branch '0.4.x' into 0.5.0.x
Conflicts:
	src/util.cpp
2012-01-03 12:19:48 -05:00
Gavin AndresenandLuke Dashjr cc6bd19660 I broke -testnet with my TOR option-parsing fixes. 2012-01-03 12:17:54 -05:00
Gavin AndresenandLuke Dashjr 84393f15b6 Fix issue #659, and cleanup wallet/command-line argument handling a bit
Conflicts:
	src/init.cpp
	src/util.cpp
2012-01-03 11:48:44 -05:00
Pieter WuilleandLuke Dashjr b52b6f2e38 Fix some address-handling deadlocks
Made three critical blocks for cs_mapAddresses smaller, and moved
writing to the database out of them. This should also improve the
concurrency of the code.
2012-01-02 20:05:58 -05:00
Luke Dashjr a91a40febd Merge branch '0.5.0.x' into 0.5.x 2011-12-25 09:56:55 -05:00
Luke Dashjr 3b8051864b Be more conservative: check all transactions in blocks after last checkpoint. 2011-12-25 09:26:12 -05:00
Luke Dashjr 961cf14ab3 Merge branch '0.5.0.x' into 0.5.x 2011-12-23 10:09:13 -05:00
Matt CoralloandLuke Dashjr 8632383161 Fix #722. 2011-12-23 10:09:02 -05:00
Luke Dashjr ab4b52a239 Merge branch '0.4.x' into 0.5.0.x 2011-12-23 10:08:53 -05:00
Dylan NoblesmithandLuke Dashjr 96f1723bb1 Implement an mlock()'d string class for storing passphrases
SecureString is identical to std::string except with secure_allocator
substituting for std::allocator. This makes casting between them
impossible, so converting between the two at API boundaries requires
calling ::c_str() for now.
2011-12-20 18:42:30 -05:00
Luke Dashjr 027d149352 Bugfix: fForRelay should be false when deciding required fee to include in blocks
During the rushed transition from 0.01 BTC to 0.0005 BTC fees, we took the
approach of dropping the relay and block-inclusion fee to 0.0005 BTC
immediately, and only delayed adjusting the sending fee for the next release.
Afterward, the relay fee was lowered to 0.0001 BTC to avoid having the same
problem in the future. However, the block inclusion code was left setting
fForRelay to true! This fixes that, so the lower 0.0001 BTC allowance is (as
intended) only permitted for real relaying.
2011-12-20 17:05:04 -05:00
Luke Dashjr 96c700f5e4 Merge branch '0.5.0.x' into 0.5.x 2011-12-19 16:05:32 -05:00
Luke Dashjr f503a1486a Merge branch '0.4.x' into 0.5.0.x 2011-12-19 16:05:15 -05:00
Luke Dashjr 987f26aa1a Add my DNS seed domain 2011-12-19 14:38:26 -05:00
Matt CoralloandLuke Dashjr 6be2c9b5b4 Add sipa's new dnsseed. 2011-12-19 14:38:22 -05:00
Luke Dashjr 7aa253d3ec Bump version to 0.5.2 2011-12-16 17:58:40 -05:00
Matt CoralloandLuke Dashjr 9ea0699278 Update debian changelog to 0.5.1. 2011-12-16 17:55:44 -05:00
Luke Dashjr f1a6d74775 Merge branch '0.5.0.x' into 0.5.x 2011-12-16 17:54:53 -05:00
Luke Dashjr 5fe2dbd7b6 Update debian changelog to 0.5.0.3. 2011-12-16 17:47:50 -05:00
Luke Dashjr ace5ce05be Bump version to 0.5.0.3 2011-12-15 19:34:37 -05:00
Luke Dashjr 98c0b8b85e Bump version to 0.5.0.2 2011-12-15 19:32:15 -05:00
Luke Dashjr 1f53204045 Bump version to 0.4.3 2011-12-15 19:25:29 -05:00
Matt CoralloandLuke Dashjr 181b863d22 Fix status bar not displaying Alerts. 2011-12-13 16:17:58 -05:00
Gavin Andresen b12fc3e112 Merge pull request #700 from TheBlueMatt/qtalertfix
Fix status bar not displaying Alerts.
v0.5.1 v0.5.1rc2
2011-12-13 12:56:26 -08:00
Matt Corallo 7ca47cece7 Fix status bar not displaying Alerts. 2011-12-13 15:29:17 -05:00
Wladimir J. van der LaanandLuke Dashjr 142e5056cd Enable wordwrap for long message in passphrase dialog
- Remove explicit resizing from constructor to prevent potential hang
2011-12-13 12:46:58 -05:00
Wladimir J. van der Laan 857aa73783 Enable wordwrap for long message in passphrase dialog
- Remove explicit resizing from constructor to prevent potential hang
2011-12-13 16:32:25 +01:00
Gavin Andresen 5491c310a6 Merge commit '7298ebb' v0.5.1rc1 2011-12-12 15:03:16 -05:00
Nils Schneider 1d8b4cd544 added translations: pt_BR zh_CN 2011-12-12 20:56:34 +01:00
Nils Schneider 7ad4ca9c17 updated translations: es es_CL nb ru 2011-12-12 20:53:18 +01:00
Matt CoralloandLuke Dashjr 9a7f4948c6 Re-enable RPCSSL in gitian builds. 2011-12-12 14:39:49 -05:00
Luke Dashjr 12c69167e3 Merge branch '0.4.x' into 0.5.x 2011-12-12 14:34:47 -05:00
Luke Dashjr b379bc5eef Merge branch 'restore_old_miniupnp_compat' into 0.4.x 2011-12-12 14:33:47 -05:00
Gavin Andresen 93e92d3f44 Merge pull request #687 from TheBlueMatt/gitianssl
Re-enable RPCSSL in gitian builds.
2011-12-12 11:33:17 -08:00
Gavin Andresen ca287d66f2 Merge pull request #694 from luke-jr/restore_old_miniupnp_compat
Restore compatibility with miniupnpc 1.5 (without breaking miniupnp 1.6)
2011-12-12 11:32:48 -08:00
Luke Dashjr 94b97046fd Restore compatibility with miniupnpc 1.5 (without breaking miniupnp 1.6) 2011-12-10 11:52:50 -05:00
Wladimir J. van der Laan 189dbde982 Merge pull request #693 from laanwj/min_fix_tmpshow
Prevent window from being shown momentarily when using -min
2011-12-09 13:43:34 -08:00
Wladimir J. van der Laan 45198af2be Prevent window from being shown momentarily when using -min
- In a previous patch, show() was added to all the page switcher functions. As the contructor calls showOverviewPage(), this means the window is shown in the constructor.
- This change prevents this by connecting show() to the signal instead.
2011-12-09 22:41:19 +01:00
Matt Corallo a22535144c Re-enable RPCSSL in gitian builds. 2011-12-07 10:28:01 -05:00
Matt CoralloandLuke Dashjr 16e7c05de7 Move -lgdi32 after -lcrypto (fixes #681). 2011-12-05 11:08:48 -05:00
Gavin Andresen 8848a70ba1 Merge pull request #679 from laanwj/cmdline_minimize
Implement -min option to start minimized
2011-12-05 07:53:15 -08:00
Gavin Andresen f66eabd281 Merge pull request #682 from TheBlueMatt/gdicrypto
Move -lgdi32 after -lcrypto (fixes #681)
2011-12-05 07:53:00 -08:00
Wladimir J. van der Laan 7915370cb9 Implement -min option to start minimized 2011-12-04 10:03:57 +01:00