3854 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
wildkif	6c0dcf2b22	Merge remote-tracking branch 'origin/develop' into frontend	2019-05-28 19:34:04 +03:00
wildkif	a67869f7ec	contract UI changes	2019-05-28 19:33:49 +03:00
wildkif	8cfe21421a	fix error when buyer deposit is smaller than amount	2019-05-28 15:04:10 +03:00
wildkif	dcdf11c713	Merge remote-tracking branch 'origin/frontend' into develop	2019-05-27 18:19:05 +03:00
wildkif	290460c0f3	Merge remote-tracking branch 'origin/develop' into frontend	2019-05-27 18:17:57 +03:00
wildkif	0d4d0d377b	Contracts text changes part 2	2019-05-27 18:09:27 +03:00
wildkif	d69ac68bca	"same amount" checkbox fix	2019-05-27 17:00:24 +03:00
sowle	7cf2d34818	build: fixed a typo in windows build script	2019-05-26 23:29:28 +03:00
sowle	87618fba00	build: testnet prefix for windows build script	2019-05-26 12:09:09 +03:00
sowle	795c135b87	build: testnet support for windows build script	2019-05-25 21:16:01 +03:00
sowle	6d85e84d9b	build: build_prefix for windows build script	2019-05-25 20:15:09 +03:00
sowle	2924594ea6	pch: fix for changed way of inclusion of boost/timer.hpp	2019-05-25 19:55:38 +03:00
cryptozoidberg	af4aaa87c7	made notice for simplewallet more bright	2019-05-24 19:36:22 +02:00
cryptozoidberg	5fcb0d4848	set peers for testnet	2019-05-24 18:59:47 +02:00
cryptozoidberg	e29bd0aeb6	generated genesis for testnet, added missed lib to boost	2019-05-24 18:37:27 +02:00
wildkif	f8ae306116	Merge remote-tracking branch 'origin/frontend' into develop	2019-05-24 18:31:29 +03:00
wildkif	0b88f1a152	Merge remote-tracking branch 'origin/develop' into frontend	2019-05-24 18:30:45 +03:00
wildkif	d441de9e9f	zero amount error message in contracts	2019-05-24 17:59:51 +03:00
cryptozoidberg	8c065fd974	added notice for pos_mining in wallet, removed warnings with new boost	2019-05-24 15:51:10 +02:00
cryptozoidberg	aac9cb548b	Merge branch 'master' into develop	2019-05-24 15:01:28 +02:00
cryptozoidberg	027cc985ac	added getblocktemplate	2019-05-24 14:02:24 +02:00
wildkif	82b9d1046a	Contracts text changes && select scroll fix	2019-05-24 14:24:19 +03:00
AlekseiBo	18e0bdfa77	Update cloning instruction (#29)	2019-05-24 12:21:04 +02:00
AlekseiBo	c485037324	Remove good luck (#30)	2019-05-24 12:19:50 +02:00
sowle	cfdf54ebef	Merge branch 'release'	2019-05-24 01:08:42 +03:00
cryptozoidberg	9ce967b964	Merge branch 'develop' into release	2019-05-23 20:07:13 +02:00
cryptozoidberg	c4e2d3d5c7	Merge branch 'release' of github.com:hyle-team/zano into release	2019-05-23 20:07:06 +02:00
cryptozoidberg	9971db88aa	Merge branch 'develop' of github.com:hyle-team/zano into develop	2019-05-23 20:06:21 +02:00
cryptozoidberg	c4a3493b32	=== build number: 32 -> 33 ===	2019-05-23 20:05:32 +02:00
wildkif	134a0dafbc	Merge remote-tracking branch 'origin/develop' into develop	2019-05-23 20:18:01 +03:00
wildkif	be632c70ae	Merge remote-tracking branch 'origin/frontend' into develop	2019-05-23 20:17:29 +03:00
wildkif	c0742f281e	Merge remote-tracking branch 'origin/develop' into frontend	2019-05-23 20:17:10 +03:00
wildkif	ce56aff876	change lock time condition	2019-05-23 20:16:54 +03:00
sowle	c86500c6e9	Merge branch 'develop' into release	2019-05-23 18:56:29 +03:00
sowle	e676acf929	=== build number: 31 -> 32 ===	2019-05-23 18:56:17 +03:00
wildkif	628b3c8aa8	Merge remote-tracking branch 'origin/develop' into develop	2019-05-23 18:41:04 +03:00
wildkif	d28d41aaa7	Merge remote-tracking branch 'origin/frontend' into develop	2019-05-23 18:40:34 +03:00
wildkif	c927b1bdf1	Merge remote-tracking branch 'origin/develop' into frontend	2019-05-23 18:39:56 +03:00
wildkif	d6bf5818df	disable wrong time notification && add lock time in history condition	2019-05-23 18:38:38 +03:00
cryptozoidberg	29c0487bd9	Merge branch 'release'	2019-05-23 05:11:51 +02:00
cryptozoidberg	963dab33b0	Merge branch 'develop' into release	2019-05-23 05:04:24 +02:00
cryptozoidberg	029f70c034	Merge branch 'release' of github.com:hyle-team/zano into release	2019-05-23 05:04:10 +02:00
cryptozoidberg	61e7cb855f	Merge branch 'develop' of github.com:hyle-team/zano into develop	2019-05-23 04:56:47 +02:00
sowle	007769124a	made crypto_ops::validate_key_image exception safe	2019-05-23 05:07:59 +03:00
sowle	f8f0e7a817	coretests: wallet_rpc_integrated_address_transfer fixed	2019-05-23 03:47:41 +03:00
sowle	204e6054c0	=== build number: 30 -> 31 ===	2019-05-23 03:24:57 +03:00
cryptozoidberg	039fafe574	minimum fee set as default fee to avoid cheap transactions	2019-05-23 02:00:37 +02:00
cryptozoidberg	ec92aee42e	Merge branch 'develop' of github.com:hyle-team/zano into develop	2019-05-23 01:57:17 +02:00
sowle	84ded15e1a	set default Linux/gcc configuration to Release, while keeping MSVC/XCode intact	2019-05-23 02:54:56 +03:00
wildkif	c9ea6e5195	Merge remote-tracking branch 'origin/frontend' into develop	2019-05-22 18:33:18 +03:00