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

463 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
wildkif
2d54f102dc loading screen fix & move text in contracts time 2019-05-06 16:48:05 +03:00
wildkif
8bcb07c7e5 hide address on transfer coins 2019-05-06 15:21:40 +03:00
sowle
d06e6f4af5 === build number: 19 -> 20 === 2019-05-06 15:10:16 +03:00
wildkif
d9b286a3c3 Merge branch 'frontend' 2019-05-06 10:34:22 +03:00
wildkif
581e348bf7 Merge branch 'master' into frontend 2019-05-06 10:33:54 +03:00
wildkif
fc370790d1 add log level 2019-05-06 10:33:33 +03:00
wildkif
2e0a5e4bda Merge branch 'frontend' 2019-05-05 15:40:53 +03:00
wildkif
03261f4013 Merge branch 'master' into frontend 2019-05-05 15:39:27 +03:00
wildkif
0ac4fd827a contracts order, tooltip time 2019-05-05 15:38:00 +03:00
cryptozoidberg
5243833bb3
Reserved more outs in tests 2019-05-03 17:31:33 +02:00
sowle
558e06b714 === build number: 18 -> 19 === 2019-05-02 21:35:21 +03:00
sowle
ef2aeb71b5 === build number: 17 -> 18 === 2019-05-02 20:45:59 +03:00
sowle
375e9fd990 wallet2: take escrow-blocked coins into account when calculating the total balance 2019-05-02 18:46:24 +02:00
wildkif
afa60fbb03 Merge remote-tracking branch 'origin/master' 2019-05-02 17:45:20 +03:00
wildkif
2eca825b87 Merge remote-tracking branch 'origin/frontend' 2019-05-02 17:45:09 +03:00
wildkif
1140197586 Merge remote-tracking branch 'origin/master' into frontend 2019-05-02 17:44:35 +03:00
wildkif
64a9a71e05 tooltip improvements 2019-05-02 17:44:06 +03:00
sowle
1535b943ef CMakeLists: split definitions and compile options for MSVC 2019-05-02 17:11:51 +03:00
wildkif
c69d3ab468 contracts buttons 2019-05-02 14:00:35 +03:00
anonimal
282214036c
contrib: update miniupnpc to 2.1, use submodule 
Resolves the following implemented client vulnerabilities:

https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-6031
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-8798

There are other client fixes as well and I would advise to
semi-regularly bump to master because of the lead developer's release
habits. In the meantime, version 2.1 should be good enough for now.

Note: the adding of TTL argument to upnpDiscover came with the API_VERSION 14.
 2019-05-01 23:03:09 +00:00
crypro.zoidberg
36c4dffb1a re-fixed stresstest preparation phase 2019-05-01 21:44:09 +02:00
anonimal
addc8cdf15
README: bump most recently tested gcc/clang 2019-05-01 19:38:38 +00:00
crypro.zoidberg
992171456b fixed stresstest preparation phase 2019-05-01 21:38:08 +02:00
sowle
a58cab8f9f coretests: gcc warnings fixed 2019-05-01 21:35:53 +02:00
sowle
303cb9b4ea various tests fixes for gcc 2019-05-01 21:25:56 +02:00
sowle
2143dc6779 functional_tests : fixed linkage for gcc 2019-05-01 21:02:33 +02:00
sowle
cbca150265 difficulty test removed as outdated 2019-05-01 21:01:40 +02:00
crypro.zoidberg
3c68509745 added more logs to exception in tests 2019-05-01 16:44:11 +02:00
sowle
02576ab740 minor operator<< refactoring & related stuff 2019-05-01 16:03:12 +02:00
sowle
976ed481d0 coretests adapted for serializable_pair 2019-05-01 16:01:10 +02:00
wildkif
8855ba5c55 custom not-allowed cursor 2019-05-01 14:15:53 +03:00
crypro.zoidberg
6f3c2fcbcc fixed linux serialization 2019-04-30 22:41:01 +02:00