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

524 commits

This branch
This branch
All branches
Author SHA1 Message Date
crypro.zoidberg
8941ce100b Merge branch 'frontend' into develop 2019-05-15 20:25:40 +02:00
crypro.zoidberg
11900a2f3d Merge branch 'master' into develop 2019-05-15 20:25:07 +02:00
crypro.zoidberg
2320fe5099 added more stat in wallet logs 2019-05-15 20:24:54 +02:00
crypro.zoidberg
c0f7a2cf46 fixed typo 2019-05-14 20:03:51 +02:00
crypro.zoidberg
d4071a1662 Merge branch 'master' of github.com:hyle-team/zano 2019-05-14 20:00:16 +02:00
sowle
19c52a8344 conn_tool minor improvement 2019-05-14 19:01:45 +02:00
crypro.zoidberg
d9a8825690 Merge branch 'master' of github.com:hyle-team/zano 2019-05-14 05:28:36 +02:00
cr.zoidberg
cbfa1612b7 removed unused code 2019-05-14 04:25:14 +02:00
wildkif
1da6c5868c get rate zano from markets 2019-05-13 23:36:46 +03:00
wildkif
e43b4c84f2 Merge branch 'master' into frontend 2019-05-13 21:36:33 +03:00
sowle
eebda00e27 === build number: 28 -> 29 === 2019-05-11 00:28:58 +03:00
crypro.zoidberg
104c611400 Merge branch 'debug' 2019-05-10 23:27:56 +02:00
crypro.zoidberg
22ba650e4f prevalidate_relayed removed from log 2019-05-10 21:55:55 +02:00
crypro.zoidberg
e8e6c83fa8 attempt to fix broken PoS relay 2019-05-10 21:48:29 +02:00
crypro.zoidberg
67e900ec15 added extra check for unlock time 2019-05-09 21:37:30 +02:00
sowle
929e7e6521 munin: minor fix for sequence factor graph 2019-05-09 17:14:39 +02:00
sowle
fce3e24d47 === build number: 27 -> 28 === 2019-05-09 15:28:14 +03:00
crypro.zoidberg
fdc339ff8c Merge branch 'nocache' 2019-05-09 14:27:47 +02:00
crypro.zoidberg
c1d15aeabe enabled db cache 2019-05-09 14:27:28 +02:00
crypro.zoidberg
cdbe023198 dropped blockchain in case it broken 2019-05-09 13:44:14 +02:00
crypro.zoidberg
7c5b7b8bcb fixed bug with cache sync 2019-05-09 13:43:04 +02:00
crypro.zoidberg
53c1a45665 disabled cache for db 2019-05-09 12:37:17 +02:00
crypro.zoidberg
d5f5db199d updated alerts json 2019-05-09 12:35:20 +02:00
crypro.zoidberg
07639f46d5 Merge branch 'master' of github.com:hyle-team/zano 2019-05-09 02:12:26 +02:00
sowle
52dc0b498d === build number: 26 -> 27 === 2019-05-09 02:53:33 +03:00
crypro.zoidberg
0674ea51fe fixed alerts and fixed resync after daemon restart 2019-05-09 01:52:48 +02:00
crypro.zoidberg
31f3a89aeb removed ugly debug code 2019-05-09 00:35:56 +02:00
sowle
3482a82c2e === build number: 25 -> 26 === 2019-05-09 01:19:48 +03:00
crypro.zoidberg
c2f45ab000 disabled target cache 2019-05-09 00:19:13 +02:00
wildkif
89b1025449 Merge branch 'frontend' 2019-05-08 22:19:25 +03:00
wildkif
ecd2ca411c Merge branch 'master' into frontend 
# Conflicts:
#	src/gui/qt-daemon/html/assets/i18n/en.json
 2019-05-08 22:12:32 +03:00
sowle
0698e15d20 === build number: 24 -> 25 === 2019-05-08 22:02:38 +03:00
crypro.zoidberg
a2ffe1b9f6 Merge branch 'develop' 2019-05-08 21:00:33 +02:00
crypro.zoidberg
8d197e55f3 Main net launch 2019-05-08 20:59:47 +02:00
wildkif
439266a666 remove word testnet 2019-05-08 21:50:11 +03:00
crypro.zoidberg
40921f7c69 Merge branch 'master' into develop 2019-05-08 19:49:34 +02:00
crypro.zoidberg
28e9b8ff6b Merge branch 'master' of github.com:hyle-team/zano 2019-05-08 19:49:14 +02:00
wildkif
34bb2a27ab Merge remote-tracking branch 'origin/master' 2019-05-08 19:43:13 +03:00
wildkif
4e2885faf3 Merge remote-tracking branch 'origin/frontend' 2019-05-08 19:43:02 +03:00
wildkif
d4aecd4ac9 Merge remote-tracking branch 'origin/master' into frontend 2019-05-08 19:42:39 +03:00
crypro.zoidberg
d1e5594eee mainnet genesis with unrevealed nonce 2019-05-08 17:20:59 +02:00
sowle
6894f15e62 wallet2: minor cleaning up 2019-05-08 16:59:09 +02:00
wildkif
574ba4acba sidebar corrections 2019-05-08 17:03:20 +03:00
sowle
36ef5b2a85 === build number: 23 -> 24 === 2019-05-08 02:45:48 +03:00
crypro.zoidberg
e2f0249d55 fixed misprint 2019-05-08 01:44:29 +02:00
sowle
db1d917d20 === build number: 22 -> 23 === 2019-05-08 01:56:05 +03:00
crypro.zoidberg
19177cb7de fixed wallet compability issues and added smooth pass of CURRENCY_FORMATION_VERSION change 2019-05-08 00:53:45 +02:00
sowle
af4c0b3f25 === build number: 21 -> 22 === 2019-05-08 00:00:07 +03:00
crypro.zoidberg
ffa39601a6 Merge branch 'final' 2019-05-07 22:58:55 +02:00
crypro.zoidberg
d3c56e6282 formation changed 2019-05-07 22:39:39 +02:00