Skip to content

Commit 4b060c7

Browse files
committed
Rebrand HackMD to CodiMD
Signed-off-by: Sheogorath <[email protected]>
1 parent d87505d commit 4b060c7

16 files changed

+80
-82
lines changed

CONTRIBUTING.md

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
# Contributing
22

33
When contributing to this repository, please first discuss the change you wish to make via issue,
4-
email, or any other method with the owners of this repository before making a change.
4+
email, or any other method with the owners of this repository before making a change.
55

66
Please note we have a code of conduct, please follow it in all your interactions with the project.
77

88
## Pull Request Process
99
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
10+
2. Ensure any install or build dependencies are removed before the end of the layer when doing a
1111
build.
12-
3. 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.
1414
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-
5. 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
2020

21-
As contributors and maintainers of this project, and in the interest of fostering an open and
22-
welcoming community, we pledge to respect all people who contribute through reporting issues,
23-
posting feature requests, updating documentation, submitting pull requests or patches, and other
21+
As contributors and maintainers of this project, and in the interest of fostering an open and
22+
welcoming community, we pledge to respect all people who contribute through reporting issues,
23+
posting feature requests, updating documentation, submitting pull requests or patches, and other
2424
activities.
2525

26-
We are committed to making participation in this project a harassment-free experience for everyone,
27-
regardless of level of experience, gender, gender identity and expression, sexual orientation,
26+
We are committed to making participation in this project a harassment-free experience for everyone,
27+
regardless of level of experience, gender, gender identity and expression, sexual orientation,
2828
disability, personal appearance, body size, race, ethnicity, age, religion, or nationality.
2929

3030
Examples of unacceptable behavior by participants include:
@@ -37,26 +37,26 @@ Examples of unacceptable behavior by participants include:
3737
permission
3838
* Other unethical or unprofessional conduct.
3939

40-
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits,
41-
code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By
42-
adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently
43-
applying these principles to every aspect of managing this project. Project maintainers who do not
40+
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits,
41+
code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By
42+
adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently
43+
applying these principles to every aspect of managing this project. Project maintainers who do not
4444
follow or enforce the Code of Conduct may be permanently removed from the project team.
4545

46-
This code of conduct applies both within project spaces and in public spaces when an individual is
46+
This code of conduct applies both within project spaces and in public spaces when an individual is
4747
representing the project or its community.
4848

49-
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an
49+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an
5050
issue or contacting one or more of the project maintainers.
5151

52-
This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org),
53-
version 1.2.0, available at
52+
This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org),
53+
version 1.2.0, available at
5454
[http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)
5555

5656
### Sign your work
5757

5858
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
59+
for the CodiMD project. This is a well established and widely used
6060
mechanism to assure contributors have confirmed their right to license
6161
their contribution under the project's license.
6262
Please read [contribute/developer-certificate-of-origin][dcofile].

README.md

+33-33
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
HackMD Community Edition
1+
CodiMD
22
===
33

44
[![Standard - JavaScript Style Guide][standardjs-image]][standardjs-url]
55

