Merge pull request #578 from hackmdio/licenseChangeAgreement

License Change Agreement

AUTHORS

@@ -1,35 +1,69 @@
-List of HackMD contributors.
-
-bananaapple
-Bartlomiej Szala
-Colin Maudry
-Dmytro Kytsmen
-Fabien Meghazi
-Florian Rhiem
-Ikumi Shimizu
-ivanorsolic
-Jason Croft
-Jannik Lorenz
-James Stephenson
-Jordan Matelsky
-Kenji Doi
-Lars Kajes
-Lapinot
-Laura Kyle
-Marcelo Alencar
-Martijnpold
-Massimo Ghinassi
-Max Wu
-Ömer Erdinç Yağmurlu
-p0v1n0m
-Pablo Guerrero
-paraschadha2052
-Peter Dave Hello
-Qubo
-Sergio Valverde
-Tom Wyckhuys
-Yukai Huang
-Zacharias Traianos
-Zankio
-Xavier
-葉家郡
+alecdwm <alec@owls.io>
+bananaappletw <bananaappletw@gmail.com>
+Bartlomiej Szala <fenix440@gmail.com>
+BoHong Li <a60814billy@gmail.com>
+Bryan Davis <bd808@wikimedia.org>
+butlerx <butlerx@notthe.cloud>
+Cheng-Han, Wu <jackymaxj@gmail.com>
+Christian Schuhmann <madebyherzblut@users.noreply.github.com>
+Colin Maudry <colin@maudry.com>
+Dmytro Kytsmen <dmitrokytsmen@gmail.com>
+Fabien Meghazi <agr@amigrave.com>
+Florian Rhiem <florian.rhiem@gmail.com>
+geekyd <singhsince94@gmail.com>
+GhiMax <ghina8@gmail.com>
+greenkeeperio-bot <support@greenkeeper.io>
+Himura Kazuto <Himura2la@users.noreply.github.com>
+Ho33e5 <ho33e5@gmail.com>
+Ian Dees <ian.dees@gmail.com>
+Ikumi Shimizu <193s@users.noreply.github.com>
+ivanorsolic <ivanorsolic@users.noreply.github.com>
+jackycute <jacky_cute0808@hotmail.com>
+jackycute <jackymaxj@gmail.com>
+Jakub Sygnowski <sygnowski@gmail.com>
+James Stephenson <c4p7.fl1n7@gmail.com>
+Jan Kunzmann <jan-github@phobia.de>
+Jannik Lorenz <dev@janniklorenz.de>
+Jason Croft <jcroft@velocity.org>
+Johannes Weißl <jargon@molb.org>
+Jordan Matelsky <j6k4m8@gmail.com>
+Jun SAKATA <jun.bj141400@gmail.com>
+Kaiyu Shi <skyisno.1@gmail.com>
+knjcode <knjcode@gmail.com>
+Kotaro Yamamoto <kota.crk@gmail.com>
+Lars Karlsson <lars@kajes.se>
+Laura Kyle <laura.kyle91@gmail.com>
+LluisArevalo <thorin119@gmail.com>
+Marcelo Alencar <marceloalves@ufpa.br>
+Martijnpold <martijntje7@gmail.com>
+Max Wu <jackymaxj@gmail.com>
+neopostmodern <clemens@neopostmodern.com>
+NV <nvsofts@gmail.com>
+Ömer Erdinç Yağmurlu <omeryagmurlu@gmail.com>
+p0v1n0m <p0v1n0m@gmail.com>
+Pablo Guerrero <pablo.guerrero@gmail.com>
+Pablo Guerrero <pablo.guerrero@sap.com>
+Paras <paraschadha2052@gmail.com>
+Patrick Andersen <patrick@bacha.dk>
+Peter Dave Hello <hsu@peterdavehello.org>
+Peter Dave Hello <PeterDaveHello@users.noreply.github.com>
+Philipp Zumstein <zuphilip@users.noreply.github.com>
+Raccoon Li <a60814billy@gmail.com>
+robert <ahmerov.rt@molodost.bz>
+Sergio Valverde <svg153@users.noreply.github.com>
+Sheogorath <sheogorath@shivering-isles.com>
+Simon Joda Stößer <SimJoSt@users.noreply.github.com>
+S.Noda <noda@fenrir.co.jp>
+Stratos Gerakakis <stratosgear@gmail.com>
+The Gitter Badger <badger@gitter.im>
+tkqubo <tk.qubo@gmail.com>
+tkykm <tkykm@users.noreply.github.com>
+Tom Wyckhuys <tomwyckhuys@gmail.com>
+Wonder Chang <iwonder.tw@gmail.com>
+Wu Cheng-Han <jacky_cute0808@hotmail.com>
+Xavier Marques <xaviermarques4f@gmail.com>
+xnum <s000032001@gmail.com>
+Yukai Huang <yukaihuangtw@gmail.com>
+zachariast <zachariastraianos@gmail.com>
+Zankio <xxoojoeooxx1@gmail.com>
+蒼時弦也 <elct9620@frost.tw>

CONTRIBUTING.md

@@ -6,14 +6,14 @@ email, or any other method with the owners of this repository before making a ch
 Please note we have a code of conduct, please follow it in all your interactions with the project.
 
 ## Pull Request Process
-
-1. Ensure any install or build dependencies are removed before the end of the layer when doing a 
+1. Ensure you signed all your commits with Developer Certificate of Origin (DCO).
+2. Ensure any install or build dependencies are removed before the end of the layer when doing a 
    build.
-2. Update the README.md with details of changes to the interface, this includes new environment 
+3. Update the README.md with details of changes to the interface, this includes new environment 
    variables, exposed ports, useful file locations and container parameters.
-3. Increase the version numbers in any examples files and the README.md to the new version that this
+4. Increase the version numbers in any examples files and the README.md to the new version that this
    Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/).
-4. You may merge the Pull Request in once you have the sign-off of two other developers, or if you 
+5. You may merge the Pull Request in once you have the sign-off of two other developers, or if you 
    do not have permission to do that, you may request the second reviewer to merge it for you.
 
 ## Contributor Code of Conduct
@@ -52,3 +52,22 @@ issue or contacting one or more of the project maintainers.
 This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), 
 version 1.2.0, available at 
 [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)
+
+### Sign your work
+
+We use the Developer Certificate of Origin (DCO) as a additional safeguard
+for the HackMD project. This is a well established and widely used
+mechanism to assure contributors have confirmed their right to license
+their contribution under the project's license.
+Please read [contribute/developer-certificate-of-origin][dcofile].
+If you can certify it, then just add a line to every git commit message:
+
+````
+  Signed-off-by: Random J Developer <random@developer.example.org>
+````
+
+Use your real name (sorry, no pseudonyms or anonymous contributions).
+If you set your `user.name` and `user.email` git configs, you can sign your
+commit automatically with `git commit -s`. You can also use git [aliases](https://git-scm.com/book/tr/v2/Git-Basics-Git-Aliases)
+like `git config --global alias.ci 'commit -s'`. Now you can commit with
+`git ci` and the commit will be signed.