From 4b060c7dba034f76007f41d088778e569e69d2af Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Fri, 22 Jun 2018 21:07:30 +0200 Subject: Rebrand HackMD to CodiMD Signed-off-by: Sheogorath --- public/codimd-icon-1024.png | Bin 0 -> 4837 bytes public/docs/features.md | 8 ++++---- public/docs/yaml-metadata.md | 6 +++--- public/hackmd-icon-1024.png | Bin 4837 -> 0 bytes public/js/extra.js | 4 ++-- public/views/hackmd/header.ejs | 2 +- public/views/index/body.ejs | 7 +++---- public/views/index/head.ejs | 2 +- public/views/shared/help-modal.ejs | 4 ++-- 9 files changed, 16 insertions(+), 17 deletions(-) create mode 100644 public/codimd-icon-1024.png delete mode 100644 public/hackmd-icon-1024.png (limited to 'public') diff --git a/public/codimd-icon-1024.png b/public/codimd-icon-1024.png new file mode 100644 index 00000000..eebdcf78 Binary files /dev/null and b/public/codimd-icon-1024.png differ 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 === - **HackMD** is a realtime, multi-platform collaborative markdown note editor. + **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 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 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 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. 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/hackmd-icon-1024.png b/public/hackmd-icon-1024.png deleted file mode 100644 index eebdcf78..00000000 Binary files a/public/hackmd-icon-1024.png and /dev/null differ 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/hackmd/header.ejs b/public/views/hackmd/header.ejs index 21b632ce..8fc050b7 100644 --- a/public/views/hackmd/header.ejs +++ b/public/views/hackmd/header.ejs @@ -13,7 +13,7 @@ - HackMD + CodiMD
- <%= __('Report an issue') %> + <%= __('Report an issue') %>
- <%= __('Meet us on %s', 'Matrix') %> + <%= __('Meet us on %s', 'Matrix') %>
<%= __('Meet us on %s', 'Gitter') %>
-- cgit v1.2.3 From 23c33c0c046a9a27b2a31d334f6f818d8b1b3459 Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Sun, 24 Jun 2018 13:37:46 +0200 Subject: Rename HackMD view to CodiMD Even when it looks a bit weird in first place to rename all internals step by step, it makes sense to do so, because we run into confusion afterwards. Signed-off-by: Sheogorath --- public/views/codimd.ejs | 15 +++ public/views/codimd/body.ejs | 250 +++++++++++++++++++++++++++++++++++++++++ public/views/codimd/foot.ejs | 27 +++++ public/views/codimd/footer.ejs | 0 public/views/codimd/head.ejs | 22 ++++ public/views/codimd/header.ejs | 180 +++++++++++++++++++++++++++++ public/views/error.ejs | 8 +- public/views/hackmd.ejs | 15 --- public/views/hackmd/body.ejs | 250 ----------------------------------------- public/views/hackmd/foot.ejs | 27 ----- public/views/hackmd/footer.ejs | 0 public/views/hackmd/head.ejs | 22 ---- public/views/hackmd/header.ejs | 180 ----------------------------- 13 files changed, 498 insertions(+), 498 deletions(-) create mode 100644 public/views/codimd.ejs create mode 100644 public/views/codimd/body.ejs create mode 100644 public/views/codimd/foot.ejs create mode 100644 public/views/codimd/footer.ejs create mode 100644 public/views/codimd/head.ejs create mode 100644 public/views/codimd/header.ejs delete mode 100644 public/views/hackmd.ejs delete mode 100644 public/views/hackmd/body.ejs delete mode 100644 public/views/hackmd/foot.ejs delete mode 100644 public/views/hackmd/footer.ejs delete mode 100644 public/views/hackmd/head.ejs delete mode 100644 public/views/hackmd/header.ejs (limited to 'public') 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 @@ + + + + + <%- include codimd/head %> + + + + <%- include codimd/header %> + <%- include codimd/body %> + <%- include codimd/footer %> + <%- include codimd/foot %> + + + diff --git a/public/views/codimd/body.ejs b/public/views/codimd/body.ejs new file mode 100644 index 00000000..49604379 --- /dev/null +++ b/public/views/codimd/body.ejs @@ -0,0 +1,250 @@ + + + + + + + + + + + + + + + + + +<%- include ../shared/refresh-modal %> +<%- include ../shared/signin-modal %> +<%- include ../shared/help-modal %> +<%- include ../shared/revision-modal %> diff --git a/public/views/codimd/foot.ejs b/public/views/codimd/foot.ejs new file mode 100644 index 00000000..4d73d05f --- /dev/null +++ b/public/views/codimd/foot.ejs @@ -0,0 +1,27 @@ + +<% if(useCDN) { %> + + + + + + + + + + + + + + + + + + + +<%- include ../build/index-scripts %> +<% } else { %> + + +<%- include ../build/index-pack-scripts %> +<% } %> diff --git a/public/views/codimd/footer.ejs b/public/views/codimd/footer.ejs new file mode 100644 index 00000000..e69de29b diff --git a/public/views/codimd/head.ejs b/public/views/codimd/head.ejs new file mode 100644 index 00000000..8dfef432 --- /dev/null +++ b/public/views/codimd/head.ejs @@ -0,0 +1,22 @@ + + + + + + +<%= title %> + + +<% if(useCDN) { %> + + + + + + +<%- include ../build/index-header %> +<%- include ../shared/polyfill %> +<% } else { %> + +<%- include ../build/index-pack-header %> +<% } %> diff --git a/public/views/codimd/header.ejs b/public/views/codimd/header.ejs new file mode 100644 index 00000000..8fc050b7 --- /dev/null +++ b/public/views/codimd/header.ejs @@ -0,0 +1,180 @@ + + 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 @@ - <%- include hackmd/head %> + <%- include codimd/head %> - <%- include hackmd/header %> + <%- include codimd/header %>

