Evan Duffield
8916c12d45
Merge branch 'v0.12.1.x-env' into v0.12.1.x
2016-05-20 12:43:25 -07:00
Evan Duffield
184efef864
Added dash env files for testing environment
2016-05-20 12:42:46 -07:00
UdjinM6
d7cf3393c0
fix tab text truncation
2016-05-20 21:34:52 +03:00
Holger Schinzel
e76ec696b6
Merge pull request #785 from UdjinM6/fixFlatDB
...
fix flat-db
2016-05-20 20:14:18 +02:00
UdjinM6
f89635f73a
fix flat-db:
...
- no reason to read twice on load
- should read using temp object instead the one we want to save on dump
2016-05-20 20:46:34 +03:00
Evan Duffield
2c3e480681
Merge pull request #786 from UdjinM6/rightClickStartAlias
...
right-click to start alias in "My Masternodes" sub-tab
2016-05-20 10:21:22 -07:00
Evan Duffield
35aa7668a5
Merge branch 'v0.12.1.x' of https://www.github.com/dashpay/dash into v0.12.1.x
2016-05-20 10:19:19 -07:00
Evan Duffield
88f9ede15e
Merge branch 'v0.12.1.x-voting-fix' into v0.12.1.x
2016-05-20 10:18:55 -07:00
UdjinM6
16c20006ca
right-click to start alias in "My Masternodes" sub-tab
2016-05-20 16:15:02 +03:00
Holger Schinzel
43cd805282
Merge pull request #781 from UdjinM6/fixLibpngWarning
...
fix libpng warning
2016-05-20 07:43:57 +02:00
Holger Schinzel
95224abf8e
Merge pull request #784 from UdjinM6/fixMasternodeConfRead
...
fix CMasternodeConfig::read()
2016-05-20 06:01:32 +02:00
Holger Schinzel
bc1f83c02c
Merge pull request #779 from evan82/v0.12.1.x
...
Use chainparams instead of standalone func for mn confirms
2016-05-20 06:01:23 +02:00
UdjinM6
6fb9962424
fix CMasternodeConfig::read()
2016-05-20 01:29:34 +03:00
Evan Duffield
49b8123ae1
commenting out part of flatfile.dump, which is causing data corruption
2016-05-19 14:27:09 -07:00
Evan Duffield
deb0f0ca14
fixed vote casting
2016-05-19 14:08:57 -07:00
Evan Duffield
d8453bb92b
Use chainparams instead of standalone func for mn confirms
...
- Use function instead of chainparams directly
2016-05-19 13:54:23 -07:00
Holger Schinzel
3485f9897c
Merge pull request #780 from dashpay/schinzelh-patch-1
...
Update masternodeconfig.h
2016-05-19 22:37:39 +02:00
UdjinM6
5d775240b0
fix "GUI: libpng warning: iCCP: known incorrect sRGB profile" using mogrify
2016-05-19 23:14:56 +03:00
Holger Schinzel
cbfbc096d1
Update masternodeconfig.h
...
removing printf - breaks the build https://travis-ci.org/dashpay/dash/jobs/131496337#L1485
2016-05-19 22:05:58 +02:00
Evan Duffield
a3116768ab
Use chainparams instead of standalone func for mn confirms
...
- Use function instead of chainparams directly
2016-05-19 12:18:16 -07:00
Evan Duffield
22661ad60d
Merge pull request #778 from UdjinM6/lightTheme
...
Fixing light theme
2016-05-19 11:37:08 -07:00
Evan Duffield
a69a643c6e
Merge pull request #777 from crowning-/UI_Enhancements
...
[UI] Change default theme to "DASH-light"
2016-05-19 11:36:47 -07:00
Evan Duffield
1376208c61
Merge pull request #776 from UdjinM6/masternodeTab
...
Add masternode tab in qt wallet
2016-05-19 11:36:26 -07:00
Evan Duffield
2ca8c85820
fixed voting errors
2016-05-19 11:34:43 -07:00
Evan Duffield
5a5a556608
added project env file
2016-05-17 15:19:53 -07:00
UdjinM6
86bca13e1e
fix dumb bug in signal connection
2016-05-16 22:27:43 +03:00
UdjinM6
c5c0aa78fc
moved "Show Masternodes Tab" to Expert features
2016-05-16 15:43:45 +03:00
UdjinM6
050b707d9f
Icon update (thanks @salmion)
2016-05-16 02:05:42 +03:00
UdjinM6
020ecebb3e
Use options to choose whether to show Masternodes tab or not. Should be set to true at first run for those who have masternodes in their masternode.conf and false for others.
2016-05-16 01:55:20 +03:00
UdjinM6
843453fb66
More fixes for Masternodes tab:
...
- set initial columns size
- use resizable columns
- use theme-dependent masternodes icon (placeholder, should be replaced)
- removed unused event binding
- capitalization, more verbose ui element names
2016-05-15 19:43:22 +03:00
Evan Duffield
2cec48631e
Merge branch 'v0.12.1.x' of https://www.github.com/dashpay/dash into v0.12.1.x
2016-05-13 09:03:35 -07:00
Evan Duffield
9031c5e3cb
Update some governance logic
2016-05-13 09:03:01 -07:00
UdjinM6
12239be138
Fix tx icons for light theme (thanks @snogcel)
2016-05-13 12:42:51 +03:00
UdjinM6
9101c54d30
Fixing light theme:
...
- colorized few images/icons to use “Strong blue” #1c75bc
- replaced "smile" icon with pick-axe
- fixed ds status overlap
- trying to make theme less "heavy" - fewer bold labels, lighter colors for labels
- removed unused files
2016-05-12 16:59:33 +03:00
crowning-
4584201d9b
[UI] Change default theme to "DASH-light"
2016-05-11 20:42:38 +02:00
UdjinM6
3764e6869a
Add masternode tab in qt wallet
2016-05-11 15:50:04 +03:00
Holger Schinzel
25c4341311
Merge pull request #775 from UdjinM6/fixPid
...
fix pid dash.pid -> dashd.pid
2016-05-11 11:37:54 +02:00
Holger Schinzel
c77d9830ae
Merge pull request #774 from thelazier/patch-2
...
Fix Hot Masternode
2016-05-11 11:37:46 +02:00
Holger Schinzel
28fc3bae6e
Merge pull request #762 from crowning-/patch-3
...
[UI] Enable themed *.png icons again for Linux
2016-05-11 11:37:41 +02:00
UdjinM6
12317fa13e
fix pid dash.pid -> dashd.pid
2016-05-11 12:30:52 +03:00
TheLazieR Yip
fe66b5acd0
Fix Hot Masternode
...
Add Update Masternode List from created masternode broadcast before relay.
2016-05-11 03:45:11 +07:00
Holger Schinzel
e5bcd0598b
Merge pull request #773 from thelazier/patch-1
...
Fix Hot Masternode
2016-05-10 19:39:33 +02:00
Holger Schinzel
feabb140a3
Merge pull request #772 from UdjinM6/fixTests
...
Fix tests
2016-05-10 19:39:08 +02:00
TheLazieR Yip
56adee2de2
Fix Hot Masternode
...
Revert to master branch
2016-05-10 21:53:08 +07:00
UdjinM6
d11c6e7151
fix blockchain.py
2016-05-10 16:13:37 +03:00
UdjinM6
a4c098141a
fix tests to follow #767
2016-05-10 16:12:21 +03:00
Evan Duffield
0c6c21f099
Merge pull request #768 from UdjinM6/unifySubsidy
...
Unify subsidy formulas for different networks, add few comments
2016-05-10 06:11:17 -07:00
Holger Schinzel
8a03d1630d
Merge pull request #770 from crowning-/patch-5
...
[UI] Rebranding: PrivateSend/InstantSend (update)
2016-05-10 13:36:02 +02:00
UdjinM6
b9ad319d00
Unify subsidy formulas for different networks, add few comments
2016-05-10 12:50:57 +03:00
Holger Schinzel
641f464d44
Merge pull request #771 from dashpay/schinzelh-patch-1
...
Some houskeeping
2016-05-10 10:01:25 +02:00