crowning-
378fdf4c93
Merge remote-tracking branch 'upstream/master'
2015-04-10 21:43:45 +02:00
UdjinM6
62bbc1176e
fix merge
2015-04-10 20:08:01 +03:00
UdjinM6
8051f73446
bump MIN_POOL_PEER_PROTO_VERSION manually
2015-04-10 19:39:12 +03:00
UdjinM6
63ae382c72
ru
2015-04-10 19:34:43 +03:00
UdjinM6
3cfd9538d5
Merge branch 'master' into merge_btc010
2015-04-10 19:32:57 +03:00
snogcel
14d990362f
QScrollBar Fix Horizontal
2015-04-09 20:39:34 -06:00
snogcel
cc785e20bf
Merge remote-tracking branch 'upstream/master'
2015-04-09 20:37:22 -06:00
Evan Duffield
a79196bc19
fixed masternode find bug
2015-04-09 12:17:32 -07:00
Evan Duffield
e741ff590e
version bump
2015-04-09 10:12:04 -07:00
Evan Duffield
ac63729ff1
Merge branch 'v0.11.2.x'
2015-04-09 10:11:11 -07:00
Evan Duffield
91a669e231
Ref-node : Always fill vecLastPayments
...
- In some rare cases the vecLastPayments would get truncated and would start paying people it paid recently again. This stops that from happening.
2015-04-09 10:06:48 -07:00
Wladimir J. van der Laan
34127c77cb
doc: update release notes pre rc2
2015-04-09 10:19:52 +02:00
snogcel
2757360ace
QScrollBar Fix
2015-04-08 18:48:42 -06:00
evan82
be7658c8f1
Merge pull request #302 from UdjinM6/fix_progress
...
Fix progress
2015-04-08 15:31:34 -07:00
crowning-
680be25d2a
Added missing scrollbar-arrows
2015-04-09 00:31:01 +02:00
UdjinM6
a866e12f74
should set nMaxToAnonymize equal to denominatedBalance only if it's greater then it was possible to denominate
2015-04-08 21:27:35 +03:00
Evan Duffield
0f677c4583
version bump / reduce max rounds options in conf
2015-04-08 09:38:04 -07:00
Evan Duffield
acaa438aeb
Merge branch 'debug-voting' into v0.11.2.x
2015-04-08 09:36:01 -07:00
Evan Duffield
a4e8dfa0b6
fixed issues
2015-04-08 09:35:43 -07:00
Evan Duffield
3f57ac1aea
added debugging
2015-04-08 08:46:13 -07:00
Evan Duffield
7d5948012b
DS: Adjust Target Balance
...
- When targeting the entire balance, the wallet reports getting stuck at 99%.
2015-04-08 08:02:54 -07:00
evan82
cd4b13d86d
Merge pull request #301 from UdjinM6/fix_mnstop
...
masternode stop should disable MN and remove it from MN list
2015-04-08 07:17:52 -07:00
UdjinM6
58e418e1e1
add Peers menu item
2015-04-08 07:26:15 +03:00
UdjinM6
27514f0f80
masternode stop should disable MN and remove it from MN list
2015-04-08 07:02:23 +03:00
UdjinM6
865b63e52d
Merge branch '0.10' into merge_btc010
...
Conflicts:
doc/release-notes.md
doc/release-process.md
2015-04-08 06:15:17 +03:00
Evan Duffield
ec80b25217
updated chinese translations
2015-04-07 20:05:40 -07:00
Evan Duffield
ad348211f8
Merge branch 'v0.11.2.x' of https://github.com/darkcoin/darkcoin into v0.11.2.x
2015-04-07 20:04:02 -07:00
evan82
d7cdaad0e2
Merge pull request #300 from UdjinM6/fix_votes_filter
...
fix filtering for masternode list votes rpc
2015-04-07 17:48:06 -07:00
Evan Duffield
5c03872655
fixed vote crashes
2015-04-07 17:45:33 -07:00
UdjinM6
f358a8a698
fix filtering for masternode list votes rpc
2015-04-08 03:43:40 +03:00
Evan Duffield
88ab84a2e7
updated translatios
2015-04-07 17:35:22 -07:00
Evan Duffield
631e4b505f
fixed vote-many
2015-04-07 12:59:30 -07:00
Evan Duffield
13e4a7d33f
Merge branch 'v0.11.2.x' of https://github.com/darkcoin/darkcoin into v0.11.2.x
2015-04-07 10:22:10 -07:00
Evan Duffield
d120557b05
updated chinese translations
2015-04-07 10:09:42 -07:00
Evan Duffield
0b225546f7
check collateral before submitting
2015-04-07 09:41:31 -07:00
evan82
5ceebf83f6
Merge pull request #299 from UdjinM6/fix_spork
...
do not search for known sporks by hash, search only by ID
2015-04-07 08:30:04 -07:00
UdjinM6
debcbb75b1
do not search for known sporks by hash, search only by ID
2015-04-07 18:17:50 +03:00
Evan Duffield
83864c69c3
Merge branch 'master' of https://github.com/darkcoin/darkcoin into v0.11.2.x
2015-04-07 07:40:28 -07:00
evan82
ac51baf4a2
Merge pull request #297 from crowning-/master
...
Transaction type column width adjusted
2015-04-07 07:30:15 -07:00
evan82
b8ecf10af0
Merge pull request #298 from UdjinM6/fix_SelectCoinsByDenominations
...
Fix SelectCoinsByDenominations relative things:
2015-04-06 20:02:05 -07:00
UdjinM6
41f592aec7
Explicitly convert mutable txes to immutable before calling AcceptableInputs
2015-04-07 05:59:56 +03:00
UdjinM6
649434dd2e
Fix SelectCoinsByDenominations relative things:
...
- AvailableCoins inside SelectCoinsByDenominations should select denoms only now (also removing corresponding "if"s)
- use temporary vectors in doauto when call SelectCoinsByDenominations to prevent vCoins modification
- variables naming (set...->v...)
2015-04-07 05:52:49 +03:00
UdjinM6
955865481e
link to btc 0.10 in release notes
2015-04-07 04:50:32 +03:00
Evan Duffield
7e72c2bccf
added nDenom check for dsa
2015-04-06 16:07:25 -07:00
Evan Duffield
4af2978b51
Merge branch '11.2-ds-changes' into v0.11.2.x
2015-04-06 13:41:31 -07:00
Evan Duffield
42e056c5c5
version/proto bump
2015-04-06 13:41:08 -07:00
Evan Duffield
d928a53234
DS Working pretty well
2015-04-06 13:00:46 -07:00
Evan Duffield
18828b00ef
fixed overviewpage.cpp
2015-04-06 08:32:43 -07:00
Evan Duffield
f0192b1bb3
Reverting some DS changes
...
- Some changes caused instability of DS, this should fix that.
2015-04-06 08:14:26 -07:00
Gavin Andresen
1c62e84099
Keep mempool consistent during block-reorgs
...
This fixes a subtle bug involving block re-orgs and non-standard transactions.
Start with a block containing a non-standard transaction, and
one or more transactions spending it in the memory pool.
Then re-org away from that block to another chain that does
not contain the non-standard transaction.
Result before this fix: the dependent transactions get stuck
in the mempool without their parent, putting the mempool
in an inconsistent state.
Tested with a new unit test (adapted for 0.10).
Rebased-From: ad9e86dca1#5945
2015-04-06 11:38:43 +02:00
