3854 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
sowle	e5c28e4642	Merge branch 'master' into offsig (2) ... # Conflicts: # tests/core_tests/multisig_wallet_tests.cpp	2019-04-30 18:45:12 +02:00
sowle	5435bdbc01	Merge branch 'master' into offsig ... # Conflicts: # tests/core_tests/multisig_wallet_tests.cpp	2019-04-30 18:44:15 +02:00
crypro.zoidberg	fc7e8d0514	Merge branch 'master' of github.com:hyle-team/zano	2019-04-30 18:35:36 +02:00
wildkif	557b0bf278	Merge branch 'frontend'	2019-04-30 17:27:14 +03:00
wildkif	194c7668f5	Merge branch 'master' into frontend	2019-04-30 17:26:38 +03:00
wildkif	85de9948a5	sorting contracts, search alias on creating new contract, fix creating wallet in root directory	2019-04-30 17:26:18 +03:00
wildkif	ff1e600ff2	comment for transaction length fix	2019-04-30 17:16:08 +03:00
sowle	13ea200399	tx_pool: do not remove txs with "future" receive_time as outdated	2019-04-30 16:58:01 +03:00
sowle	464f18f50c	wallet2: don't move coinbase txs into unconfirmed_txs container	2019-04-30 15:51:12 +03:00
wildkif	59569c5024	comment for transaction fix	2019-04-30 15:35:52 +03:00
crypro.zoidberg	319a61a59a	fixed timestamps trap for machine with late clock's	2019-04-30 02:30:55 +02:00
sowle	5b9677eaf9	=== build number: 16 -> 17 ===	2019-04-26 21:29:09 +03:00
sowle	fab4a7ddf1	coretest wallet_chain_switch_with_spending_the_same_ki + wallet fixes	2019-04-26 19:08:38 +03:00
wildkif	1cb050b367	Merge branch 'frontend'	2019-04-26 17:25:06 +03:00
wildkif	e9f6bf4d75	Merge branch 'master' into frontend	2019-04-26 17:24:23 +03:00
wildkif	86b84b9b31	add copy button to phrase page	2019-04-26 17:23:11 +03:00
crypro.zoidberg	7fc1eb4d8a	multiple fixes on coretests	2019-04-25 23:37:43 +02:00
crypro.zoidberg	18c35f2274	attempt to fix bug with unreturned key_images to tx_pool on reorganize	2019-04-25 01:41:57 +02:00
wildkif	a609f6b974	Merge remote-tracking branch 'origin/frontend'	2019-04-24 17:40:49 +03:00
wildkif	987a82159f	Merge remote-tracking branch 'origin/master' into frontend	2019-04-24 17:40:22 +03:00
wildkif	96c8da81b7	alias overflow fix	2019-04-24 17:20:44 +03:00
wildkif	3b975c7ce3	update contract state interval	2019-04-24 16:31:52 +03:00
wildkif	7b0cdafaa7	Merge branch 'frontend'	2019-04-23 18:00:35 +03:00
wildkif	43c137edd2	Merge branch 'master' into frontend	2019-04-23 18:00:04 +03:00
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