Commit Graph

9911 Commits

Author SHA1 Message Date
Holger Schinzel
cabef59f33 Merge branch 'master' into v0.12.0.x 2015-09-04 16:38:54 +02:00
Holger Schinzel
85c8950994 Merge branch 'v0.12.0.x' 2015-09-04 16:30:43 +02:00
Holger Schinzel
fd54976149 bump version 2015-09-04 15:33:53 +02:00
UdjinM6
dccd0432b5 Merge pull request #599 from UdjinM6/fix_mnw_limits
fix mnw limits
2015-09-04 16:08:44 +03:00
UdjinM6
7cede481a8 fix mnw limits 2015-09-04 15:22:17 +03:00
Holger Schinzel
4a055497fe version bump 2015-09-04 10:39:14 +02:00
Holger Schinzel
435f670921 Merge branch 'master' into v0.12.1.x 2015-09-04 10:38:04 +02:00
Holger Schinzel
6cf5a25e2b Merge branch 'master' into v0.12.0.x 2015-09-04 10:37:10 +02:00
crowning-
5783d5b446 Sanitize mnbudget prepare|submit names and URLs 2015-09-04 05:44:02 +02:00
Evan Duffield
62ea921eaa Merge branch 'v0.12.0.x' 2015-09-03 17:59:40 -07:00
evan82
e5e655a165 Merge pull request #596 from UdjinM6/translations20150902_
translations 20150902
2015-09-02 14:35:16 -07:00
UdjinM6
8d1609f0a5 translations 20150902 2015-09-03 00:32:34 +03:00
UdjinM6
2fc59109ae translations 20150902 2015-09-03 00:27:40 +03:00
Evan Duffield
386a39d00e fixed compile err 2015-09-02 09:53:53 -07:00
Evan Duffield
0111107853 Merge branch 'v0.12.0.x' 2015-09-02 05:22:45 -07:00
Evan Duffield
eebb03eb13 reduce memory usage 2015-09-02 05:20:06 -07:00
Evan Duffield
25894972c1 reduce memory usage 2015-09-02 05:13:32 -07:00
Evan Duffield
aaeda811db Revert "fix - ds can leak info by number of inputs"
This reverts commit f98fe6a208.
2015-09-02 05:06:22 -07:00
Evan Duffield
277ebbe83d v52 bump 2015-09-01 20:57:54 -07:00
Evan Duffield
2fd0cc306d Merge branch 'v0.12.1.x' into v0.12.0.x 2015-09-01 20:56:23 -07:00
evan82
7d8fb85c13 Merge pull request #564 from UdjinM6/v0.12.1.x_fix_ds_leak_inputs
V0.12.1.x DS can (potentially) leak info by number of inputs
2015-09-01 20:53:56 -07:00
evan82
b4d3de4e72 Merge pull request #573 from UdjinM6/v0.12.1.x_fix_sync
V0.12.1.x Fixes for sync:
2015-09-01 20:53:42 -07:00
evan82
982226a5b3 Merge pull request #584 from crowning-/patch-1
Added "Name" to 'mnbudget show' output for easier JSON-parsing
2015-09-01 20:53:28 -07:00
evan82
39c2e40b64 Merge pull request #589 from crowning-/v0.12.1.x
UI: button to toggle lock-state for all inputs in coin-control dialog
2015-09-01 20:53:09 -07:00
evan82
d0c1931c49 Merge pull request #590 from UdjinM6/fix_upnp_hotmn
Fix: local hot MN can't start if upnp is on
2015-09-01 20:52:51 -07:00
evan82
b3d0f8056e Merge pull request #594 from UdjinM6/fix_conflicted_dstx
Fix: dstx stuck sometimes
2015-09-01 20:52:23 -07:00
evan82
33f1d035cd Merge pull request #592 from UdjinM6/more_for_missing
Rpc changes for missing masternodes:
2015-09-01 20:52:11 -07:00
UdjinM6
be14946ba8 fix dstx: they were conflicted because of priority 2015-09-01 07:10:24 +03:00
UdjinM6
2b4ec27206 inv messages vectors should not be pushed directly 2015-08-31 10:06:59 -07:00
evan82
1b4ef1d33b Merge pull request #591 from UdjinM6/fix_inv
inv messages vectors should not be pushed directly
2015-08-31 09:39:57 -07:00
crowning-
5a8b613a72 UI: button to toggle lock-state (reload CSS fix) 2015-08-31 08:26:20 +02:00
UdjinM6
dcf020a886 Rpc changes for missing masternodes:
- show MN status in `masternode list-conf`, display MISSING if MN was not found in mn list
- do not allow to run `start-missing` and `start-disabled` until mn list is synced
2015-08-31 07:20:38 +03:00
UdjinM6
ef9b90aa09 inv messages vectors should not be pushed directly 2015-08-31 07:05:10 +03:00
UdjinM6
ce6e5cf8b0 fix bug where hot mn can't start if upnp is on 2015-08-31 05:30:03 +03:00
crowning-
aeb9a7d5ea UI: button to toggle lock-state for all inputs in coin-control dialog 2015-08-30 23:40:04 +02:00
Holger Schinzel
2c14877c6e Merge branch 'master' into v0.12.1.x
Conflicts:
	configure.ac
	src/clientversion.h
2015-08-30 09:26:40 +02:00
Holger Schinzel
be43f29c49 Merge pull request #587 from dashpay/master
Merge branch 'v0.12.0.x'
2015-08-30 09:22:49 +02:00
Evan Duffield
afa37a8442 Merge branch 'v0.12.0.x' 2015-08-29 19:25:38 -07:00
Evan Duffield
eb5f8922b4 mnbudget nextblock 2015-08-29 17:07:09 -07:00
Evan Duffield
fd22143a1b v51 bump 2015-08-29 16:48:54 -07:00
Evan Duffield
47fc1e750e revert c5d6b reduced mnw bandwidth 2015-08-29 16:48:19 -07:00
Evan Duffield
6ae7d8392b finbudget old vote check removed 2015-08-29 16:46:34 -07:00
Evan Duffield
c407ae35dd enable cache files / remove old vote check 2015-08-29 16:45:42 -07:00
Holger Schinzel
9db484871b bump version 2015-08-29 08:53:12 +02:00
Holger Schinzel
387fd1a97b Merge branch 'master' into v0.12.1.x 2015-08-29 08:52:21 +02:00
Holger Schinzel
c89f75d537 Merge branch 'master' into v0.12.0.x 2015-08-29 08:50:16 +02:00
Holger Schinzel
b1d28c923b Merge branch 'v0.12.0.x' 2015-08-29 08:24:49 +02:00
Holger Schinzel
1e6fcaec14 Merge pull request #586 from dashpay/schinzelh-patch-2
Update Makefile.qt.include
2015-08-29 08:17:42 +02:00
Holger Schinzel
c987fe0cd4 Update Makefile.qt.include
fix compile issue
2015-08-29 08:17:26 +02:00
Holger Schinzel
4506d057d6 Merge pull request #585 from dashpay/schinzelh-patch-1
Update Makefile.qt.include
2015-08-29 08:16:11 +02:00