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

497 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
crypro.zoidberg
7311c15d98 genesis reset 2019-05-07 22:38:41 +02:00
crypro.zoidberg
4b51ff846d Merge branch 'master' into final 2019-05-07 22:02:09 +02:00
crypro.zoidberg
15a2d75e47 Merge branch 'master' of github.com:hyle-team/zano 2019-05-07 20:40:42 +02:00
crypro.zoidberg
18c106b81c changed keys 2019-05-07 20:39:21 +02:00
sowle
8a909abb71 stratum: debug logging moved back to level 4 2019-05-07 19:47:56 +02:00
wildkif
344f7ee180 Merge branch 'frontend' 2019-05-07 19:04:09 +03:00
wildkif
155e0da48d Merge branch 'master' into frontend 2019-05-07 19:03:41 +03:00
wildkif
726cb70d32 html condition - fix 2019-05-07 19:03:20 +03:00
wildkif
e87e45ecea change text message 2019-05-07 18:18:43 +03:00
wildkif
cc0881909c contract check same wallet address 2019-05-07 16:26:35 +03:00
sowle
fca5ecd19a === build number: 20 -> 21 === 2019-05-07 15:55:42 +03:00
wildkif
8fc7d26059 Merge branch 'frontend' 2019-05-07 14:19:41 +03:00
wildkif
702e157c38 ticker symbol - fix 2019-05-07 14:00:02 +03:00
wildkif
636fc4f9b3 Merge remote-tracking branch 'origin/frontend' into frontend 
# Conflicts:
#	src/gui/qt-daemon/html/main.js
#	src/gui/qt-daemon/html/main.js.map
 2019-05-07 12:09:01 +03:00
wildkif
3a1195486f set max progress sync wallet 2019-05-07 12:05:37 +03:00
wildkif
3d5f98614e chart displaying fix 2019-05-07 12:03:48 +03:00
wildkif
a2e31ff84d Merge branch 'master' into frontend 2019-05-07 10:30:17 +03:00
cryptozoidberg
5c02e2aeb8
Fixed misprint(thanks to @matthew for pointing) 2019-05-07 00:51:34 +02:00
sowle
08461683d9 wallet2: fix a minor bug with balance calculation being called from on_transfer callback 2019-05-06 20:45:27 +02:00
wildkif
7c9515e8df Merge remote-tracking branch 'origin/master' 2019-05-06 20:42:22 +03:00
wildkif
e0a923aa6e Create wallet link - fix 2019-05-06 20:42:15 +03:00
sowle
41e85112ff wallet2: minor improvements 2019-05-06 19:38:06 +02:00
sowle
75506f6180 coretests: wallet_unconfimed_tx_balance added (exposes a minor bug) 2019-05-06 19:36:16 +02:00
wildkif
7edda6cc8d Merge remote-tracking branch 'origin/frontend' 2019-05-06 16:51:25 +03:00
wildkif
a17fc1af8b Merge remote-tracking branch 'origin/master' into frontend 2019-05-06 16:50:39 +03:00
wildkif
9ed153d0ad build html 2019-05-06 16:50:17 +03:00
wildkif
c861d8fc70 Merge remote-tracking branch 'origin/frontend' into frontend 2019-05-06 16:48:18 +03:00