Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update license year and wording, add contributors #225

Merged
merged 1 commit into from
Jan 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 60 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
Alfredo Garcia <oxarbitrage@gmail.com> <oxarbitrage@gmail.com>
Alfredo Garcia <oxarbitrage@gmail.com> <root@NC-PH-1346-07.web-hosting.com>
Anonymous <you@example.com>
Anton Autushka <antoninus.liberalis@gmail.com> <a.autushka@aetsoft.by>
BrownBear <-> <->
Christopher Sanborn <23085117+christophersanborn@users.noreply.github.com>
Chronos <chronos.crypto@gmail.com>
Dan Notestein <dan@syncad.com> <dan@syncad.com>
Dan Notestein <dan@syncad.com> <syncad@syncad.com>
Daniel Larimer <bytemaster@users.noreply.github.com> <dlarimer@gmail.com>
Daniel Larimer <bytemaster@users.noreply.github.com> <dan.larimer@block.one>
Daniel Larimer <bytemaster@users.noreply.github.com> <dan@bitshares.org>
Daniel Larimer <bytemaster@users.noreply.github.com> <dan@invictus-innovations.com>
Daniel Larimer <bytemaster@users.noreply.github.com> <dlarimer@invictus-innovations.com>
Daniel Larimer <bytemaster@users.noreply.github.com> <dan@steemit.com>
Daniel Larimer <bytemaster@users.noreply.github.com> <dan.larimer@8riverscapital.com>
Eric Frias <efrias@syncad.com>
Fabian Schuh <Fabian@chainsquad.com> <mail@xeroc.org>
Fabian Schuh <Fabian@chainsquad.com> <xeroc@chainsquad.com>
John M. Jones <jmjatlanta@gmail.com>
Ken Code <ken@BitShares-Munich.de>
Matias Romeo <matias.romeo@gmail.com>
Michael Vandeberg <mvandeberg@users.noreply.github.com> <vandeberg@cryptonomex.com>
Michael Vandeberg <mvandeberg@users.noreply.github.com> <vandeberg@steemit.com>
Nathan Hourt <themodprobe@protonmail.com> <nat.hourt@gmail.com>
Nathan Hourt <themodprobe@protonmail.com> <nathan@followmyvote.com>
Nathan Hourt <themodprobe@protonmail.com> <nathan@bitshares.org>
Nikolai Mushegian <nikolai.mushegian@gmail.com> <nmushegi@andrew.cmu.edu>
OpenLedger <service.github@openledger.info> <service.github@openledger.info>
OpenLedger <service.github@openledger.info> <42674402+OpenLedgerApp@users.noreply.github.com>
Peter Conrad <conrad@quisquis.de> <cyrano@quisquis.de>
Peter Conrad <conrad@quisquis.de> <github.com@quisquis.de>
Qi Xing <cwyyprog@163.com> <cwyyprog@163.com>
Roelandp <dnaleor@gmail.com>
Ryan R. Fox <ryan@ryanrfox.com> <ryan@ryanrfox.com>
Ryan R. Fox <ryan@ryanrfox.com> <ryanRfox@users.noreply.github.com>
Sigve Kvalsvik <bitsharesblocks@gmail.com> <sigvekvalsvik@gmail.com>
Valentine Zavgorodnev <i@valzav.com> <i@valzav.com>
Valentine Zavgorodnev <i@valzav.com> <vz@valzav.com>
Valera Cogut <info@valeracogut.com> <valerakogut@gmail.com>
Vikram Rajkumar <vikramrajkumar@users.noreply.github.com> <vikram@bitshares.org>
Vikram Rajkumar <vikramrajkumar@users.noreply.github.com> <vikram@soledger.com>
Vikram Rajkumar <vikramrajkumar@users.noreply.github.com> <vikramrajkumar1@gmail.com>
William <tmfc@homtail.com> <jinwei@gmail.com>
William <tmfc@homtail.com> <tmfc@homtail.com>
Xiaodong Li <mantianyu@gmail.com> <cifer-lee@users.noreply.github.com>
Xiaodong Li <mantianyu@gmail.com> <mantianyu@gmail.com>
Xiaodong Li <mantianyu@gmail.com> <maintianyu@gmail.com>
Xiaodong Li <mantianyu@gmail.com> <lixiaodongcifer@didichuxing.com>
Yuvaraj Gogoi <yuvarajgogoi@gmail.com> <yuvarajgogoi@gmail.com>
abitmore <abitmore@users.noreply.github.com>
albert <393259066@qq.com> <393259066@qq.com>
albert <393259066@qq.com> <zhuliting@gxb.io>
batmaninpink <batmaninpink@users.noreply.github.com> <batmaninpink@>
bitcube <root@seed.cubeconnex.com>
btcinshares <btcinshares@protonmail.com> <33876675+btcinshares@users.noreply.github.com>
crazybits <crazybit.github@gmail.com> <crazybit.github@gmail.com>
crazybits <crazybit.github@gmail.com> <crazybits@users.noreply.github.com>
theoreticalbts <theoreticalbts@users.noreply.github.com> <drltc@users.noreply.github.com>
theoreticalbts <theoreticalbts@users.noreply.github.com> <theoreticalbts@users.noreply.github.com>
53 changes: 53 additions & 0 deletions CONTRIBUTORS.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
Contributors to this repository, in descending order by number of commits. Update with
head -5 CONTRIBUTORS.txt >contrib.tmp && git shortlog -s -e -n | cut -f 2 >>contrib.tmp && mv contrib.tmp CONTRIBUTORS.txt

