3380 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
wildkif	45fba9e81f	contracts fix expiration time	2019-04-23 17:59:30 +03:00
sowle	6702b53662	Merge branch 'master' into offsig	2019-04-23 02:07:41 +03:00
sowle	c28f32de5f	tests fixed	2019-04-23 02:03:34 +03:00
sowle	408fab65a4	dump as json now supports different line endings + fixed logging for main_window	2019-04-23 02:03:09 +03:00
wildkif	f79e9937a6	Merge branch 'frontend'	2019-04-22 20:48:06 +03:00
wildkif	7082b6d2e6	Merge branch 'master' into frontend	2019-04-22 20:47:42 +03:00
wildkif	52cf6bd869	Merge branch 'master' into frontend	2019-04-22 20:46:46 +03:00
wildkif	0cf02e3fde	get alias when overflow	2019-04-22 20:44:59 +03:00
crypro.zoidberg	f408f93344	be sure that connection is closed on sentque overflow	2019-04-22 18:43:48 +02:00
cryptozoidberg	8c6bff263e	increased timeout(for stress tests)	2019-04-22 15:18:13 +02:00
cryptozoidberg	9d48b189a0	Increased timeout for (stress tests)	2019-04-22 15:17:16 +02:00
wildkif	1fac00329d	skip master pass and open wallet logic	2019-04-22 12:22:16 +03:00
sowle	a13a5b270a	Merge branch 'master' into offsig	2019-04-22 01:20:19 +03:00
cryptozoidberg	e2584ea520	cut offers from stress tests	2019-04-21 21:16:00 +02:00
sowle	a3bf957709	=== build number: 15 -> 16 ===	2019-04-20 19:31:56 +03:00
crypro.zoidberg	f7645670fe	fixed genesis and changed network	2019-04-20 17:37:11 +02:00
sowle	060d829f3a	Merge branch 'master' into offsig	2019-04-20 02:16:35 +03:00
sowle	edc6b99227	=== build number: 14 -> 15 ===	2019-04-20 00:51:31 +03:00
crypro.zoidberg	de4e22c835	fixed broken compilation	2019-04-19 22:14:07 +02:00
crypro.zoidberg	4d498a6d0e	changed difficulty type to string(to avoid uint64 overflow)	2019-04-19 22:10:37 +02:00
crypro.zoidberg	f6e3916904	Merge branch 'testnet3'	2019-04-19 21:47:46 +02:00
crypro.zoidberg	d69f4b9095	testnet3	2019-04-19 21:46:22 +02:00
crypro.zoidberg	89356d9a33	changed progpow	2019-04-19 20:19:59 +02:00
sowle	d51664e5dc	Merge branch 'master' into offsig ... # Conflicts: # tests/unit_tests/epee_levin_protocol_handler_async.cpp	2019-04-19 15:46:53 +03:00
wildkif	0c9821c262	skip button and open wallet modal styling	2019-04-19 14:32:02 +03:00
crypro.zoidberg	58b747bc33	Merge branch 'cache_target_data'	2019-04-18 23:31:16 +02:00
crypro.zoidberg	c673017836	Merge branch 'master' into cache_target_data	2019-04-18 23:30:35 +02:00
crypro.zoidberg	2b928ff692	Merge branch 'master' of github.com:hyle-team/zano	2019-04-18 23:30:14 +02:00
crypro.zoidberg	cfbe5d2bbc	implemented target_calculation optimisation	2019-04-18 23:29:38 +02:00
wildkif	ca144fa0d5	Merge branch 'frontend'	2019-04-18 17:56:40 +03:00
wildkif	323b85ae14	Merge branch 'master' into frontend	2019-04-18 17:55:51 +03:00
wildkif	4738cee061	change staking buttons	2019-04-18 17:51:32 +03:00
wildkif	d26fefb74a	changed color scheme for buttons and tabs	2019-04-18 16:55:55 +03:00
crypro.zoidberg	d846d26bf4	more preformance logs	2019-04-18 02:45:53 +02:00
sowle	2be037042f	some tests fixed	2019-04-18 03:22:19 +03:00
crypro.zoidberg	2f2a897bde	added forgoten fields and conversion	2019-04-17 19:43:06 +02:00
crypro.zoidberg	5dec82a2fc	added more details on performance monitoring	2019-04-17 19:24:44 +02:00
sowle	f412f2e418	minor improvement to increment build num script	2019-04-17 18:36:18 +03:00
sowle	7558c30c8a	attempt to fix tests compilation and linkage	2019-04-17 18:35:32 +03:00
wildkif	96067c3586	Merge remote-tracking branch 'origin/frontend'	2019-04-17 17:35:49 +03:00
wildkif	60c2d96c73	Merge remote-tracking branch 'origin/master' into frontend	2019-04-17 17:35:27 +03:00
wildkif	06fdc98190	restore wallet seed phrase error fix, no money error fix	2019-04-17 17:34:21 +03:00
wildkif	1b43f9e4e2	send money to alias	2019-04-17 17:12:32 +03:00
sowle	4fbca90553	serialization: std::pair<A,B> compilation fix for gcc	2019-04-16 09:37:27 +03:00
sowle	07a8dcc0d2	Merge branch 'master' into offsig	2019-04-15 15:32:58 +03:00
sowle	28b7c3db2b	compilation fixup	2019-04-15 15:31:39 +03:00
sowle	e66da1bf3e	Merge branch 'master' into offsig	2019-04-15 14:46:15 +03:00
crypro.zoidberg	47aa684f4d	added more debug info to pow verification	2019-04-14 23:41:24 +02:00
crypro.zoidberg	44fe6ada85	added nonce messge	2019-04-14 20:23:49 +02:00
crypro.zoidberg	e0e4220e79	added rpc command for ignoring offline status(for debug)	2019-04-14 14:15:24 +02:00