9905 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Evan Duffield	6b31970f13	Fix payment cycle when network is in the process of updating	2015-08-20 08:37:05 -07:00
Holger Schinzel	342522352d	Merge pull request #552 from dashpay/master ... merge back	2015-08-19 07:18:53 +02:00
Evan Duffield	e1306eb272	Merge branch 'v0.12.0.x'	2015-08-18 18:06:25 -07:00
Evan Duffield	ba1bc44737	version bump - v46	2015-08-18 18:06:13 -07:00
Evan Duffield	37ae8d36b1	Merge branch 'v0.12.0.x'	2015-08-18 18:04:04 -07:00
evan82	4f99745b92	Merge pull request #551 from UdjinM6/v0.12.0.x_disable_mncache ... V0.12.0.x disable mncache	2015-08-18 13:52:51 -07:00
UdjinM6	f119afb43b	it’s ok to be banned for dseg, you’ll just find another peers	2015-08-18 23:46:47 +03:00
evan82	7fb5f5881c	Merge pull request #549 from UdjinM6/v0.12.0.x_msghand ... V0.12.0.x msghand	2015-08-18 12:35:19 -07:00
pstratem	ade97928f7	replace absolute sleep with conditional wait	2015-08-18 21:07:30 +03:00
evan82	418a9eeb37	Merge pull request #547 from UdjinM6/v0.12.0.x_fix_sync_progressbar_text ... V0.12.0.x fix sync progressbar text	2015-08-18 08:16:33 -07:00
UdjinM6	0ecf85fea9	fix sync progressbar text	2015-08-18 06:01:17 +03:00
Evan Duffield	a7ec2deed9	Fix Masternode Payments rank calculation	2015-08-17 15:42:51 -07:00
UdjinM6	25e4c54a26	Merge pull request #546 from UdjinM6/v0.12.0.x ... Update masternode-budget.md	2015-08-17 15:55:29 +03:00
UdjinM6	fc9118c253	Update masternode-budget.md	2015-08-17 15:51:12 +03:00
Evan Duffield	b2b2ceff52	Merge branch 'v0.12.0.x'	2015-08-15 19:47:22 -07:00
Evan Duffield	b0e718a6ca	v0.12.0.45	2015-08-15 19:46:54 -07:00
evan82	59e594546c	Merge pull request #538 from UdjinM6/v0.12.0.x_translations20150815 ... Chinese TW update	2015-08-15 19:42:35 -07:00
UdjinM6	cd819e5a40	chinese tw	2015-08-16 05:39:39 +03:00
evan82	8a24144222	Merge pull request #537 from UdjinM6/v0.12.0.x_fix_ds ... V0.12.0.x fix ds	2015-08-15 18:29:41 -07:00
UdjinM6	a723c2148e	fix DS bug - endless collateral creation until one of them confirms	2015-08-16 03:29:16 +03:00
UdjinM6	628d281209	refactor names and select logic for ONLY_ coins enum members	2015-08-16 03:26:20 +03:00
Holger Schinzel	cfbcc81a36	Merge pull request #536 from dashpay/master ... merge master back to v12 branch	2015-08-16 00:44:30 +02:00
evan82	d1aed33d7a	Merge pull request #534 from UdjinM6/v0.12.0.x_fix_rpc_masternode_status ... fixes for masternrode rpc	2015-08-15 13:32:26 -07:00
evan82	6bd1d7d16e	Merge pull request #532 from UdjinM6/v0.12.0.x_fix_GetSporkValue ... fix GetSporkValue	2015-08-15 13:30:21 -07:00
evan82	0493f52c27	Merge pull request #531 from UdjinM6/v0.12.0.x_timeouts ... Timeouts fixes	2015-08-15 13:29:39 -07:00
evan82	c0beef9061	Merge pull request #530 from UdjinM6/v0.12.0.x_translations20150815 ... V0.12.0.x translations20150815	2015-08-15 13:08:09 -07:00
UdjinM6	9d3dc79b91	add masternodeSync.GetSyncStatus() / refactor mn sync status UI updates	2015-08-15 18:53:55 +03:00
UdjinM6	812cc6bbb1	let translations mix qt and printf	2015-08-15 17:32:55 +03:00
UdjinM6	121124dc1e	translations	2015-08-15 17:32:23 +03:00
UdjinM6	4ddb2c65c3	fixes for masternrode rpc	2015-08-15 17:22:56 +03:00
UdjinM6	1289327743	fix GetSporkValue	2015-08-15 16:34:38 +03:00
UdjinM6	d1e189fb57	add mn list and mnw timeouts / use gettime / lower base timeout	2015-08-15 16:30:30 +03:00
Evan Duffield	24b7028b2e	lock wallet for select	2015-08-14 19:06:00 -07:00
Evan Duffield	0d5ca11c9a	check mnw peer version	2015-08-14 16:22:16 -07:00
Evan Duffield	6040fc6f83	fix GetSporkValue return	2015-08-14 12:57:41 -07:00
Evan Duffield	cfe1bdd1e2	fix spork int error	2015-08-14 11:43:28 -07:00
Evan Duffield	61223ed147	Fix dseg message	2015-08-14 09:15:50 -07:00
Evan Duffield	700bf2798f	Merge branch 'v0.12.0.x'	2015-08-14 07:40:22 -07:00
evan82	ea8d508561	Merge pull request #519 from UdjinM6/v0.12.0.x_hide_oosw_on_bc ... V0.12.0.x hide "out of sync" warning on blockchain sync	2015-08-14 07:39:18 -07:00
Evan Duffield	5ce46672e2	Merge branch 'v0.12.0.x'	2015-08-14 07:30:21 -07:00
evan82	c062c4b650	Merge pull request #525 from UdjinM6/v0.12.0.x_dsee_dseep ... V0.12.0.x more fixes - "dsee updated entry"	2015-08-14 07:17:44 -07:00
Evan Duffield	54ee699112	nBlockEnd/nAmount budget item check ... - Make sure nBlockEnd > nBlockStart+Cycle - Make sure nAmount is more than 1DASH	2015-08-14 06:35:36 -07:00
Evan Duffield	c1b860bfb5	Merge branch 'v0.12.0.x'	2015-08-14 05:52:26 -07:00
UdjinM6	001b8cf709	more fixes - dsee updated entry	2015-08-14 08:11:57 +03:00
evan82	c936bfe7f3	Merge pull request #524 from UdjinM6/v0.12.0.x_dsee_dseep ... V0.12.0.x more fixes - misbehave / rpc	2015-08-13 21:02:23 -07:00
Evan Duffield	5b9c1d2b3c	Merge branch 'v0.12.0.x' of https://github.com/dashpay/dash into v0.12.0.x	2015-08-13 20:57:12 -07:00
Evan Duffield	dc70f73221	add budget timeout	2015-08-13 20:56:58 -07:00
UdjinM6	61239dbb36	more fixes - misbehave / rpc	2015-08-14 06:18:08 +03:00
UdjinM6	821c2d84e3	Merge pull request #523 from UdjinM6/v0.12.0.x_dsee_dseep ... V0.12.0.x possible fix for dseep flood / log output	2015-08-14 05:05:06 +03:00
UdjinM6	f0790ed32c	fix dseep flood / log output	2015-08-14 04:14:08 +03:00