Skip to content

Commit 1b7d621

Browse files
authored
Merge pull request #578 from hackmdio/licenseChangeAgreement
License Change Agreement
2 parents 0957f59 + bee5e2a commit 1b7d621

File tree

6 files changed

+1687
-58
lines changed

6 files changed

+1687
-58
lines changed

AUTHORS

100644100755
Lines changed: 69 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,69 @@
1-
List of HackMD contributors.
2-
3-
bananaapple
4-
Bartlomiej Szala
5-
Colin Maudry
6-
Dmytro Kytsmen
7-
Fabien Meghazi
8-
Florian Rhiem
9-
Ikumi Shimizu
10-
ivanorsolic
11-
Jason Croft
12-
Jannik Lorenz
13-
James Stephenson
14-
Jordan Matelsky
15-
Kenji Doi
16-
Lars Kajes
17-
Lapinot
18-
Laura Kyle
19-
Marcelo Alencar
20-
Martijnpold
21-
Massimo Ghinassi
22-
Max Wu
23-
Ömer Erdinç Yağmurlu
24-
p0v1n0m
25-
Pablo Guerrero
26-
paraschadha2052
27-
Peter Dave Hello
28-
Qubo
29-
Sergio Valverde
30-
Tom Wyckhuys
31-
Yukai Huang
32-
Zacharias Traianos
33-
Zankio
34-
Xavier
35-
葉家郡
1+
2+
bananaappletw <[email protected]>
3+
Bartlomiej Szala <[email protected]>
4+
BoHong Li <[email protected]>
5+
Bryan Davis <[email protected]>
6+
7+
Cheng-Han, Wu <[email protected]>
8+
Christian Schuhmann <[email protected]>
9+
Colin Maudry <[email protected]>
10+
Dmytro Kytsmen <[email protected]>
11+
Fabien Meghazi <[email protected]>
12+
Florian Rhiem <[email protected]>
13+
14+
15+
greenkeeperio-bot <[email protected]>
16+
Himura Kazuto <[email protected]>
17+
18+
19+
Ikumi Shimizu <[email protected]>
20+
ivanorsolic <[email protected]>
21+
jackycute <[email protected]>
22+
jackycute <[email protected]>
23+
Jakub Sygnowski <[email protected]>
24+
James Stephenson <[email protected]>
25+
Jan Kunzmann <[email protected]>
26+
Jannik Lorenz <[email protected]>
27+
Jason Croft <[email protected]>
28+
Johannes Weißl <[email protected]>
29+
Jordan Matelsky <[email protected]>
30+
Jun SAKATA <[email protected]>
31+
Kaiyu Shi <[email protected]>
32+
33+
Kotaro Yamamoto <[email protected]>
34+
Lars Karlsson <[email protected]>
35+
Laura Kyle <[email protected]>
36+
LluisArevalo <[email protected]>
37+
Marcelo Alencar <[email protected]>
38+
Martijnpold <[email protected]>
39+
40+
neopostmodern <[email protected]>
41+
42+
Ömer Erdinç Yağmurlu <[email protected]>
43+
44+
Pablo Guerrero <[email protected]>
45+
Pablo Guerrero <[email protected]>
46+
47+
Patrick Andersen <[email protected]>
48+
Peter Dave Hello <[email protected]>
49+
Peter Dave Hello <[email protected]>
50+
Philipp Zumstein <[email protected]>
51+
Raccoon Li <[email protected]>
52+
53+
Sergio Valverde <[email protected]>
54+
Sheogorath <[email protected]>
55+
Simon Joda Stößer <[email protected]>
56+
57+
Stratos Gerakakis <[email protected]>
58+
The Gitter Badger <[email protected]>
59+
60+
61+
Tom Wyckhuys <[email protected]>
62+
Wonder Chang <[email protected]>
63+
Wu Cheng-Han <[email protected]>
64+
Xavier Marques <[email protected]>
65+
66+
Yukai Huang <[email protected]>
67+
zachariast <[email protected]>
68+
69+
蒼時弦也 <[email protected]>

CONTRIBUTING.md

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ email, or any other method with the owners of this repository before making a ch
66
Please note we have a code of conduct, please follow it in all your interactions with the project.
77

88
## Pull Request Process
9-
10-
1. Ensure any install or build dependencies are removed before the end of the layer when doing a
9+
1. Ensure you signed all your commits with Developer Certificate of Origin (DCO).
10+
2. Ensure any install or build dependencies are removed before the end of the layer when doing a
1111
build.
12-
2. Update the README.md with details of changes to the interface, this includes new environment
12+
3. Update the README.md with details of changes to the interface, this includes new environment
1313
variables, exposed ports, useful file locations and container parameters.
14-
3. Increase the version numbers in any examples files and the README.md to the new version that this
14+
4. Increase the version numbers in any examples files and the README.md to the new version that this
1515
Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/).
16-
4. You may merge the Pull Request in once you have the sign-off of two other developers, or if you
16+
5. You may merge the Pull Request in once you have the sign-off of two other developers, or if you
1717
do not have permission to do that, you may request the second reviewer to merge it for you.
1818

1919
## Contributor Code of Conduct
@@ -52,3 +52,22 @@ issue or contacting one or more of the project maintainers.
5252
This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org),
5353
version 1.2.0, available at
5454
[http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)
55+
56+
### Sign your work
57+
58+
We use the Developer Certificate of Origin (DCO) as a additional safeguard
59+
for the HackMD project. This is a well established and widely used
60+
mechanism to assure contributors have confirmed their right to license
61+
their contribution under the project's license.
62+
Please read [contribute/developer-certificate-of-origin][dcofile].
63+
If you can certify it, then just add a line to every git commit message:
64+
65+
````
66+
Signed-off-by: Random J Developer <[email protected]>
67+
````
68+
69+
Use your real name (sorry, no pseudonyms or anonymous contributions).
70+
If you set your `user.name` and `user.email` git configs, you can sign your
71+
commit automatically with `git commit -s`. You can also use git [aliases](https://git-scm.com/book/tr/v2/Git-Basics-Git-Aliases)
72+
like `git config --global alias.ci 'commit -s'`. Now you can commit with
73+
`git ci` and the commit will be signed.

0 commit comments

Comments
 (0)