Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity
639 commits 28 branches 143 tags 45 MiB
Commit graph

639 commits

This branch
This branch
All branches
Author SHA1 Message Date
cryptozoidberg
c20bbd8c95
Merge branch 'release' 2019-06-04 23:07:10 +03:00
cryptozoidberg
bff0fcb572
Merge branch 'release' of github.com:hyle-team/zano into release 2019-06-04 23:06:53 +03:00
cryptozoidberg
fb27df4840
Merge branch 'release' 2019-06-04 22:55:48 +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
wildkif
8dfb76c5ec Merge remote-tracking branch 'origin/frontend' into develop 2019-05-29 18:17:40 +03:00
wildkif
9999b72ed2 Merge remote-tracking branch 'origin/develop' into frontend 2019-05-29 18:17:38 +03:00
wildkif
0852269ef5 Merge remote-tracking branch 'origin/develop' into frontend 2019-05-29 18:16:53 +03:00
wildkif
6249d80699 Enable auto-resume for staking 2019-05-29 18:16:37 +03:00
sowle
f747b0e24b build: scripts for Linux and macOS are being adapted for testnet 2019-05-29 17:45:21 +03:00
sowle
f61d9f6bff build: Linux build script fix a typo 2019-05-29 14:23:13 +03:00
sowle
5fb6d478ca build: Linux build script improvements 2019-05-29 14:17:49 +03:00
wildkif
f67688061f Merge remote-tracking branch 'origin/frontend' into develop 2019-05-28 19:34:33 +03:00
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