diff options
Diffstat (limited to 'public')
-rw-r--r-- | public/codimd-icon-1024.png (renamed from public/hackmd-icon-1024.png) | bin | 4837 -> 4837 bytes | |||
-rw-r--r-- | public/docs/features.md | 8 | ||||
-rw-r--r-- | public/docs/privacy.md.example | 6 | ||||
-rw-r--r-- | public/docs/yaml-metadata.md | 6 | ||||
-rw-r--r-- | public/js/cover.js | 2 | ||||
-rw-r--r-- | public/js/extra.js | 4 | ||||
-rw-r--r-- | public/views/codimd.ejs | 15 | ||||
-rw-r--r-- | public/views/codimd/body.ejs (renamed from public/views/hackmd/body.ejs) | 0 | ||||
-rw-r--r-- | public/views/codimd/foot.ejs (renamed from public/views/hackmd/foot.ejs) | 0 | ||||
-rw-r--r-- | public/views/codimd/footer.ejs (renamed from public/views/hackmd/footer.ejs) | 0 | ||||
-rw-r--r-- | public/views/codimd/head.ejs (renamed from public/views/hackmd/head.ejs) | 0 | ||||
-rw-r--r-- | public/views/codimd/header.ejs (renamed from public/views/hackmd/header.ejs) | 2 | ||||
-rw-r--r-- | public/views/error.ejs | 8 | ||||
-rw-r--r-- | public/views/hackmd.ejs | 15 | ||||
-rw-r--r-- | public/views/index/body.ejs | 7 | ||||
-rw-r--r-- | public/views/index/head.ejs | 2 | ||||
-rw-r--r-- | public/views/shared/help-modal.ejs | 4 |
17 files changed, 39 insertions, 40 deletions
diff --git a/public/hackmd-icon-1024.png b/public/codimd-icon-1024.png Binary files differindex eebdcf78..eebdcf78 100644 --- a/public/hackmd-icon-1024.png +++ b/public/codimd-icon-1024.png diff --git a/public/docs/features.md b/public/docs/features.md index dc6ddafa..f684ca62 100644 --- a/public/docs/features.md +++ b/public/docs/features.md @@ -3,12 +3,12 @@ Features Introduction === -<i class="fa fa-file-text"></i> **HackMD** is a realtime, multi-platform collaborative markdown note editor. +<i class="fa fa-file-text"></i> **CodiMD** is a real-time, multi-platform collaborative markdown note editor. This means that you can write notes with other people on your **desktop**, **tablet** or even on the **phone**. You can sign-in via multiple auth providers like **Facebook**, **Twitter**, **GitHub** and many more on the [_homepage_](/). -If you experience any _issues_, feel free to report it on [**GitHub**](https://github.com/hackmdio/hackmd/issues). -Or meet us on [**Matrix.org**](https://riot.im/app/#/room/#hackmd:matrix.org) or [**Gitter**](https://gitter.im/hackmdio/hackmd) for dev-talk and interactive help. +If you experience any _issues_, feel free to report it on [**GitHub**](https://github.com/hackmdio/codimd/issues). +Or meet us on [**Matrix.org**](https://riot.im/app/#/room/#codimd:matrix.org) or [**Gitter**](https://gitter.im/hackmdio/hackmd) for dev-talk and interactive help. **Thank you very much!** Workspace @@ -26,7 +26,7 @@ Workspace <i class="fa fa-toggle-off fa-fw"></i> Edit: See only the editor. ## Night Mode: -When you are tired of a white screen and like a night mode, click on the little moon <i class="fa fa-moon-o"></i> and turn on the night view of HackMD. +When you are tired of a white screen and like a night mode, click on the little moon <i class="fa fa-moon-o"></i> and turn on the night view of CodiMD. The editor view, which is in night mode by default, can also be toggled between night and day view using the the little sun<i class="fa fa-sun-o fa-fw"></i>. diff --git a/public/docs/privacy.md.example b/public/docs/privacy.md.example index 08bf9091..ff65d82e 100644 --- a/public/docs/privacy.md.example +++ b/public/docs/privacy.md.example @@ -6,9 +6,9 @@ We process the following data, for the following purposes: |your data|our usage| |---------|---------| |IP-Address|Used to communicate with your browser and our servers. It's may exposed to third-parties which provide resources for this service. These services are, depending on your login method, the document you visit and the setup of this instance: Google, Disqus, MathJax, GitHub, SlideShare/LinkedIn, yahoo, Gravatar, Imgur, Amazon, and Cloudflare.| -|Usernames and profiles|Your username as well as user profiles that are connected with it are transmitted and stored by us to provide a useful login integration with services like GitHub, Facebook, Twitter, GitLab, Dropbox, Google. Depending on the setup of this HackMD instance there are maybe other third-parties involved using SAML, LDAP or the integration with a Mattermost instance.| -|Profile pictures| Your profile picture is either loaded from the service you used to login, the HackMD instance or Gravatar.| -|Uploaded pictures| Pictures that are uploaded for documents are either uploaded to Amazon S3, Imgur, a minio instance or the local filesystem of the HackMD server.| +|Usernames and profiles|Your username as well as user profiles that are connected with it are transmitted and stored by us to provide a useful login integration with services like GitHub, Facebook, Twitter, GitLab, Dropbox, Google. Depending on the setup of this CodiMD instance there are maybe other third-parties involved using SAML, LDAP or the integration with a Mattermost instance.| +|Profile pictures| Your profile picture is either loaded from the service you used to login, the CodiMD instance or Gravatar.| +|Uploaded pictures| Pictures that are uploaded for documents are either uploaded to Amazon S3, Imgur, a minio instance or the local filesystem of the CodiMD server.| All account data and notes are stored in a mysql/postgres/sqlite database. Besides the user accounts and the document themselves also relationships between the documents and the user accounts are stored. This includes ownership, authorship and revisions of all changes made during the creation of a note. diff --git a/public/docs/yaml-metadata.md b/public/docs/yaml-metadata.md index d49418f6..888345f7 100644 --- a/public/docs/yaml-metadata.md +++ b/public/docs/yaml-metadata.md @@ -96,7 +96,7 @@ dir: rtl breaks --- This option means the hardbreaks in the note will be parsed or be ignore. -The original markdown syntax breaks only if you put space twice, but HackMD choose to breaks every time you enter a break. +The original markdown syntax breaks only if you put space twice, but CodiMD choose to breaks every time you enter a break. You can only use whether `true` or `false`. > default: not set (which will be true) @@ -125,7 +125,7 @@ This option allow you to enable Disqus with your shortname. **Example** ```xml -disqus: hackmd +disqus: codimd ``` slideOptions @@ -146,4 +146,4 @@ https://github.com/hakimel/reveal.js/tree/master/css/theme slideOptions: transition: fade theme: white -```
\ No newline at end of file +``` diff --git a/public/js/cover.js b/public/js/cover.js index 6ca05f6f..79fb3a2a 100644 --- a/public/js/cover.js +++ b/public/js/cover.js @@ -318,7 +318,7 @@ $('.ui-save-history').click(() => { const blob = new Blob([history], { type: 'application/json;charset=utf-8' }) - saveAs(blob, `hackmd_history_${moment().format('YYYYMMDDHHmmss')}`, true) + saveAs(blob, `codimd_history_${moment().format('YYYYMMDDHHmmss')}`, true) }) }) diff --git a/public/js/extra.js b/public/js/extra.js index dbb0f458..d6bbb0c6 100644 --- a/public/js/extra.js +++ b/public/js/extra.js @@ -105,9 +105,9 @@ function getTitle (view) { export function renderTitle (view) { let title = getTitle(view) if (title) { - title += ' - HackMD' + title += ' - CodiMD' } else { - title = 'HackMD - Collaborative markdown notes' + title = 'CodiMD - Collaborative markdown notes' } return title } diff --git a/public/views/codimd.ejs b/public/views/codimd.ejs new file mode 100644 index 00000000..7818346c --- /dev/null +++ b/public/views/codimd.ejs @@ -0,0 +1,15 @@ +<!DOCTYPE html> +<html lang="en"> + +<head> + <%- include codimd/head %> +</head> + +<body> + <%- include codimd/header %> + <%- include codimd/body %> + <%- include codimd/footer %> + <%- include codimd/foot %> +</body> + +</html> diff --git a/public/views/hackmd/body.ejs b/public/views/codimd/body.ejs index 49604379..49604379 100644 --- a/public/views/hackmd/body.ejs +++ b/public/views/codimd/body.ejs diff --git a/public/views/hackmd/foot.ejs b/public/views/codimd/foot.ejs index 4d73d05f..4d73d05f 100644 --- a/public/views/hackmd/foot.ejs +++ b/public/views/codimd/foot.ejs diff --git a/public/views/hackmd/footer.ejs b/public/views/codimd/footer.ejs index e69de29b..e69de29b 100644 --- a/public/views/hackmd/footer.ejs +++ b/public/views/codimd/footer.ejs diff --git a/public/views/hackmd/head.ejs b/public/views/codimd/head.ejs index 8dfef432..8dfef432 100644 --- a/public/views/hackmd/head.ejs +++ b/public/views/codimd/head.ejs diff --git a/public/views/hackmd/header.ejs b/public/views/codimd/header.ejs index 21b632ce..8fc050b7 100644 --- a/public/views/hackmd/header.ejs +++ b/public/views/codimd/header.ejs @@ -13,7 +13,7 @@ <ul class="dropdown-menu list" role="menu" aria-labelledby="menu"> </ul> </div> - <a class="navbar-brand pull-left" href="<%- url %>/"><i class="fa fa-file-text"></i> HackMD</a> + <a class="navbar-brand pull-left" href="<%- url %>/"><i class="fa fa-file-text"></i> CodiMD</a> <div class="nav-mobile pull-right visible-xs"> <span class="btn btn-link btn-file ui-upload-image" title="Upload Image" style="display:none;"> <i class="fa fa-camera"></i><input type="file" accept="image/*" name="upload" multiple> diff --git a/public/views/error.ejs b/public/views/error.ejs index a40ed39c..98c3c74e 100644 --- a/public/views/error.ejs +++ b/public/views/error.ejs @@ -2,18 +2,18 @@ <html lang="en"> <head> - <%- include hackmd/head %> + <%- include codimd/head %> <link rel="stylesheet" href="<%- url %>/css/center.css"> </head> <body> - <%- include hackmd/header %> + <%- include codimd/header %> <div class="container-fluid text-center"> <div class="vertical-center-row"> <h1><%- code %> <%- detail %> <small><%- msg %></small></h1> </div> </div> - <%- include hackmd/footer %> + <%- include codimd/footer %> </body> -</html>
\ No newline at end of file +</html> diff --git a/public/views/hackmd.ejs b/public/views/hackmd.ejs deleted file mode 100644 index 49084a63..00000000 --- a/public/views/hackmd.ejs +++ /dev/null @@ -1,15 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> - -<head> - <%- include hackmd/head %> -</head> - -<body> - <%- include hackmd/header %> - <%- include hackmd/body %> - <%- include hackmd/footer %> - <%- include hackmd/foot %> -</body> - -</html> diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs index 220e0dae..a0de8c32 100644 --- a/public/views/index/body.ejs +++ b/public/views/index/body.ejs @@ -40,8 +40,7 @@ <div id="home" class="section"<% if(signin) { %> style="display:none;"<% } %>> <div class="inner cover"> - <h1 class="cover-heading"><i class="fa fa-file-text"></i> HackMD</h1> - <p class="lead"><strong>Community Edition</strong></p> + <h1 class="cover-heading"><i class="fa fa-file-text"></i> CodiMD</h1> <p class="lead"> <%= __('Best way to write and share your knowledge in markdown.') %> </p> @@ -150,10 +149,10 @@ <option value="ko">한국어</option> </select> <p> - © 2018 <a href="https://hackmd.io">HackMD</a> | <a href="<%- url %>/s/release-notes" target="_blank"><%= __('Releases') %></a><% if(privacyStatement) { %> | <a href="<%- url %>/s/privacy" target="_blank"><%= __('Privacy') %></a><% } %><% if(termsOfUse) { %> | <a href="<%- url %>/s/terms-of-use" target="_blank"><%= __('Terms of Use') %></a><% } %> + © 2018 <a href="https://hackmd.io">CodiMD</a> | <a href="<%- url %>/s/release-notes" target="_blank"><%= __('Releases') %></a><% if(privacyStatement) { %> | <a href="<%- url %>/s/privacy" target="_blank"><%= __('Privacy') %></a><% } %><% if(termsOfUse) { %> | <a href="<%- url %>/s/terms-of-use" target="_blank"><%= __('Terms of Use') %></a><% } %> </p> <h6 class="social-foot"> - <%- __('Follow us on %s and %s.', '<a href="https://github.com/hackmdio/HackMD" target="_blank"><i class="fa fa-github"></i> GitHub</a>, <a href="https://twitter.com/hackmdio" target="_blank"><i class="fa fa-twitter"></i> Twitter</a>', '<a href="https://www.facebook.com/hackmdio" target="_blank"><i class="fa fa-facebook-square"></i> Facebook</a>') %> + <%- __('Follow us on %s and %s.', '<a href="https://github.com/hackmdio/CodiMD" target="_blank"><i class="fa fa-github"></i> GitHub</a>, <a href="https://twitter.com/hackmdio" target="_blank"><i class="fa fa-twitter"></i> Twitter</a>', '<a href="https://www.facebook.com/hackmdio" target="_blank"><i class="fa fa-facebook-square"></i> Facebook</a>') %> </h6> </div> </div> diff --git a/public/views/index/head.ejs b/public/views/index/head.ejs index e43c57d4..f826d9ee 100644 --- a/public/views/index/head.ejs +++ b/public/views/index/head.ejs @@ -6,7 +6,7 @@ <meta name="mobile-web-app-capable" content="yes"> <meta name="description" content="<%= __('Best way to write and share your knowledge in markdown.') %>"> <meta name="keywords" content="Collaborative, Markdown, Notes"> -<title>HackMD - <%= __('Collaborative markdown notes') %></title> +<title>CodiMD - <%= __('Collaborative markdown notes') %></title> <link rel="icon" type="image/png" href="<%- url %>/favicon.png"> <link rel="apple-touch-icon" href="<%- url %>/apple-touch-icon.png"> <% if(useCDN) { %> diff --git a/public/views/shared/help-modal.ejs b/public/views/shared/help-modal.ejs index 6bcf637e..7d6576df 100644 --- a/public/views/shared/help-modal.ejs +++ b/public/views/shared/help-modal.ejs @@ -15,9 +15,9 @@ <h3 class="panel-title"><%= __('Contacts') %></h3> </div> <div class="panel-body"> - <a href="https://github.com/hackmdio/hackmd/issues" target="_blank"><i class="fa fa-tag fa-fw"></i> <%= __('Report an issue') %></a> + <a href="https://github.com/hackmdio/codimd/issues" target="_blank"><i class="fa fa-tag fa-fw"></i> <%= __('Report an issue') %></a> <br> - <a href="https://riot.im/app/#/room/#hackmd:matrix.org" target="_blank"><i class="fa fa-hashtag fa-fw"></i> <%= __('Meet us on %s', 'Matrix') %></a> + <a href="https://riot.im/app/#/room/#codimd:matrix.org" target="_blank"><i class="fa fa-hashtag fa-fw"></i> <%= __('Meet us on %s', 'Matrix') %></a> <br> <a href="https://gitter.im/hackmdio/hackmd" target="_blank"><i class="fa fa-comments fa-fw"></i> <%= __('Meet us on %s', 'Gitter') %></a> </div> |