Commit Graph

6737 Commits

Author SHA1 Message Date
evan82
2a6d51af8d Merge pull request #229 from UdjinM6/v0.11.2.x_fix_strings
V0.11.2.x fix strings
2015-03-06 07:02:28 -07:00
evan82
953e978424 Merge pull request #228 from UdjinM6/v0.11.2.x_masternodes.dat_rename
V0.11.2.x rename masternodes.dat
2015-03-06 07:02:16 -07:00
evan82
8923f46f09 Merge pull request #227 from UdjinM6/v0.11.2.x_fix_console_spam
V0.11.2.x more fixes for console spam
2015-03-06 07:01:52 -07:00
Mike Kinney
ed3e22d1f0 remove trailing space 2015-03-05 23:28:25 -08:00
Mike Kinney
757128bfe0 v0.11.2.x Updating comments 2015-03-05 23:24:34 -08:00
snogcel
645a77f5e7 CSS WIP v10 2015-03-05 21:55:06 -07:00
crowning2
142b6fb32c Merge upstream 2015-03-05 21:43:51 +01:00
UdjinM6
e0714aac5d fix strings to translate once / typo 2015-03-05 20:42:50 +03:00
UdjinM6
e522cbfd6a rename masternodes.dat->mncache.dat / fix strings 2015-03-05 20:39:47 +03:00
UdjinM6
2e0d7ab0b6 fix even more console spam 2015-03-05 19:40:17 +03:00
Evan Duffield
5bc821cb5e Changed max rounds to 6 in UI
-Rounds are 100x+ more secure, so even 4 rounds should be highly secure
-If users still want more rounds, they can use the parameter -darksendrounds to use up to 16
2015-03-05 08:28:16 -07:00
Evan Duffield
f63e1ddfd0 Merge branch 'v-1.11.2.x' of https://github.com/darkcoinproject/darkcoin into v0.11.2.x 2015-03-05 08:23:43 -07:00
Evan Duffield
1053c299ed version/protocol bump 2015-03-05 08:23:21 -07:00
Evan Duffield
76953d9eba Merge branch 'mkinney-v0.11.2-comments' intt push origin v0.11.2.xo v0.11.2.x 2015-03-05 08:18:54 -07:00
Evan Duffield
9aca26d220 merged mkinney-v0.11.2 2015-03-05 08:18:45 -07:00
evan82
ed57dd2695 Merge pull request #224 from vertoe/devel-0.9
Merge master, translations, upstream
2015-03-05 08:16:08 -07:00
evan82
5965bec6ba Merge pull request #222 from UdjinM6/v0.11.2.x_reject_too_old_mn
v0.11.2.x better old mn filtering
2015-03-05 08:15:01 -07:00
evan82
2773bb1f78 Merge pull request #223 from UdjinM6/v0.11.2.x_fix_console_spam
v0.11.2.x fix console spam
2015-03-05 08:14:45 -07:00
evan82
ecd9d4a436 Merge pull request #225 from UdjinM6/v0.11.2.x_masternodes.dat_verification
V0.11.2.x masternodes.dat verification
2015-03-05 08:14:27 -07:00
Evan Duffield
c6f0259d9b fixed shared key usage 2015-03-05 08:08:03 -07:00
Mike Kinney
c8fe5a9cf7 V0.11.2.x update comments 2015-03-05 00:11:56 -08:00
Mike Kinney
98fe439af4 V0.11.2.x update comments 2015-03-05 00:10:15 -08:00
Mike Kinney
b0079d37ad V0.11.2.x update comments 2015-03-04 23:49:50 -08:00
UdjinM6
2a5d588784 Make masternodes.dat verification more specific, prevent from overwriting corruped files and files with unknown format, give more info in debug.log output 2015-03-05 02:46:50 +03:00
vertoe
247db2f56d Add some Tor nodes. 2015-03-04 21:26:44 +01:00
vertoe
c3c53dd8ed Pull translations from transifex. 2015-03-04 21:23:59 +01:00
vertoe
27121a2c07 Update translation source. 2015-03-04 21:21:37 +01:00
vertoe
885ee8fdc1 merge downstream 0.11.2 2015-03-04 21:08:03 +01:00
vertoe
e83be8c1b4 merge downstream 0.11.1 2015-03-04 21:07:24 +01:00
vertoe
33e8fc4c2b merge upstream 0.9 2015-03-04 21:06:27 +01:00
UdjinM6
0595ef80c3 fix console spam 2015-03-04 22:59:51 +03:00
crowning2
0a4aa64346 Daily upstream merge 2015-03-04 20:33:35 +01:00
crowning2
8702795d9d Daily upstream merge. 2015-03-04 20:32:56 +01:00
UdjinM6
84f4657ff9 Prevent masternodes with protocol less then nMasternodeMinProtocol (set to MIN_PEER_PROTO_VERSION by default now) to be able to stay in masternode list. Scenario: MIN_PEER_PROTO_VERSION was bumped but because we remember masternode we will never ask it for dsee again. 2015-03-04 22:04:02 +03:00
Evan Duffield
119007dd48 fix compiling for windows 2015-03-04 11:17:30 -07:00
evan82
ead462c2bb Merge pull request #218 from UdjinM6/v0.11.2.x_fix_masternodelist
V0.11.2.x fix masternodelist
2015-03-04 10:38:08 -07:00
evan82
0681d3144c Merge pull request #217 from UdjinM6/v0.11.2.x_fix_ds_ix_fee_calculation_display
V0.11.2.x fix ds&ix fee calculation&display
2015-03-04 10:37:22 -07:00
Evan Duffield
ba270619bf missing file 2015-03-04 10:35:50 -07:00
Evan Duffield
a6b58ab1e8 Merged masternode blinding 2015-03-04 08:58:36 -07:00
snogcel
d53e950671 CSS WIP v9 2015-03-03 23:05:30 -07:00
crowning2
6d58449987 Theme selector added to options-page 2015-03-03 21:49:40 +01:00
crowning2
25ccc86acd Merge upstream 2015-03-02 21:43:19 +01:00
UdjinM6
d2a1ecf524 add spaces to IP only in full mode 2015-03-02 07:54:34 +03:00
UdjinM6
64c1a8b147 remove "|" to make full mode a bit more compact 2015-03-02 07:45:18 +03:00
UdjinM6
3a4c3e401b add spaces to table-fy console view of "masternode list" 2015-03-02 07:36:38 +03:00
UdjinM6
62800573cc fix filtering for "active" (was broken after IP filtering) / reorder modes alphabetically 2015-03-02 07:35:13 +03:00
UdjinM6
4bfdcc181c fix IX and DS fee calculations / use coincontrol to show live calculations 2015-03-02 07:26:38 +03:00
evan82
96dbba0d5f Merge pull request #216 from vertoe/devel-0.9
Weekly translation updates.
2015-03-01 19:12:31 -07:00
evan82
369ca60da7 Merge pull request #215 from vertoe/devel-0.9-upstr
Fix priority calculation in CreateTransaction
2015-03-01 19:10:00 -07:00
evan82
68f81bbedc Merge pull request #214 from elanaint/elanaint-tor-docs
Add known tor relays
2015-03-01 19:08:36 -07:00