1
0
Fork 0
forked from lthn/blockchain
Commit graph

662 commits

Author SHA1 Message Date
wildkif
35ed0ab624 Merge remote-tracking branch 'origin/frontend' into develop 2019-06-11 13:51:09 +03:00
wildkif
c454187ea1 Merge remote-tracking branch 'origin/develop' into frontend 2019-06-11 13:50:48 +03:00
wildkif
e585853ba5 changed update url 2019-06-11 13:50:24 +03:00
wildkif
ad415d94e9 Merge remote-tracking branch 'origin/frontend' into develop 2019-06-11 13:14:03 +03:00
wildkif
3d94ec9bd3 Merge remote-tracking branch 'origin/develop' into frontend
# Conflicts:
#	src/gui/qt-daemon/html/main.js.map
2019-06-11 13:13:38 +03:00
wildkif
9f34597d2a implement net_time_delta_median 2019-06-11 13:05:54 +03:00
sowle
d4e979cd2b simplewallet: request password from CLI if running in RPC mode with no password specified (ZANO-364) 2019-06-10 21:32:56 +03:00
cryptozoidberg
b55c30337b
added proper handling mutex operating in lmdb, improved wallet backend error handling 2019-06-06 23:08:21 +03:00
cryptozoidberg
90c96228a3
Merge branch 'release' into develop 2019-06-06 18:21:33 +03:00
cryptozoidberg
79ff754744
Merge branch 'release' of github.com:hyle-team/zano into release 2019-06-06 18:21:07 +03:00
sowle
c04564c7b5 === build number: 38 -> 39 === 2019-06-06 18:20:44 +03:00
cryptozoidberg
0b945f9a5c
Merge branch 'develop' into release 2019-06-06 18:19:42 +03:00
cryptozoidberg
e86042716a
Merge branch 'release' of github.com:hyle-team/zano into release 2019-06-06 18:19:22 +03:00
cryptozoidberg
19daa91f08
attempt to fix bug in lmdb backend 2019-06-06 14:34:17 +03:00
sowle
b504849b0d stratum: tiny little improvements 2019-06-06 11:25:02 +03:00
cryptozoidberg
978ff8e592
changed url for donwloads page 2019-06-05 18:11:21 +03:00
cryptozoidberg
4acab07028
added more diagnostic logs for protocol 2019-06-05 15:51:15 +03:00
cryptozoidberg
006cfde72d
updated alerts json 2019-06-05 15:51:15 +03:00
sowle
07d36a787f Merge branch 'release' into develop 2019-06-05 15:27:57 +03:00
sowle
2b332610bb === build number: 37 -> 38 === 2019-06-05 13:48:05 +03:00
sowle
9ecdba0855 Merge branch 'develop' into release 2019-06-05 13:46:53 +03:00
sowle
c24b377ca0 Merge branch 'release' into develop 2019-06-05 13:31:19 +03:00
sowle
4a92325037 trying to fix macos build issue (3) 2019-06-05 12:53:09 +03:00
sowle
efdcd51f99 trying to fix macos build issue (2) 2019-06-05 02:13:07 +03:00
sowle
7de87c1851 trying to fix macos build issue 2019-06-05 01:40:40 +03:00
cryptozoidberg
bff0fcb572
Merge branch 'release' of github.com:hyle-team/zano into release 2019-06-04 23:06:53 +03:00
sowle
9492d2c9ea === build number: 36 -> 37 === 2019-06-04 22:53:08 +03:00
cryptozoidberg
11e530dab3
Merge branch 'develop' into release 2019-06-04 22:49:42 +03:00
cryptozoidberg
efed47ed1f
Merge branch 'release' into develop 2019-06-04 22:49:27 +03:00
cryptozoidberg
e0a919c492
Merge branch 'release' of github.com:hyle-team/zano into release 2019-06-04 22:48:57 +03:00
cryptozoidberg
41cc980023
fixed critical bug in altchain validation code 2019-06-04 21:47:13 +03:00
sowle
8cd7b03ff5 build: configuration script for win64 msvc testnet 2019-06-04 14:41:56 +03:00
sowle
5e117a2ed5 Merge branch 'release' into develop 2019-06-01 13:34:33 +03:00
sowle
17ef2dd156 === build number: 35 -> 36 === 2019-05-31 19:22:36 +03:00
sowle
366ccb7b67 Merge branch 'develop' into release 2019-05-31 19:17:04 +03:00
sowle
7af0159f59 === build number: 34 -> 35 === 2019-05-31 19:15:31 +03:00
sowle
8fbfa46460 build: macOS build script minor improvements 2019-05-31 18:52:08 +03:00
wildkif
93081e108e Merge remote-tracking branch 'origin/frontend' into develop 2019-05-31 16:34:54 +03:00
wildkif
0933026c2a Merge remote-tracking branch 'origin/develop' into frontend 2019-05-31 16:30:57 +03:00
wildkif
e9766aea65 reduced delay of hiding balance tooltip 2019-05-31 16:22:13 +03:00
sowle
af8958a7cc build: build script macOS improvements 2019-05-31 00:11:10 +03:00
sowle
f0f8f4309b build: build script macOS improvements (sha256, more verbose email) 2019-05-30 22:47:25 +03:00
sowle
f3e1816d67 build: build script linux improvements (sha256, more verbose email) 2019-05-30 22:33:03 +03:00
sowle
5d09b40187 build: build script windows improvements (sha256, more verbose email) 2019-05-30 19:00:00 +03:00
sowle
aa38149779 Merge branch 'develop' into release 2019-05-30 12:43:20 +03:00
sowle
e8df86117e === build number: 33 -> 34 === 2019-05-30 12:42:13 +03:00
sowle
7054141777 build: Linux build script minor improvement 2019-05-30 12:40:24 +03:00
wildkif
deb4620319 Merge remote-tracking branch 'origin/frontend' into develop 2019-05-29 20:31:12 +03:00
wildkif
973402ad36 Merge remote-tracking branch 'origin/develop' into frontend 2019-05-29 20:30:29 +03:00
wildkif
e6a8b40833 Contract notification messages update 2019-05-29 20:30:05 +03:00