66
[![Join the chat at https://gitter.im/hackmdio/hackmd][gitter-image]][gitter-url]
7-
[![#HackMD on matrix.org][matrix.org-image]][matrix.org-url]
7+
[![#CodiMD on matrix.org][matrix.org-image]][matrix.org-url]
88
[![build status][travis-image]][travis-url]
99
[![version][github-version-badge]][github-release-page]
1010
[![Help Contribute to Open Source][codetriage-image]][codetriage-url]
1111
[![POEditor][poeditor-image]][poeditor-url]
1212

13-
HackMD lets you create realtime collaborative markdown notes on all platforms.
14-
Inspired by Hackpad, with more focus on speed and flexibility.
15-
Still in the early stage, feel free to fork or contribute to HackMD.
13+
CodiMD lets you create real-time collaborative markdown notes on all platforms.
14+
Inspired by Hackpad, with more focus on speed and flexibility, and build from [HackMD](https://hackmd.io) source code.
15+
Feel free to contribute.
1616

1717
Thanks for using! :smile:
1818

@@ -27,7 +27,7 @@ Thanks for using! :smile:
2727
- [Instructions](#instructions)
2828
- [Heroku Deployment](#heroku-deployment)
2929
- [Kubernetes](#kubernetes)
30-
- [HackMD by docker container](#hackmd-by-docker-container)
30+
- [CodiMD by docker container](#codimd-by-docker-container)
3131
- [Upgrade](#upgrade)
3232
- [Native setup](#native-setup)
3333
- [Configuration](#configuration)
@@ -60,7 +60,7 @@ Thanks for using! :smile:
6060
- Node.js 6.x or up (test up to 7.5.0)
6161
- Database (PostgreSQL, MySQL, MariaDB, SQLite, MSSQL) use charset `utf8`
6262
- npm (and its dependencies, especially [uWebSockets](https://github.com/uWebSockets/uWebSockets#nodejs-developers), [node-gyp](https://github.com/nodejs/node-gyp#installation))
63-
- For **building** HackMD we recommend to use a machine with at least **2GB** RAM
63+
- For **building** CodiMD we recommend to use a machine with at least **2GB** RAM
6464

6565
### Instructions
6666

@@ -73,20 +73,20 @@ Thanks for using! :smile:
7373

7474
## Heroku Deployment
7575

76-
You can quickly setup a sample Heroku HackMD application by clicking the button below.
76+
You can quickly setup a sample Heroku CodiMD application by clicking the button below.
7777

78-
[![Deploy on Heroku](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/hackmdio/hackmd/tree/master)
78+
[![Deploy on Heroku](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/hackmdio/codimd/tree/master)
7979

8080
If you deploy it without the button, keep in mind to use the right buildpacks. For details check `app.json`.
8181

8282
## Kubernetes
8383

8484
To install use `helm install stable/hackmd`.
8585

86-
For all further details, please check out the offical HackMD [K8s helm chart](https://github.com/kubernetes/charts/tree/master/stable/hackmd).
86+
For all further details, please check out the offical CodiMD [K8s helm chart](https://github.com/kubernetes/charts/tree/master/stable/hackmd).
8787

88-
## HackMD by docker container
89-
[![Try in PWD](https://cdn.rawgit.com/play-with-docker/stacks/cff22438/assets/images/button.png)](http://play-with-docker.com?stack=https://github.com/hackmdio/docker-hackmd/raw/master/docker-compose.yml&stack_name=hackmd)
88+
## CodiMD by docker container
89+
[![Try in PWD](https://cdn.rawgit.com/play-with-docker/stacks/cff22438/assets/images/button.png)](http://play-with-docker.com?stack=https://github.com/hackmdio/docker-hackmd/raw/master/docker-compose.yml&stack_name=codimd)
9090

9191

9292
**Debian-based version:**
@@ -98,11 +98,11 @@ For all further details, please check out the offical HackMD [K8s helm chart](h
9898

9999
[![alpine](https://images.microbadger.com/badges/version/hackmdio/hackmd:alpine.svg)](https://microbadger.com/images/hackmdio/hackmd:alpine "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/image/hackmdio/hackmd:alpine.svg)](https://microbadger.com/images/hackmdio/hackmd:alpine "Get your own image badge on microbadger.com")
100100

101-
The easiest way to setup HackMD using docker are using the following three commands:
101+
The easiest way to setup CodiMD using docker are using the following three commands:
102102

103103
```console
104104
git clone https://github.com/hackmdio/docker-hackmd.git
105-
cd docker-hackmd
105+
cd docker-codimd
106106
docker-compose up
107107
```
108108
Read more about it in the [docker repository…](https://github.com/hackmdio/docker-hackmd)
@@ -111,14 +111,14 @@ Read more about it in the [docker repository…](https://github.com/hackmdio/doc
111111

112112
## Native setup
113113

114-
If you are upgrading HackMD from an older version, follow these steps:
114+
If you are upgrading CodiMD from an older version, follow these steps:
115115

116116
1. Fully stop your old server first (important)
117117
2. `git pull` or do whatever that updates the files
118118
3. `npm install` to update dependencies
119119
4. Build front-end bundle by `npm run build` (use `npm run dev` if you are in development)
120120
5. Modify the file named `.sequelizerc`, change the value of the variable `url` with your db connection string
121-
For example: `postgres://username:password@localhost:5432/hackmd`
121+
For example: `postgres://username:password@localhost:5432/codimd`
122122
6. Run `node_modules/.bin/sequelize db:migrate`, this step will migrate your db to the latest schema
123123
7. Start your whole new server!
124124

@@ -154,10 +154,10 @@ There are some config settings you need to change in the files below.
154154
| --------- | ------ | ----------- |
155155
| `NODE_ENV` | `production` or `development` | set current environment (will apply corresponding settings in the `config.json`) |
156156
| `DEBUG` | `true` or `false` | set debug mode; show more logs |
157-
| `HMD_DOMAIN` | `hackmd.io` | domain name |
158-
| `HMD_URL_PATH` | `hackmd` | sub URL path, like `www.example.com/<URL_PATH>` |
157+
| `HMD_DOMAIN` | `codimd.org` | domain name |
158+
| `HMD_URL_PATH` | `codimd` | sub URL path, like `www.example.com/<URL_PATH>` |
159159
| `HMD_PORT` | `80` | web app port |
160-
| `HMD_ALLOW_ORIGIN` | `localhost, hackmd.io` | domain name whitelist (use comma to separate) |
160+
| `HMD_ALLOW_ORIGIN` | `localhost, codimd.org` | domain name whitelist (use comma to separate) |
161161
| `HMD_PROTOCOL_USESSL` | `true` or `false` | set to use SSL protocol for resources path (only applied when domain is set) |
162162
| `HMD_URL_ADDPORT` | `true` or `false` | set to add port on callback URL (ports `80` or `443` won't be applied) (only applied when domain is set) |
163163
| `HMD_USECDN` | `true` or `false` | set to use CDN resources or not (default is `true`) |
@@ -191,8 +191,8 @@ There are some config settings you need to change in the files below.
191191
| `HMD_LDAP_SEARCHBASE` | `o=users,dc=example,dc=com` | LDAP directory to begin search from |
192192
| `HMD_LDAP_SEARCHFILTER` | `(uid={{username}})` | LDAP filter to search with |
193193
| `HMD_LDAP_SEARCHATTRIBUTES` | `displayName, mail` | LDAP attributes to search with (use comma to separate) |
194-
| `HMD_LDAP_USERIDFIELD` | `uidNumber` or `uid` or `sAMAccountName` | The LDAP field which is used uniquely identify a user on HackMD |
195-
| `HMD_LDAP_USERNAMEFIELD` | Fallback to userid | The LDAP field which is used as the username on HackMD |
194+
| `HMD_LDAP_USERIDFIELD` | `uidNumber` or `uid` or `sAMAccountName` | The LDAP field which is used uniquely identify a user on CodiMD |
195+
| `HMD_LDAP_USERNAMEFIELD` | Fallback to userid | The LDAP field which is used as the username on CodiMD |
196196
| `HMD_LDAP_TLS_CA` | `server-cert.pem, root.pem` | Root CA for LDAP TLS in PEM format (use comma to separate) |
197197
| `HMD_LDAP_PROVIDERNAME` | `My institution` | Optional name to be displayed at login form indicating the LDAP provider |
198198
| `HMD_SAML_IDPSSOURL` | `https://idp.example.com/sso` | authentication endpoint of IdP. for details, see [guide](docs/guides/auth.md#saml-onelogin). |
@@ -235,7 +235,7 @@ There are some config settings you need to change in the files below.
235235
| --------- | ------ | ----------- |
236236
| `debug` | `true` or `false` | set debug mode, show more logs |
237237
| `domain` | `localhost` | domain name |
238-
| `urlPath` | `hackmd` | sub URL path, like `www.example.com/<urlpath>` |
238+
| `urlPath` | `codimd` | sub URL path, like `www.example.com/<urlpath>` |
239239
| `port` | `80` | web app port |
240240
| `allowOrigin` | `['localhost']` | domain name whitelist |
241241
| `useSSL` | `true` or `false` | set to use SSL server (if `true`, will auto turn on `protocolUseSSL`) |
@@ -249,9 +249,9 @@ There are some config settings you need to change in the files below.
249249
| `allowFreeURL` | `true` or `false` | set to allow new note creation by accessing a nonexistent note URL |
250250
| `defaultPermission` | `freely`, `editable`, `limited`, `locked`, `protected` or `private` | set notes default permission (only applied on signed users) |
251251
| `dbURL` | `mysql://localhost:3306/database` | set the db URL; if set, then db config (below) won't be applied |
252-
| `db` | `{ "dialect": "sqlite", "storage": "./db.hackmd.sqlite" }` | set the db configs, [see more here](http://sequelize.readthedocs.org/en/latest/api/sequelize/) |
252+
| `db` | `{ "dialect": "sqlite", "storage": "./db.codimd.sqlite" }` | set the db configs, [see more here](http://sequelize.readthedocs.org/en/latest/api/sequelize/) |
253253
| `sslKeyPath` | `./cert/client.key` | SSL key path (only need when you set `useSSL`) |
254-
| `sslCertPath` | `./cert/hackmd_io.crt` | SSL cert path (only need when you set `useSSL`) |
254+
| `sslCertPath` | `./cert/codimd_io.crt` | SSL cert path (only need when you set `useSSL`) |
255255
| `sslCAPath` | `['./cert/COMODORSAAddTrustCA.crt']` | SSL ca chain (only need when you set `useSSL`) |
256256
| `dhParamPath` | `./cert/dhparam.pem` | SSL dhparam path (only need when you set `useSSL`) |
257257
| `tmpPath` | `./tmp/` | temp directory path |
@@ -304,7 +304,7 @@ There are some config settings you need to change in the files below.
304304
## Structure
305305

306306
```text
307-
hackmd/
307+
codimd/
308308
├── tmp/ --- temporary files
309309
├── docs/ --- document files
310310
├── lib/ --- server libraries
@@ -330,15 +330,15 @@ See more at [http://operational-transformation.github.io/](http://operational-tr
330330

331331
[gitter-image]: https://badges.gitter.im/Join%20Chat.svg
332332
[gitter-url]: https://gitter.im/hackmdio/hackmd?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
333-
[matrix.org-image]: https://img.shields.io/badge/Matrix.org-%23HackMD@matrix.org-green.svg
334-
[matrix.org-url]: https://riot.im/app/#/room/#hackmd:matrix.org
335-
[travis-image]: https://travis-ci.org/hackmdio/hackmd.svg?branch=master
336-
[travis-url]: https://travis-ci.org/hackmdio/hackmd
337-
[github-version-badge]: https://img.shields.io/github/release/hackmdio/hackmd.svg
338-
[github-release-page]: https://github.com/hackmdio/hackmd/releases
333+
[matrix.org-image]: https://img.shields.io/badge/Matrix.org-%23CodiMD@matrix.org-green.svg
334+
[matrix.org-url]: https://riot.im/app/#/room/#codimd:matrix.org
335+
[travis-image]: https://travis-ci.org/hackmdio/codimd.svg?branch=master
336+
[travis-url]: https://travis-ci.org/hackmdio/codimd
337+
[github-version-badge]: https://img.shields.io/github/release/hackmdio/codimd.svg
338+
[github-release-page]: https://github.com/hackmdio/codimd/releases
339339
[standardjs-image]: https://cdn.rawgit.com/feross/standard/master/badge.svg
340340
[standardjs-url]: https://github.com/feross/standard
341-
[codetriage-image]: https://www.codetriage.com/hackmdio/hackmd/badges/users.svg
342-
[codetriage-url]: https://www.codetriage.com/hackmdio/hackmd
341+
[codetriage-image]: https://www.codetriage.com/hackmdio/codimd/badges/users.svg
342+
[codetriage-url]: https://www.codetriage.com/hackmdio/codimd
343343
[poeditor-image]: https://img.shields.io/badge/POEditor-translate-blue.svg
344344
[poeditor-url]: https://poeditor.com/join/project/1OpGjF2Jir

app.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ process.on('uncaughtException', function (err) {
234234

235235
// install exit handler
236236
function handleTermSignals () {
237-
logger.info('hackmd has been killed by signal, try to exit gracefully...')
237+
logger.info('CodiMD has been killed by signal, try to exit gracefully...')
238238
realtime.maintenance = true
239239
// disconnect all socket.io clients
240240
Object.keys(io.sockets.sockets).forEach(function (key) {

app.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
2-
"name": "HackMD",
2+
"name": "CodiMD",
33
"description": "Realtime collaborative markdown notes on all platforms",
44
"keywords": [
55
"Collaborative",
66
"Markdown",
77
"Notes"
88
],
99
"website": "https://hackmd.io",
10-
"repository": "https://github.com/hackmdio/hackmd",
11-
"logo": "https://github.com/hackmdio/hackmd/raw/master/public/hackmd-icon-1024.png",
10+
"repository": "https://github.com/hackmdio/codimd",
11+
"logo": "https://github.com/hackmdio/codimd/raw/master/public/codimd-icon-1024.png",
1212
"success_url": "/",
1313
"env": {
1414
"BUILD_ASSETS": {

bin/setup

+3-4
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,10 @@ BUILD_ASSETS=false npm install
3333
cat << EOF
3434
3535
36-
Edit the following config file to setup hackmd server and client.
37-
Read more info at https://github.com/hackmdio/hackmd#configuration-files
36+
Edit the following config file to setup CodiMD server and client.
37+
Read more info at https://github.com/hackmdio/codimd#configuration-files
3838
39-
* config.json -- server config
40-
* public/js/config.js -- client config
39+
* config.json -- CodiMD config
4140
* .sequelizerc -- db config
4241
4342
EOF

config.json.example

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"db": {
1313
"dialect": "sqlite",
14-
"storage": "./db.hackmd.sqlite"
14+
"storage": "./db.codimd.sqlite"
1515
}
1616
},
1717
"production": {
@@ -34,7 +34,7 @@
3434
"db": {
3535
"username": "",
3636
"password": "",
37-
"database": "hackmd",
37+
"database": "codimd",
3838
"host": "localhost",
3939
"port": "5432",
4040
"dialect": "postgres"

lib/models/note.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ module.exports = function (sequelize, DataTypes) {
301301
return title || 'Untitled'
302302
},
303303
generateWebTitle: function (title) {
304-
title = !title || title === 'Untitled' ? 'HackMD - Collaborative markdown notes' : title + ' - HackMD'
304+
title = !title || title === 'Untitled' ? 'CodiMD - Collaborative markdown notes' : title + ' - CodiMD'
305305
return title
306306
},
307307
extractNoteTags: function (meta, $) {

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "hackmd",
2+
"name": "CodiMD",
33
"version": "1.1.1-ce",
44
"description": "Realtime collaborative markdown notes on all platforms.",
55
"main": "app.js",
@@ -136,7 +136,7 @@
136136
"engines": {
137137
"node": ">=6.x <10.x"
138138
},
139-
"bugs": "https://github.com/hackmdio/hackmd/issues",
139+
"bugs": "https://github.com/hackmdio/codimd/issues",
140140
"keywords": [
141141
"Collaborative",
142142
"Markdown",
@@ -151,7 +151,7 @@
151151
],
152152
"repository": {
153153
"type": "git",
154-
"url": "https://github.com/hackmdio/hackmd.git"
154+
"url": "https://github.com/hackmdio/codimd.git"
155155
},
156156
"devDependencies": {
157157
"babel-cli": "^6.18.0",
File renamed without changes.

0 commit comments

Comments
 (0)