<%- code %> <%- detail %> <%- msg %>

- <%- include hackmd/footer %> + <%- include codimd/footer %> - \ No newline at end of file + 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 @@ - - - - - <%- include hackmd/head %> - - - - <%- include hackmd/header %> - <%- include hackmd/body %> - <%- include hackmd/footer %> - <%- include hackmd/foot %> - - - diff --git a/public/views/hackmd/body.ejs b/public/views/hackmd/body.ejs deleted file mode 100644 index 49604379..00000000 --- a/public/views/hackmd/body.ejs +++ /dev/null @@ -1,250 +0,0 @@ - - - - - - - - - - - - - - - - - -<%- include ../shared/refresh-modal %> -<%- include ../shared/signin-modal %> -<%- include ../shared/help-modal %> -<%- include ../shared/revision-modal %> diff --git a/public/views/hackmd/foot.ejs b/public/views/hackmd/foot.ejs deleted file mode 100644 index 4d73d05f..00000000 --- a/public/views/hackmd/foot.ejs +++ /dev/null @@ -1,27 +0,0 @@ - -<% if(useCDN) { %> - - - - - - - - - - - - - - - - - - - -<%- include ../build/index-scripts %> -<% } else { %> - - -<%- include ../build/index-pack-scripts %> -<% } %> diff --git a/public/views/hackmd/footer.ejs b/public/views/hackmd/footer.ejs deleted file mode 100644 index e69de29b..00000000 diff --git a/public/views/hackmd/head.ejs b/public/views/hackmd/head.ejs deleted file mode 100644 index 8dfef432..00000000 --- a/public/views/hackmd/head.ejs +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - -<%= title %> - - -<% if(useCDN) { %> - - - - - - -<%- include ../build/index-header %> -<%- include ../shared/polyfill %> -<% } else { %> - -<%- include ../build/index-pack-header %> -<% } %> diff --git a/public/views/hackmd/header.ejs b/public/views/hackmd/header.ejs deleted file mode 100644 index 8fc050b7..00000000 --- a/public/views/hackmd/header.ejs +++ /dev/null @@ -1,180 +0,0 @@ - - -- cgit v1.2.3 From 2184491f4ac4b224e26fcc4b54d792dd4e82178f Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Sun, 24 Jun 2018 14:13:38 +0200 Subject: Final replacements Looks like I missed a few. This should be complete now. And make us ready for the repo rename and merging. Signed-off-by: Sheogorath --- public/docs/privacy.md.example | 6 +++--- public/js/cover.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'public') 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/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) }) }) -- cgit v1.2.3