Commit Graph

66 Commits

Author SHA1 Message Date
jl777
0fe3a71428 Merge branch 'beta' into dev
# Conflicts:
#	src/assetchains.old
2019-03-13 22:54:11 -11:00
Mihail Fedorov
0d2bfae2bf ILN 2019-02-26 04:51:32 +03:00
Mihail Fedorov
9bc086de8e OUR asset 2019-01-25 01:52:45 +03:00
Mihail Fedorov
254467774e KSB 2018-12-21 01:12:53 +03:00
jl777
d80ef46e94 Merge pull request #974 from jl777/jl777
sapling release candidate
2018-11-25 04:25:08 -11:00
jl777
8b05586dc5 Merge pull request #973 from jl777/FSM
FSM
2018-11-25 04:19:55 -11:00
miketout
6e2a502b0e Merge of Komodo and Verus Technologies Post Sapling, Pre-VerusPoP with Support for Time locked coinbases 2018-11-14 16:40:10 -08:00
Alrighttt
48881a7529 add ZEX fiat script 2018-11-12 09:28:37 -05:00
Mihail Fedorov
b40dfbd8a1 Fix dion \n typo, try 2 2018-11-04 01:56:19 +03:00
Asher Dawes
0868246437 Removing redundant verus script from src.
Moving verus.bat from src to scr/fiat
Adjusting gitlab-ci configuration and Mac release packaging script to comform to the changes.
2018-10-27 18:00:53 -07:00
webworker01
acd9f324a7 fix dion perms and assetchains.old 2018-10-18 15:52:00 +00:00
webworker01
da9fbe90d2 add dion 2018-10-17 16:13:56 -04:00
Jorian
d0d61ef2de add kmdice files 2018-10-17 21:33:49 +02:00
Mihail Fedorov
3cc05dc7b8 PGT 2018-10-11 04:07:04 +03:00
Jorian
594c9d1274 add mgnx 2018-09-24 15:41:03 +02:00
himu007
40027428e4 add PIRATE 2018-09-23 21:52:56 +01:00
Michael Toutonghi
0c8fa56a02 All latest updates, smart contracts, including oracle from KMD/jl777 2018-09-13 13:00:13 -07:00
jl777
8010774526 Merge pull request #840 from jl777/dev
Dev
2018-08-25 03:34:24 -11:00
Mihail Fedorov
4d61e5cd99 CCL 2018-08-25 04:15:55 +03:00
jl777
ff7204826e merge beta->master 2018-08-08 23:12:38 -11:00
Michael Toutonghi
5034d1c134 Sync with latest Komodo changes 2018-08-06 12:52:22 -07:00
ca333
3a4954d14e add SEC 2018-07-24 09:40:38 +02:00
jl777
ce3cd49fb7 Fix zilla 2018-06-21 07:57:56 -11:00
jl777
4c36b53066 +VRSC +RFOX 2018-06-21 07:27:09 -11:00
PTYX11
62c218de74 created zilla file 2018-06-13 23:05:15 +02:00
Mihail Fedorov
ab78e24130 2 new chains 2018-05-28 14:19:11 +03:00
Michael Toutonghi
da45808f5f Fix bash scripts for running verus daemon and cli 2018-05-25 20:48:22 -07:00
ca333
137f118cea add DSEC 2018-05-20 19:00:28 +02:00
Mihail Fedorov
cadcb27a61 Chmod fix 2018-05-19 16:50:17 +03:00
ca333
833115ea41 add DSEC 2018-05-19 02:27:58 +02:00
Alex English
72c5a7d56f Added ability to invoke src/fiat/verus from any cwd. Added executable permission. 2018-05-14 06:58:14 -07:00
miketout
32d8c6d015 Merge latest from Komodo, including POS 2018-05-08 17:57:03 -07:00
SHossain
3611134826 delete vote2018 2018-05-07 21:54:50 +01:00
miketout
48d800c2c6 Merge all Komodo changes, including proof of stake, crypto conditions, passport, etc. 2018-05-02 03:24:21 -07:00
miketout
e329959f32 moved verus (testnet) cli script to fiat directory 2018-04-30 22:02:33 -07:00
jl777
e73b2055c6 Merge branch 'beta' into mergemaster
# Conflicts:
#	src/main.cpp
2018-04-16 10:16:01 +03:00
Mihail Fedorov
22fd8aaf5c prlpay fix 2018-04-12 13:09:20 +03:00
Mihail Fedorov
6ff482a509 BNTN, CHAIN, PRLPAY 2018-04-10 15:36:01 +03:00
ca333
ee5d694632 add BNTN 2018-04-04 03:28:48 +02:00
Mihail Fedorov
14a73f0388 OOT coin 2018-03-08 19:00:32 +03:00
Mihail Fedorov
b56e224002 Adding coin in single commit 2018-02-26 09:47:59 +03:00
Mihail Fedorov
8bf22c6fd0 fiat scripts 2018-02-25 03:49:58 +03:00
Mihail Fedorov
ec0b0757b6 fiat scripts 2018-02-25 03:46:02 +03:00
jl777
0a8ac8b037 VOTE chain 2018-01-29 16:12:06 +04:00
Mihail Fedorov
8a52db13e1 pax 2018-01-27 17:26:42 +03:00
jl777
f41277aa91 PIZZA and BEER 2018-01-25 16:54:43 +04:00
jl777
8bec736c1f AXO, ETOMIC, BTCH 2018-01-01 15:36:45 +07:00
jl777
67030c8be0 MSHARK 2017-11-30 22:01:00 +04:00
jl777
075d0564e0 MNZ support 2017-10-06 15:53:30 +03:00
jl777
40a778cb54 Test 2017-06-29 18:18:27 +03:00