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
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
Evan Duffield
f227a13cb1
Merge branch 'v0.11.2.x' of https://github.com/darkcoinproject/darkcoin into v0.11.2.x
2015-03-27 17:42:56 -07:00
Evan Duffield
a5e5476995
imported updated translations
2015-03-27 17:42:35 -07:00
evan82
d20ee3fcb7
Merge pull request #281 from crowning-/v0.11.2.x
...
Icons updated to Dash + German translation fixed
2015-03-27 16:37:54 -07:00
crowning-
dbc093f834
Merge remote-tracking branch 'upstream/v0.11.2.x' into v0.11.2.x
2015-03-27 23:49:13 +01:00
crowning-
2d5dd18548
Line-break (which breaks the layout) removed from German translation.
2015-03-27 23:44:52 +01:00
evan82
0751ca257f
Merge pull request #282 from UdjinM6/v0.11.2.x_fix_icns
...
(mac) icns with new logo
2015-03-27 10:38:53 -07:00
UdjinM6
e6ec450fa1
(mac) icns with new logo
2015-03-27 20:12:34 +03:00
Evan Duffield
d1fad966e9
DASHS -> DASH
2015-03-27 08:54:29 -07:00
Evan Duffield
6a75e6e52e
updated chinese translations
2015-03-27 08:04:17 -07:00
Evan Duffield
b929991ff9
deleted unused translation files
2015-03-27 07:32:19 -07:00
crowning-
4421c968cf
256x256 pics updated to Dash logo
2015-03-26 23:08:01 +01:00
crowning-
253c9d79fd
256x256 pics updated to Dash
2015-03-26 23:07:31 +01:00
Evan Duffield
79edce5f5d
version bump
2015-03-26 14:58:10 -07:00
crowning-
073e55fcc5
Dash images for toolbar
2015-03-26 22:56:48 +01:00
evan82
2ac84caffc
Merge pull request #280 from crowning-/v0.11.2.x
...
Dash icons for Windows
2015-03-26 14:18:27 -07:00
crowning-
d6db2a35c6
Dash icons for Windows
2015-03-26 22:12:53 +01:00
Evan Duffield
b89fd2e149
compiling warnings / fixed block comparison
2015-03-26 14:11:05 -07:00
Evan Duffield
a34ca7a88c
Reference node fixes / debugging
...
- Only allow payments to be created once per blockHeight
2015-03-26 13:46:19 -07:00
Evan Duffield
6c9cc68449
version 12
2015-03-26 07:29:56 -07:00
Evan Duffield
6eae1071dc
Merge branch 'v0.11.2.x' of https://github.com/darkcoin/darkcoin into v0.11.2.x
2015-03-26 07:25:05 -07:00
