Commit Graph

8820 Commits

Author SHA1 Message Date
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
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
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
evan82
b2f895ee08 Merge pull request #295 from UdjinM6/fix_possible_MN_breakage
fix possible MN breakage during mixing
2015-04-02 09:31:17 -07:00
UdjinM6
c8657cbb4d fix possible MN breakage during mixing 2015-04-02 19:26:45 +03:00
Evan Duffield
e29b66d1dc Merge branch 'master' of https://github.com/darkcoin/darkcoin 2015-04-01 20:33:27 -07:00
Evan Duffield
af6bf0f947 version bump 2015-04-01 20:32:57 -07:00
evan82
fd357be174 Merge pull request #293 from UdjinM6/fix_rpc_mn_list
Fixes for "masternode list"
2015-03-31 15:31:54 -07:00
evan82
24cd4665ba Merge pull request #292 from UdjinM6/fix_UI_masternode_litemode
Fix UI in masternode and lite modes
2015-03-31 15:29:53 -07:00
evan82
00fcbceeab Merge pull request #291 from crowning-/master
Images in share/pixmaps updated to Dash
2015-03-31 15:29:37 -07:00
Evan Duffield
ef96abcde4 Merge branch 'master' of https://github.com/darkcoin/darkcoin 2015-03-31 14:22:27 -07:00
Evan Duffield
57127ce661 use different cs for dsee 2015-03-31 14:21:59 -07:00
evan82
91cf419662 Merge pull request #290 from UdjinM6/fix_mn_dsee_activation
Fix MN dsee
2015-03-31 07:35:01 -07:00
UdjinM6
ae2dec6780 Fix MN dsee: MN should not update itself in MN list until it activated 2015-03-31 17:29:31 +03:00
UdjinM6
89f8a68a97 Fixes for "masternode list"
- fix descriptions and filtering in masternode list rpc, sort modes
- rename "active" to "status"
- move MN status string compilation to masternode.h
- "full" mode will use Status instead of IsEnabled now
2015-03-31 04:14:44 +03:00
crowning-
3572f140de Pathnames from .xpm files removed 2015-03-31 00:37:42 +02:00
UdjinM6
368c7a631e Fix UI in masternode and lite modes:
- disable entire DS frame in masternode mode and do not run timer
- hide DS and IX checkboxes in litemode
2015-03-31 01:27:20 +03:00
crowning-
afc8a60a68 Images in share/pixmaps updated to Dash 2015-03-31 00:20:29 +02:00
Evan Duffield
fea26cfb89 updated minimum for reference node 2015-03-30 12:33:42 -07:00
Evan Duffield
91d5f043ca Merge branch 'crowning--v0.11.2.x' 2015-03-30 09:06:26 -07:00
Evan Duffield
0dab1d059e updated chinese translations 2015-03-30 09:05:24 -07:00
Evan Duffield
370dec96c9 Merge branch 'v0.11.2.x' 2015-03-30 08:01:16 -07:00
crowning-
e67cc843dc Black border of Windows icons removed 2015-03-30 08:17:08 +02:00
Evan Duffield
8e8c117dd3 version bump 2015-03-29 22:19:15 -07:00
Evan Duffield
9d23c7fa3a translation updates 2015-03-29 22:18:16 -07:00
evan82
ec1484a99e Merge pull request #287 from thelazier/v0.11.2.x
Update rpcdarksend.cpp
2015-03-28 19:47:21 -07:00
thelazier
551dd3bc56 Update rpcdarksend.cpp 2015-03-29 09:25:32 +07:00
evan82
c1ed3fb5fd Merge pull request #285 from crowning-/v0.11.2.x
Create empty dash.conf during startup if it doesn't exist
2015-03-28 07:14:37 -07:00
crowning-
24d4738c22 Create empty dash.conf during startup if it doesn't exist 2015-03-28 14:22:57 +01:00
Evan Duffield
0202a9613f version bump 2015-03-27 18:08:46 -07:00
Evan Duffield
de073e8724 version bump 2015-03-27 18:06:13 -07:00