==============================================================================

Daniel Larimer <bytemaster@users.noreply.github.com>
Peter Conrad <conrad@quisquis.de>
abitmore <abitmore@users.noreply.github.com>
Eric Frias <efrias@syncad.com>
John M. Jones <jmjatlanta@gmail.com>
Vikram Rajkumar <vikramrajkumar@users.noreply.github.com>
Nathan Hourt <themodprobe@protonmail.com>
theoreticalbts <theoreticalbts@users.noreply.github.com>
Dan Notestein <dan@syncad.com>
vogel76 <wrona@syncad.com>
Alfredo Garcia <oxarbitrage@gmail.com>
crypto-ape <43807588+crypto-ape@users.noreply.github.com>
Valera Cogut <info@valeracogut.com>
Michael Vandeberg <mvandeberg@users.noreply.github.com>
Nikolai Mushegian <nikolai.mushegian@gmail.com>
Qi Xing <cwyyprog@163.com>
HackFisher <hackfisher@gmail.com>
Valentine Zavgorodnev <i@valzav.com>
Anton Autushka <antoninus.liberalis@gmail.com>
PaulEU <pstudnicki@syncad.com>
Scott Howard <showard314@gmail.com>
batmaninpink <batmaninpink@users.noreply.github.com>
Daniel Brockman <daniel@brockman.se>
Fabian Schuh <Fabian@chainsquad.com>
Gandalf-the-Grey <gandalf@storm.pl>
Nicolas Wack <wackou@gmail.com>
Tzadik Vanderhoof <tzadik.vanderhoof@gmail.com>
Yuvaraj Gogoi <yuvarajgogoi@gmail.com>
arhag <arhag@users.noreply.github.com>
grzegorzs <gszczepanek@syncad.com>
Alexey Frolov <a.frolov@aetsoft.by>
BrownBear <->
Matias Romeo <matias.romeo@gmail.com>
Wei Yang <richard.weiyang@gmail.com>
alt <pch957@163.com>
skchaudhari <roy_sanjayrvce@yahoo.co.in>
Anonymous <you@example.com>
BITSG-Jerry <bitsg-jerry@users.noreply.github.com>
Dmitry Yakovitsky <d.yakovitsky@aetsoft.by>
Haruka Ma <mrx@hcc.im>
Karl Semich <0xloem@gmail.com>
Kevin Heifner <heifnerk@objectcomputing.com>
Spartucus <spartucus@users.noreply.github.com>
ioBanker <37595908+ioBanker@users.noreply.github.com>
kinglaw <58291@qq.com>
liukunyu <boss.liuky@gmail.com>
lubos.ilcik <lubos.ilcik@touch4it.com>
phoenixint <nsharp@phoenix-int.com>
5 changes: 3 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
The following license only applies to code that was contributed to this repository in the context of BitShares worker proposals and/or BitShares-1 delegate workers. Other code may be licensed indirectly by our "sister" repositories https://github.com/EOSIO/fc and https://github.com/bytemaster/fc/tree/phoenix .
The following license only applies to code that was contributed to this repository in the context of BitShares worker proposals and/or BitShares-1 delegate workers. Other code may be licensed indirectly by our "sister" repositories https://github.com/EOSIO/fc, https://github.com/steemit/fc and https://github.com/bytemaster/fc/tree/phoenix .

All subsequent contributions to this repository are licensed by their respective authors under this same license as well, unless explicitly stated otherwise.

Furthermore, this repository includes code from third party authors. See the list at the end of this file.

----

Copyright (c) 2018-2019 BitShares Blockchain Foundation and contributors
Copyright (c) 2018-2019 BitShares Blockchain Foundation
Copyright (c) 2018-2021 contributors, see CONTRIBUTORS.txt

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down