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
Wladimir J. van der Laan
149c1d890d
doc: Credit Jonas Nick in release notes
...
For discovering the vulnerability and discussing the fix that led to PR #5860 .
2015-04-06 09:27:41 +02:00
UdjinM6
bdee4cd3c5
fix cmd help for -masternodeminprotocol
2015-04-06 06:46:53 +03:00
UdjinM6
cddd69444f
small rpc description fixes
2015-04-06 00:59:25 +03:00
UdjinM6
f26aff36cd
unify copyright
2015-04-06 00:58:13 +03:00
UdjinM6
fabca0a428
more bitcoin->dash fixes
2015-04-06 00:56:58 +03:00
UdjinM6
8bd7e1d181
relax restrictions on AcceptableInputs
2015-04-05 22:37:15 +03:00
UdjinM6
d5f7a89097
update .pro
2015-04-05 03:14:25 +03:00
UdjinM6
f08ddc5eea
fix DSdenom/watchonly
2015-04-05 02:45:22 +03:00
UdjinM6
4c129040fe
fix unit icons (ugly but works, need to repaint however)
2015-04-05 02:25:32 +03:00
UdjinM6
b9d826a213
cleanup
2015-04-05 01:58:51 +03:00
UdjinM6
e54c11aabb
tests should compile now
2015-04-05 01:58:10 +03:00
UdjinM6
3f3b6bb3cb
rpc fixes
2015-04-05 01:57:25 +03:00
UdjinM6
4a325e7ebe
fix CreateNewBlock
2015-04-05 01:56:29 +03:00
UdjinM6
df12ef8601
move x11 algos to crypto/
2015-04-04 23:00:03 +03:00
UdjinM6
23129a063f
Merge branch 'master' into merge_btc010
2015-04-04 20:15:38 +03:00
UdjinM6
dd39898a6b
Merge branch 'master' into HEAD
...
Resolved conflicts:
configure.ac
src/clientversion.h
src/qt/locale/dash_bg.ts
src/qt/locale/dash_cmn.ts
src/qt/locale/dash_de.ts
src/qt/locale/dash_es.ts
src/qt/locale/dash_fi.ts
src/qt/locale/dash_pt.ts
src/qt/locale/dash_ru.ts
src/qt/locale/dash_sv.ts
src/qt/locale/dash_vi.ts
src/qt/res/icons/toolbar.png
src/qt/res/icons/toolbar_testnet.png
2015-04-04 19:45:02 +03:00
UdjinM6
64eebc3316
0.12 dirty merge'n'fix (bitcoin 0.10)
2015-04-04 19:24:37 +03:00
Evan Duffield
09a898769a
remove donations to multisig addresses
2015-04-03 20:26:55 -07:00
crowning-
833cf2b23e
Transaction type column width adjusted
2015-04-03 20:42:54 +02:00
evan82
d14c302b85
Merge pull request #296 from crowning-/master
...
Several UI improvements
2015-04-03 10:07:48 -07:00
crowning-
c97d8fb1f9
"Recent Transactions" font-size reduced by 1
2015-04-03 11:10:28 +02:00
crowning-
7c57a2ed80
Disable "Try Mix" and "Reset" buttons in Masternode mode
2015-04-03 10:25:14 +02:00
Wladimir J. van der Laan
24e48991d3
Merge pull request #5961
...
bf1cc80
2015-04-03 07:49:39 +02:00
crowning-
eb42ea204e
Centered in/out TX icons for a more harmonic look
2015-04-03 06:14:03 +02:00
crowning-
15e931b254
Off-centered vertical "About" image fixed
2015-04-03 05:51:55 +02:00
