277 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
wildkif	ac70747ed8	Merge branch 'master' into frontend	2019-04-03 11:39:41 +03:00
wildkif	cb532d4a54	setting scroll, wallet title	2019-04-03 11:38:49 +03:00
wildkif	b7cb319e22	Merge branch 'frontend'	2019-04-01 18:00:54 +03:00
wildkif	3c333684c0	Merge branch 'master' into frontend	2019-04-01 18:00:30 +03:00
wildkif	84d9388362	update FILE_RESTORED when start app	2019-04-01 17:59:59 +03:00
wildkif	af5d7577e6	Merge branch 'frontend'	2019-03-29 16:58:33 +02:00
wildkif	4cf090f083	Merge branch 'master' into frontend	2019-03-29 16:58:00 +02:00
wildkif	b66669b4b6	chart, contracts ng-select, wallet routing	2019-03-29 16:57:29 +02:00
sowle	46820873cf	CI test, part 0	2019-03-29 06:57:10 +03:00
wildkif	9cf1c61ac3	Merge branch 'frontend'	2019-03-28 17:42:23 +02:00
wildkif	2f9d149400	Merge branch 'master' into frontend	2019-03-28 17:41:53 +02:00
wildkif	bf92237967	long wallet name fix + hour(s) fix	2019-03-28 14:40:34 +02:00
wildkif	05f3cd5c0d	Merge branch 'frontend'	2019-03-27 16:29:36 +02:00
wildkif	7d9bf4a96f	Merge branch 'master' into frontend	2019-03-27 16:29:11 +02:00
wildkif	10e99d8b75	change order api requests	2019-03-27 16:27:47 +02:00
wildkif	029891a792	preloader implementation	2019-03-27 15:30:54 +02:00
wildkif	fb5479e222	Merge branch 'frontend'	2019-03-26 20:46:47 +02:00
wildkif	b5dce5e0fb	Merge branch 'master' into frontend	2019-03-26 20:46:19 +02:00
wildkif	0d1916f711	fix current build	2019-03-26 20:45:12 +02:00
wildkif	46dce16d95	Merge remote-tracking branch 'origin/frontend'	2019-03-26 17:57:48 +02:00
wildkif	837ad0b97d	Merge remote-tracking branch 'origin/master' into frontend	2019-03-26 17:57:26 +02:00
wildkif	7c401c2a78	alias comment fixes	2019-03-26 13:11:17 +02:00
wildkif	014a8fe737	Merge branch 'frontend'	2019-03-22 17:48:46 +02:00
wildkif	34b4237314	Merge branch 'master' into frontend	2019-03-22 17:47:06 +02:00
wildkif	83c243a20d	context menu, contracts	2019-03-22 17:45:57 +02:00
wildkif	49a5edd4ee	Wallet fixes #5 (4, 8, 12)	2019-03-22 17:30:15 +02:00
wildkif	b92e659b17	progress	2019-03-21 17:24:26 +02:00
wildkif	76a2a6b259	fixes	2019-03-21 09:56:11 +02:00
cr.zoidberg	3543ae0520	Merge branch 'master' of bbr.github.com:zano-project/zano	2019-03-19 00:18:32 +01:00
wildkif	87be459ccc	Wallet fixes #5 (3, 5, 6, 7, 9, 10, 11)	2019-03-18 17:04:17 +02:00
cryptozoidberg	56e5cd9d08	commented output dir change (to avoid build script breaking)	2019-03-15 23:00:24 +01:00
cryptozoidberg	4cd7ab3279	Merge pull request #21 from anonimal/gui ... CMake: add GUI convenience "bundle"	2019-03-15 22:55:18 +01:00
cr.zoidberg	406b7bf735	Merge branch 'master' of bbr.github.com:zano-project/zano	2019-03-15 20:36:29 +01:00
crypro.zoidberg	ad40b37df1	fixed misprint2	2019-03-15 20:36:01 +01:00
cr.zoidberg	44ffffa812	Merge branch 'master' of bbr.github.com:zano-project/zano	2019-03-15 20:21:47 +01:00
crypro.zoidberg	85571fdda9	fixed misprint	2019-03-15 20:18:29 +01:00
cr.zoidberg	9c44ad8ae8	Merge branch 'master' of bbr.github.com:zano-project/zano	2019-03-15 20:00:02 +01:00
crypro.zoidberg	a330901840	overloaded get_wild_keccack2	2019-03-15 19:58:47 +01:00
anonimal	4926d91190	CMake: add GUI convenience "bundle" ... Sets GUI target output to a GUI directory, copies needed HTML files for runtime. Related refactoring.	2019-03-14 23:31:04 +00:00
anonimal	a3ff52f00a	Makefile: remove redundant GUI target ... I have no idea how that got in there. I must've pushed a non-fixup'd branch by accident.	2019-03-14 23:26:50 +00:00
wildkif	5cbe1bafad	Merge remote-tracking branch 'origin/frontend'	2019-03-14 16:28:48 +02:00
wildkif	a811ee6367	Merge remote-tracking branch 'origin/master' into frontend	2019-03-14 16:28:18 +02:00
wildkif	4105dbe17c	fix	2019-03-14 16:26:29 +02:00
crypro.zoidberg	8ecde75e0d	cleared up code	2019-03-11 22:03:21 +01:00
crypro.zoidberg	db3fd44db7	added command line by default	2019-03-11 19:38:02 +01:00
cryptozoidberg	50b4a7e875	Merge pull request #20 from niXman/master ... fix ZANO-74 bug	2019-03-09 13:28:05 +01:00
niXman	518bccc856	fix ZANO-74 bug ... fix ZANO-74 bug	2019-03-09 11:48:57 +02:00
niXman	26fa51e4c7	fix ZANO-74 bug ... fix ZANO-74 bug	2019-03-09 11:48:16 +02:00
crypro.zoidberg	87dfca56a3	extended limitations on NOTIFY_REQUEST_GET_OBJECTS	2019-03-09 02:12:41 +01:00
cryptozoidberg	26addb2f53	Merge pull request #17 from anonimal/readme ... README: updated Linux build deps/directions	2019-03-08 16:28:17 +01:00