Commit Graph

6502 Commits

Author SHA1 Message Date
evan82
0e2a1d68b3 Merge pull request #181 from crowning-/v0.11.2.x
Edit darkcoin.conf from within the wallet
2015-02-16 12:53:20 -07:00
evan82
70596bf868 Merge pull request #182 from vertoe/devel-0.9
Weekly translations update.
2015-02-16 12:51:35 -07:00
evan82
b861e7ac4c Merge pull request #183 from UdjinM6/v0.11.2.x_activemn_msgs
(v0.11.2.x) fix log output / more notCapableReason-s
2015-02-16 12:51:04 -07:00
evan82
e3df2faa74 Merge pull request #184 from UdjinM6/v0.11.2.x_fix_qt_multiple_recipients
(v0.11.2.x) qt bug multiple recipients are wrongly send as IX
2015-02-16 12:49:09 -07:00
evan82
a3f4946788 Merge pull request #185 from UdjinM6/v0.11.2.x_fix_new_winner_selection
(v0.11.2.x) Fix payee selectoin on CMasternodePayments::ProcessBlock
2015-02-16 12:47:31 -07:00
UdjinM6
428d5976c7 Fix payee selectoin on CMasternodePayments::ProcessBlock
1) find exact payment list
2) find active MNs not payment list
3) if none found - pay to the first active MN from payment list counting from its back
2015-02-16 22:37:24 +03:00
Evan Duffield
55c6685402 reference node upgrades 2015-02-16 11:35:37 -07:00
vertoe
08d4a91364 Pull translations from transifex. 2015-02-16 09:55:08 +01:00
UdjinM6
2315b9ab28 fix bug where txes with multiple recipients were send from qt as IX while checkbox was not set 2015-02-16 02:42:08 +03:00
UdjinM6
58bcb321d9 fix log output / more notCapableReason-s 2015-02-16 02:01:06 +03:00
crowning-
e7ee887836 Edit configuration file from within wallet (formating + text change) 2015-02-15 16:26:57 +01:00
vertoe
2b5157c6ed Pull translations from transifex. 2015-02-15 16:06:14 +01:00
vertoe
063dc20dd4 merge downstream 0.11.2 2015-02-15 14:37:00 +01:00
vertoe
dd5a7163df Pull translations from transifex. 2015-02-15 14:35:52 +01:00
vertoe
1a3586700e Update untranslated strings. 2015-02-15 14:34:56 +01:00
crowning-
0cc5e478bf Edit configuration file from within wallet 2015-02-15 14:33:31 +01:00
crowning-
8e312833ea Edit configuration file from within wallet 2015-02-15 14:33:01 +01:00
crowning-
e4a290dc04 Update guiutil.h 2015-02-15 14:32:19 +01:00
crowning-
dc3f49bad7 Edit configuration file from within wallet 2015-02-15 14:31:51 +01:00
crowning-
1264546def Edit configuration file from within wallet 2015-02-15 14:31:11 +01:00
crowning-
2d703f8010 Edit configuration file from within wallet 2015-02-15 14:30:22 +01:00
UdjinM6
287b357e32 fix %% calculation on keypool generation 2015-02-15 02:23:16 +03:00
evan82
3d004ab819 Merge pull request #178 from vertoe/devel-0.9-upstream
Implement BIP66
2015-02-14 08:14:03 -07:00
vertoe
e2953f8442 merge upstream 0.9 2015-02-14 08:59:11 +01:00
vertoe
2a1d86ff60 Pull translations from transifex. 2015-02-14 08:57:47 +01:00
vertoe
fb6a288fbc merge downstream 0.11.1 2015-02-14 08:50:55 +01:00
vertoe
692b2e05f7 merge upstream 0.9 2015-02-14 08:48:10 +01:00
Evan Duffield
bdbdbf993f fixed log message 2015-02-13 12:53:45 -07:00
Evan Duffield
70c4e0bdee remove safemode checks for masternode payments & IX block enforce 2015-02-13 12:22:58 -07:00
Evan Duffield
b7b2549e56 blockheight should default to current height 2015-02-13 07:55:08 -07:00
Evan Duffield
65aa7db8a2 fixed sync message 2015-02-13 07:43:44 -07:00
Gregory Maxwell
6b4163b972 Sanitize command strings before logging them.
Normally bitcoin core does not display any network originated strings without
 sanitizing or hex encoding.  This wasn't done for strcommand in many places.

This could be used to play havoc with a terminal displaying the logs,
 especially with printtoconsole in use.

Thanks to Evil-Knievel for reporting this issue.

Conflicts:
	src/main.cpp
	src/net.cpp
	src/rpcserver.cpp

Rebased-From: 28d4cff0ed
Github-Pull: #5770
2015-02-13 13:32:39 +01:00
Wladimir J. van der Laan
864338a2b2
Merge pull request #5762
3230b32 Raise version of created blocks, and enforce DERSIG in mempool (Pieter Wuille)
989d499 Backport of some of BIP66's tests (Pieter Wuille)
ab03660 Implement BIP 66 validation rules and switchover logic (Pieter Wuille)
2015-02-13 12:45:08 +01:00
vertoe
57e59353ff Update source translation file. 2015-02-13 09:29:18 +01:00
vertoe
4bed0a31b0 Pull translations from transifex. 2015-02-13 09:27:53 +01:00
vertoe
824cf61c8d merge downstream 0.11.2 2015-02-13 09:26:14 +01:00
vertoe
9dc8c1cf07 merge downstream 0.11.1 2015-02-13 09:25:59 +01:00
evan82
a9ff5617e9 Merge pull request #177 from UdjinM6/v0.11.1.x_fix_gui_performance_issues
V0.11.2.x Performance and UI Fixes Pack
2015-02-12 16:50:17 -07:00
Evan Duffield
831b281a7d Merge branch 'master' of https://github.com/darkcoin/darkcoin into v0.11.2.x 2015-02-12 16:49:26 -07:00
Evan Duffield
5907263729 sign payee for masternode payments 2015-02-12 12:55:14 -07:00
vertoe
d4070bc092 Pull translations >60% from transifex. 2015-02-12 12:01:14 -07:00
vertoe
9dc7008d81 Pull translations from transifex. 2015-02-12 12:01:14 -07:00
vertoe
920ecea2a1 only include translations >80% (now really\!) 2015-02-12 12:01:14 -07:00
vertoe
29722b89ee Pull translations from transifex. 2015-02-12 12:01:14 -07:00
vertoe
5556a22f7a only include translations >90% 2015-02-12 12:01:14 -07:00
vertoe
1fb19ac889 Revert "Fix coinbase maturity"
This reverts commit eafb791d8c.
2015-02-12 12:01:13 -07:00
vertoe
f6986b53f0 Pull translations from transifex. 2015-02-12 12:01:13 -07:00
vertoe
e6c36ddd92 Fix coinbase maturity 2015-02-12 12:01:13 -07:00
vertoe
2f160ef0d2 only include translations >75% 2015-02-12 12:01:13 -07:00
vertoe
34f49aa95f Pull translations from transifex. 2015-02-12 12:01:13 -07:00