From b28839484d120c04c5a06e7f8318650c78ab195b Mon Sep 17 00:00:00 2001 From: Erik Michelson Date: Thu, 2 Jul 2020 17:22:52 +0200 Subject: Replace CodiMD with HedgeDoc Signed-off-by: Erik Michelson Signed-off-by: Tilman Vatteroth Rename to HedgeDoc: References in public/views Signed-off-by: David Mehren Signed-off-by: Tilman Vatteroth Rename to HedgeDoc: Update links in README Signed-off-by: David Mehren Signed-off-by: Tilman Vatteroth Rename to HedgeDoc: Update links in SECURITY.md Signed-off-by: David Mehren Signed-off-by: Tilman Vatteroth Rename to HedgeDoc: Update links in LICENSE Signed-off-by: David Mehren Signed-off-by: Tilman Vatteroth Rename to HedgeDoc: Update links in docs/configuration.md Signed-off-by: David Mehren Signed-off-by: Tilman Vatteroth Rename to HedgeDoc: Update links in bin/setup Signed-off-by: David Mehren Signed-off-by: Tilman Vatteroth Rename to HedgeDoc: References in docs/guides Signed-off-by: David Mehren Signed-off-by: Tilman Vatteroth Rename to HedgeDoc: References in docs/dev Signed-off-by: David Mehren Signed-off-by: Tilman Vatteroth Rename to HedgeDoc: References in docs/guides/auth Signed-off-by: David Mehren Signed-off-by: Tilman Vatteroth Rename to HedgeDoc: References in docs/setup Signed-off-by: David Mehren Signed-off-by: Tilman Vatteroth Rename to HedgeDoc: Update various links in code to the new GitHub org. Signed-off-by: David Mehren Signed-off-by: Tilman Vatteroth Rename to HedgeDoc: codiMDVersion.js is now hedgeDocVersion.js Signed-off-by: David Mehren Signed-off-by: Tilman Vatteroth Rename to HedgeDoc: References in docs/setup/yunohost Signed-off-by: Tilman Vatteroth Rebrand to HedgeDoc: Add banner and logo Signed-off-by: Tilman Vatteroth Rename to HedgeDoc: Update links in docs/guides/migrate-etherpad Signed-off-by: Tilman Vatteroth Rename to HedgeDoc: Remove note in docs/guides/auth/github Signed-off-by: Tilman Vatteroth Rename to HedgeDoc: Replace links in public/docs/features Signed-off-by: Tilman Vatteroth Rename to HedgeDoc: Add todo placeholder in docs/history Signed-off-by: Tilman Vatteroth Rename to HedgeDoc: Replace github link in public/views/index/body Signed-off-by: Tilman Vatteroth Rename to HedgeDoc: Replace github link in README Signed-off-by: Tilman Vatteroth Rename to HedgeDoc: Add logo to README Signed-off-by: Tilman Vatteroth Rename to HedgeDoc: Add note about the renaming to the front page Signed-off-by: Tilman Vatteroth Removed Travis from README.md and change CodiMD to HedgeDoc in some places Signed-off-by: Yannick Bungers Some more renaming to HedgeDoc - Fixed capitalization of HedgeDoc - Added renaming for etherpad migration doc Signed-off-by: Yannick Bungers Changed Repo name to hedgedoc Signed-off-by: Yannick Bungers --- public/apple-touch-icon.png | Bin 684 -> 0 bytes public/banner/banner_h_bw.svg | 1 + public/banner/banner_h_wb.svg | 1 + public/banner/banner_vertical_color.svg | 1 + public/codimd-icon-1024.png | Bin 4837 -> 0 bytes public/css/index.css | 15 ++ public/docs/features.md | 10 +- public/docs/privacy.md.example | 6 +- public/docs/yaml-metadata.md | 4 +- public/favicon.png | Bin 725 -> 0 bytes public/icons/android-chrome-192x192.png | Bin 0 -> 2804 bytes public/icons/android-chrome-512x512.png | Bin 0 -> 9405 bytes public/icons/apple-touch-icon.png | Bin 0 -> 2126 bytes public/icons/browserconfig.xml | 9 ++ public/icons/favicon-16x16.png | Bin 0 -> 428 bytes public/icons/favicon-32x32.png | Bin 0 -> 605 bytes public/icons/favicon.ico | Bin 0 -> 15086 bytes public/icons/html_code.html | 0 public/icons/mstile-144x144.png | Bin 0 -> 2094 bytes public/icons/mstile-150x150.png | Bin 0 -> 1824 bytes public/icons/mstile-310x150.png | Bin 0 -> 1898 bytes public/icons/mstile-310x310.png | Bin 0 -> 3737 bytes public/icons/mstile-70x70.png | Bin 0 -> 1426 bytes public/icons/safari-pinned-tab.svg | 1 + public/icons/site.webmanifest | 18 +++ public/js/cover.js | 2 +- public/js/extra.js | 4 +- public/views/codimd.ejs | 15 -- public/views/codimd/body.ejs | 253 -------------------------------- public/views/codimd/foot.ejs | 29 ---- public/views/codimd/footer.ejs | 0 public/views/codimd/head.ejs | 30 ---- public/views/codimd/header.ejs | 174 ---------------------- public/views/error.ejs | 6 +- public/views/hedgedoc.ejs | 15 ++ public/views/hedgedoc/body.ejs | 253 ++++++++++++++++++++++++++++++++ public/views/hedgedoc/foot.ejs | 29 ++++ public/views/hedgedoc/footer.ejs | 0 public/views/hedgedoc/head.ejs | 31 ++++ public/views/hedgedoc/header.ejs | 177 ++++++++++++++++++++++ public/views/includes/favicon.ejs | 11 ++ public/views/index/body.ejs | 9 +- public/views/index/head.ejs | 11 +- public/views/pretty.ejs | 4 +- public/views/shared/help-modal.ejs | 6 +- 45 files changed, 594 insertions(+), 531 deletions(-) delete mode 100644 public/apple-touch-icon.png create mode 100644 public/banner/banner_h_bw.svg create mode 100644 public/banner/banner_h_wb.svg create mode 100644 public/banner/banner_vertical_color.svg delete mode 100644 public/codimd-icon-1024.png delete mode 100644 public/favicon.png create mode 100644 public/icons/android-chrome-192x192.png create mode 100644 public/icons/android-chrome-512x512.png create mode 100644 public/icons/apple-touch-icon.png create mode 100644 public/icons/browserconfig.xml create mode 100644 public/icons/favicon-16x16.png create mode 100644 public/icons/favicon-32x32.png create mode 100644 public/icons/favicon.ico create mode 100644 public/icons/html_code.html create mode 100644 public/icons/mstile-144x144.png create mode 100644 public/icons/mstile-150x150.png create mode 100644 public/icons/mstile-310x150.png create mode 100644 public/icons/mstile-310x310.png create mode 100644 public/icons/mstile-70x70.png create mode 100644 public/icons/safari-pinned-tab.svg create mode 100644 public/icons/site.webmanifest delete mode 100644 public/views/codimd.ejs delete mode 100644 public/views/codimd/body.ejs delete mode 100644 public/views/codimd/foot.ejs delete mode 100644 public/views/codimd/footer.ejs delete mode 100644 public/views/codimd/head.ejs delete mode 100644 public/views/codimd/header.ejs create mode 100644 public/views/hedgedoc.ejs create mode 100644 public/views/hedgedoc/body.ejs create mode 100644 public/views/hedgedoc/foot.ejs create mode 100644 public/views/hedgedoc/footer.ejs create mode 100644 public/views/hedgedoc/head.ejs create mode 100644 public/views/hedgedoc/header.ejs create mode 100644 public/views/includes/favicon.ejs (limited to 'public') diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png deleted file mode 100644 index 6978e262..00000000 Binary files a/public/apple-touch-icon.png and /dev/null differ diff --git a/public/banner/banner_h_bw.svg b/public/banner/banner_h_bw.svg new file mode 100644 index 00000000..8721be9e --- /dev/null +++ b/public/banner/banner_h_bw.svg @@ -0,0 +1 @@ + diff --git a/public/banner/banner_h_wb.svg b/public/banner/banner_h_wb.svg new file mode 100644 index 00000000..9c450000 --- /dev/null +++ b/public/banner/banner_h_wb.svg @@ -0,0 +1 @@ + diff --git a/public/banner/banner_vertical_color.svg b/public/banner/banner_vertical_color.svg new file mode 100644 index 00000000..cd5f8010 --- /dev/null +++ b/public/banner/banner_vertical_color.svg @@ -0,0 +1 @@ + diff --git a/public/codimd-icon-1024.png b/public/codimd-icon-1024.png deleted file mode 100644 index eebdcf78..00000000 Binary files a/public/codimd-icon-1024.png and /dev/null differ diff --git a/public/css/index.css b/public/css/index.css index d266ad88..992c9a7b 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -20,6 +20,21 @@ body.night{ background: #333 !important; } +body.night .no-night { + display: none; +} + +body:not(.night) .night { + display: none; +} + +.h-100 { + height: 100%; +} +.header-brand { + padding: 6px; +} + .CodeMirror { font-family: "Source Code Pro", Consolas, monaco, monospace; letter-spacing: 0.025em; diff --git a/public/docs/features.md b/public/docs/features.md index 9429da9e..f4582728 100644 --- a/public/docs/features.md +++ b/public/docs/features.md @@ -2,11 +2,11 @@ ## Introduction - **CodiMD** is a real-time, multi-platform collaborative markdown note editor. + **HedgeDoc** 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/codimd/server/issues). +If you experience any *issues*, feel free to report it on [**GitHub**](https://github.com/hedgedoc/hedgedoc/issues). Or meet us on [**Matrix.org**](https://matrix.to/#/#hedgedoc:matrix.org) for dev-talk and interactive help. **Thank you very much!** @@ -27,7 +27,7 @@ Or meet us on [**Matrix.org**](https://matrix.to/#/#hedgedoc:matrix.org) for dev ### 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 CodiMD. +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 HedgeDoc. The editor view, which is in night mode by default, can also be toggled between night and day view using the the little sun. @@ -73,7 +73,7 @@ There are four possible options: Notes can be embedded as follows: ```xml - + ``` ### [Slide Mode](./slide-example) @@ -524,7 +524,7 @@ Center aligned columns #### Links -[link text](https://demo.codimd.org) +[link text](https://demo.hedgedoc.org) [link with title](https://nodeca.github.io/pica/demo/ "title text!") Autoconverted link diff --git a/public/docs/privacy.md.example b/public/docs/privacy.md.example index cb9f1122..e2ec0e79 100644 --- a/public/docs/privacy.md.example +++ b/public/docs/privacy.md.example @@ -5,9 +5,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, Libravatar, 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 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 Libravatar. | -| 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. | +| 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 HedgeDoc 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 HedgeDoc instance or Libravatar. | +| Uploaded pictures | Pictures that are uploaded for documents are either uploaded to Amazon S3, Imgur, a minio instance or the local filesystem of the HedgeDoc 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 10956382..d7907005 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 CodiMD choose to breaks every time you enter a break. +The original markdown syntax breaks only if you put space twice, but HedgeDoc 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 allows you to enable Disqus with your shortname. **Example** ```yml -disqus: codimd +disqus: hedgedoc ``` ## type diff --git a/public/favicon.png b/public/favicon.png deleted file mode 100644 index 1600e49c..00000000 Binary files a/public/favicon.png and /dev/null differ diff --git a/public/icons/android-chrome-192x192.png b/public/icons/android-chrome-192x192.png new file mode 100644 index 00000000..1b42c8b7 Binary files /dev/null and b/public/icons/android-chrome-192x192.png differ diff --git a/public/icons/android-chrome-512x512.png b/public/icons/android-chrome-512x512.png new file mode 100644 index 00000000..1eedb77a Binary files /dev/null and b/public/icons/android-chrome-512x512.png differ diff --git a/public/icons/apple-touch-icon.png b/public/icons/apple-touch-icon.png new file mode 100644 index 00000000..54deb68d Binary files /dev/null and b/public/icons/apple-touch-icon.png differ diff --git a/public/icons/browserconfig.xml b/public/icons/browserconfig.xml new file mode 100644 index 00000000..be3e0384 --- /dev/null +++ b/public/icons/browserconfig.xml @@ -0,0 +1,9 @@ + + + + + + #b51f08 + + + diff --git a/public/icons/favicon-16x16.png b/public/icons/favicon-16x16.png new file mode 100644 index 00000000..695b8aaa Binary files /dev/null and b/public/icons/favicon-16x16.png differ diff --git a/public/icons/favicon-32x32.png b/public/icons/favicon-32x32.png new file mode 100644 index 00000000..80afec65 Binary files /dev/null and b/public/icons/favicon-32x32.png differ diff --git a/public/icons/favicon.ico b/public/icons/favicon.ico new file mode 100644 index 00000000..7188efc4 Binary files /dev/null and b/public/icons/favicon.ico differ diff --git a/public/icons/html_code.html b/public/icons/html_code.html new file mode 100644 index 00000000..e69de29b diff --git a/public/icons/mstile-144x144.png b/public/icons/mstile-144x144.png new file mode 100644 index 00000000..fa2152ab Binary files /dev/null and b/public/icons/mstile-144x144.png differ diff --git a/public/icons/mstile-150x150.png b/public/icons/mstile-150x150.png new file mode 100644 index 00000000..5b277a2c Binary files /dev/null and b/public/icons/mstile-150x150.png differ diff --git a/public/icons/mstile-310x150.png b/public/icons/mstile-310x150.png new file mode 100644 index 00000000..ab952960 Binary files /dev/null and b/public/icons/mstile-310x150.png differ diff --git a/public/icons/mstile-310x310.png b/public/icons/mstile-310x310.png new file mode 100644 index 00000000..a43ae7cc Binary files /dev/null and b/public/icons/mstile-310x310.png differ diff --git a/public/icons/mstile-70x70.png b/public/icons/mstile-70x70.png new file mode 100644 index 00000000..ce4b9fa9 Binary files /dev/null and b/public/icons/mstile-70x70.png differ diff --git a/public/icons/safari-pinned-tab.svg b/public/icons/safari-pinned-tab.svg new file mode 100644 index 00000000..aedf0d29 --- /dev/null +++ b/public/icons/safari-pinned-tab.svg @@ -0,0 +1 @@ + diff --git a/public/icons/site.webmanifest b/public/icons/site.webmanifest new file mode 100644 index 00000000..a3d61782 --- /dev/null +++ b/public/icons/site.webmanifest @@ -0,0 +1,18 @@ +{ + "name": "HedgeDoc", + "short_name": "HedgeDoc", + "icons": [ + { + "src": "/icons/android-chrome-192x192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "/icons/android-chrome-512x512.png", + "sizes": "512x512", + "type": "image/png" + } + ], + "theme_color": "#303030", + "background_color": "#303030" +} diff --git a/public/js/cover.js b/public/js/cover.js index 39f748e9..ed10afbf 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, `codimd_history_${moment().format('YYYYMMDDHHmmss')}`, true) + saveAs(blob, `hedgedoc_history_${moment().format('YYYYMMDDHHmmss')}`, true) }) }) diff --git a/public/js/extra.js b/public/js/extra.js index 0a95b1b1..49dd23ce 100644 --- a/public/js/extra.js +++ b/public/js/extra.js @@ -117,9 +117,9 @@ function getTitle (view) { export function renderTitle (view) { let title = getTitle(view) if (title) { - title += ' - CodiMD' + title += ' - HedgeDoc' } else { - title = 'CodiMD - Collaborative markdown notes' + title = 'HedgeDoc - Collaborative markdown notes' } return title } diff --git a/public/views/codimd.ejs b/public/views/codimd.ejs deleted file mode 100644 index 7818346c..00000000 --- a/public/views/codimd.ejs +++ /dev/null @@ -1,15 +0,0 @@ - - - - - <%- 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 deleted file mode 100644 index 96cb8f95..00000000 --- a/public/views/codimd/body.ejs +++ /dev/null @@ -1,253 +0,0 @@ - - - - - - - - - - - - - - - - - -<%- 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 deleted file mode 100644 index 9d620e29..00000000 --- a/public/views/codimd/foot.ejs +++ /dev/null @@ -1,29 +0,0 @@ - -<% 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 deleted file mode 100644 index e69de29b..00000000 diff --git a/public/views/codimd/head.ejs b/public/views/codimd/head.ejs deleted file mode 100644 index 71e261fb..00000000 --- a/public/views/codimd/head.ejs +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - -<% for (var og in opengraph) { %> -<% if (opengraph.hasOwnProperty(og) && opengraph[og].trim() !== '') { %> - -<% }} if (!opengraph.hasOwnProperty('image')) { %> - - - -<% } %> - -<%= 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 deleted file mode 100644 index 6bf37804..00000000 --- a/public/views/codimd/header.ejs +++ /dev/null @@ -1,174 +0,0 @@ - - diff --git a/public/views/error.ejs b/public/views/error.ejs index 3ed76c8c..e208d778 100644 --- a/public/views/error.ejs +++ b/public/views/error.ejs @@ -2,18 +2,18 @@ - <%- include codimd/head %> + <%- include hedgedoc/head %> - <%- include codimd/header %> + <%- include hedgedoc/header %>

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

- <%- include codimd/footer %> + <%- include hedgedoc/footer %> diff --git a/public/views/hedgedoc.ejs b/public/views/hedgedoc.ejs new file mode 100644 index 00000000..1a6061ab --- /dev/null +++ b/public/views/hedgedoc.ejs @@ -0,0 +1,15 @@ + + + + + <%- include hedgedoc/head %> + + + + <%- include hedgedoc/header %> + <%- include hedgedoc/body %> + <%- include hedgedoc/footer %> + <%- include hedgedoc/foot %> + + + diff --git a/public/views/hedgedoc/body.ejs b/public/views/hedgedoc/body.ejs new file mode 100644 index 00000000..96cb8f95 --- /dev/null +++ b/public/views/hedgedoc/body.ejs @@ -0,0 +1,253 @@ + + + + + + + + + + + + + + + + + +<%- include ../shared/refresh-modal %> +<%- include ../shared/signin-modal %> +<%- include ../shared/help-modal %> +<%- include ../shared/revision-modal %> diff --git a/public/views/hedgedoc/foot.ejs b/public/views/hedgedoc/foot.ejs new file mode 100644 index 00000000..9d620e29 --- /dev/null +++ b/public/views/hedgedoc/foot.ejs @@ -0,0 +1,29 @@ + +<% if(useCDN) { %> + + + + + + + + + + + + + + + + + + + + +<%- include ../build/index-scripts %> +<% } else { %> + + + +<%- include ../build/index-pack-scripts %> +<% } %> diff --git a/public/views/hedgedoc/footer.ejs b/public/views/hedgedoc/footer.ejs new file mode 100644 index 00000000..e69de29b diff --git a/public/views/hedgedoc/head.ejs b/public/views/hedgedoc/head.ejs new file mode 100644 index 00000000..e7b13e8a --- /dev/null +++ b/public/views/hedgedoc/head.ejs @@ -0,0 +1,31 @@ + + + + + + +<%- include ../includes/favicon %> +<% for (var og in opengraph) { %> +<% if (opengraph.hasOwnProperty(og) && opengraph[og].trim() !== '') { %> + +<% }} if (!opengraph.hasOwnProperty('image')) { %> + + + +<% } %> + +<%= title %> + + +<% if(useCDN) { %> + + + + + +<%- include ../build/index-header %> +<%- include ../shared/polyfill %> +<% } else { %> + +<%- include ../build/index-pack-header %> +<% } %> diff --git a/public/views/hedgedoc/header.ejs b/public/views/hedgedoc/header.ejs new file mode 100644 index 00000000..f700cd5b --- /dev/null +++ b/public/views/hedgedoc/header.ejs @@ -0,0 +1,177 @@ + + diff --git a/public/views/includes/favicon.ejs b/public/views/includes/favicon.ejs new file mode 100644 index 00000000..14b963fe --- /dev/null +++ b/public/views/includes/favicon.ejs @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs index 0f2b8f33..561502f0 100644 --- a/public/views/index/body.ejs +++ b/public/views/index/body.ejs @@ -40,10 +40,13 @@
style="display:none;"<% } %>>
-

CodiMD

+

HedgeDoc logo

<%= __('Best way to write and share your knowledge in markdown.') %>

+ + CodiMD was renamed to HedgeDoc. Read more + <% if (infoMessage && infoMessage.length > 0) { %>
<%= infoMessage %>
<% } %> @@ -156,10 +159,10 @@

- <%- __('Powered by %s', 'CodiMD') %> | <%= __('Releases') %> | <%= __('Source Code') %><% if(imprint) { %> | <%= __('Imprint') %><% } %><% if(privacyStatement) { %> | <%= __('Privacy') %><% } %><% if(termsOfUse) { %> | <%= __('Terms of Use') %><% } %> + <%- __('Powered by %s', 'HedgeDoc') %> | <%= __('Releases') %> | <%= __('Source Code') %><% if(imprint) { %> | <%= __('Imprint') %><% } %><% if(privacyStatement) { %> | <%= __('Privacy') %><% } %><% if(termsOfUse) { %> | <%= __('Terms of Use') %><% } %>

diff --git a/public/views/index/head.ejs b/public/views/index/head.ejs index 66396adb..2b751d34 100644 --- a/public/views/index/head.ejs +++ b/public/views/index/head.ejs @@ -6,17 +6,16 @@ - +<%- include ../includes/favicon %> + - - + + -CodiMD - <%= __('Collaborative markdown notes') %> - - +HedgeDoc - <%= __('Collaborative markdown notes') %> <% if(useCDN) { %> diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs index 91a8ead2..d9221c93 100644 --- a/public/views/pretty.ejs +++ b/public/views/pretty.ejs @@ -18,8 +18,8 @@ <% if (opengraph.hasOwnProperty(og) && opengraph[og].trim() !== '') { %> <% }} if (!opengraph.hasOwnProperty('image')) { %> - - + + <% } %> diff --git a/public/views/shared/help-modal.ejs b/public/views/shared/help-modal.ejs index d1fe50bb..88c2d9de 100644 --- a/public/views/shared/help-modal.ejs +++ b/public/views/shared/help-modal.ejs @@ -15,13 +15,13 @@

<%= __('Contacts') %>

- <%= __('Join the community') %> + <%= __('Join the community') %>
<%= __('Meet us on %s', 'Matrix') %>
- <%= __('Report an issue') %> + <%= __('Report an issue') %>
- <%= __('Help us translating') %> + <%= __('Help us translating') %>
-- cgit v1.3.1 From 7ce89d0ac52df46a228cfd3ae3bc755dfda81565 Mon Sep 17 00:00:00 2001 From: Tilman Vatteroth Date: Sat, 14 Nov 2020 21:21:39 +0100 Subject: Replace placeholder with actual link Signed-off-by: Tilman Vatteroth --- public/views/index/body.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'public') diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs index 561502f0..9a76f89f 100644 --- a/public/views/index/body.ejs +++ b/public/views/index/body.ejs @@ -45,7 +45,7 @@ <%= __('Best way to write and share your knowledge in markdown.') %>

- CodiMD was renamed to HedgeDoc. Read more + CodiMD was renamed to HedgeDoc. Read more <% if (infoMessage && infoMessage.length > 0) { %>
<%= infoMessage %>
-- cgit v1.3.1 From 0c1f72d8d009e1f908079ba0fd07e64a71c847dd Mon Sep 17 00:00:00 2001 From: Tilman Vatteroth Date: Sat, 14 Nov 2020 21:50:23 +0100 Subject: Add new screenshot Signed-off-by: Tilman Vatteroth --- public/screenshot.png | Bin 227548 -> 362026 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'public') diff --git a/public/screenshot.png b/public/screenshot.png index bff18d4b..c15fc7f2 100644 Binary files a/public/screenshot.png and b/public/screenshot.png differ -- cgit v1.3.1 From 978538c0de5afcf6cf4a21c0782a6b1e7fa57d9d Mon Sep 17 00:00:00 2001 From: Tilman Vatteroth Date: Sat, 14 Nov 2020 22:24:44 +0100 Subject: Correct repo name Signed-off-by: Tilman Vatteroth --- bin/setup | 2 +- docs/configuration.md | 2 +- docs/dev/getting-started.md | 2 +- docs/dev/openapi.yml | 8 ++++---- docs/guides/auth/keycloak.md | 2 +- docs/guides/migrate-etherpad.md | 2 +- docs/guides/migrations-and-breaking-changes.md | 4 ++-- docs/history.md | 7 +++++-- docs/setup/heroku.md | 2 +- docs/setup/manual-setup.md | 2 +- lib/config/index.js | 2 +- public/views/index/body.ejs | 2 +- public/views/shared/help-modal.ejs | 2 +- 13 files changed, 21 insertions(+), 18 deletions(-) (limited to 'public') diff --git a/bin/setup b/bin/setup index 776a0a95..2fcc65d6 100755 --- a/bin/setup +++ b/bin/setup @@ -36,7 +36,7 @@ cat << EOF Edit the following config file to setup HedgeDoc server and client. -Read more info at https://github.com/hedgedoc/server#configuration-files +Read more info at https://github.com/hedgedoc/hedgedoc#configuration-files * config.json -- HedgeDoc config * .sequelizerc -- db config diff --git a/docs/configuration.md b/docs/configuration.md index 8f2d6263..528e8675 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -29,7 +29,7 @@ to `config.json` before filling in your own details. | `loglevel` | `CMD_LOGLEVEL` | **`info`**, `debug` ... | Defines what kind of logs are provided to stdout. Available options: `debug`, `verbose`, `info`, `warn`, `error` | | `forbiddenNoteIDs` | `CMD_FORBIDDEN_NOTE_IDS` | **`['robots.txt', 'favicon.ico', 'api', 'build', 'css', 'docs', 'fonts', 'js', 'uploads', 'vendor', 'views']`**, `['robots.txt']` or `'robots.txt'` | disallow creation of notes, even if `allowFreeUrl` or `CMD_ALLOW_FREEURL` is `true` | | `imageUploadType` | `CMD_IMAGE_UPLOAD_TYPE` | **`filesystem`**, `imgur`, `s3`, `minio`, `azure`, `lutim` | Where to upload images. For S3, see our Image Upload Guides for [S3](guides/s3-image-upload.md) or [Minio](guides/minio-image-upload.md), also there's a whole section on their respective env vars below. | -| `sourceURL` | `CMD_SOURCE_URL` | **no default**, `https://github.com/hedgedoc/server/tree/` | Provides the link to the source code of HedgeDoc on the entry page (Please, make sure you change this when you run a modified version) | +| `sourceURL` | `CMD_SOURCE_URL` | **no default**, `https://github.com/hedgedoc/hedgedoc/tree/` | Provides the link to the source code of HedgeDoc on the entry page (Please, make sure you change this when you run a modified version) | | `tooBusyLag` | `CMD_TOOBUSY_LAG` | **`70`** | CPU time for one event loop tick until node throttles connections. (milliseconds) | | `staticCacheTime` | | **`1 * 24 * 60 * 60 * 1000`** | static file cache time | | `heartbeatInterval` | | **`5000`** | socket.io heartbeat interval | diff --git a/docs/dev/getting-started.md b/docs/dev/getting-started.md index 9169ea4d..b0623926 100644 --- a/docs/dev/getting-started.md +++ b/docs/dev/getting-started.md @@ -4,7 +4,7 @@ **Notice:** *There's [specialised instructions for docker](../setup/docker.md) or [heroku](../setup/heroku.md), if you prefer running code this way!* -1. Clone the repository with `git clone https://github.com/hedgedoc/server.git hedgedoc-server` +1. Clone the repository with `git clone https://github.com/hedgedoc/hedgedoc.git hedgedoc-server` (cloning is the preferred way, but you can also download and unzip a release) 2. Enter the directory and run `bin/setup`, which will install npm dependencies diff --git a/docs/dev/openapi.yml b/docs/dev/openapi.yml index d32a7ef4..aafaddc3 100644 --- a/docs/dev/openapi.yml +++ b/docs/dev/openapi.yml @@ -6,13 +6,13 @@ info: version: 1.6.0 contact: name: HedgeDoc on GitHub - url: https://github.com/hedgedoc/server + url: https://github.com/hedgedoc/hedgedoc license: name: AGPLv3 - url: https://github.com/hedgedoc/server/blob/master/LICENSE + url: https://github.com/hedgedoc/hedgedoc/blob/master/LICENSE externalDocs: - url: https://github.com/hedgedoc/server/blob/master/docs/dev/api.md + url: https://github.com/hedgedoc/hedgedoc/blob/master/docs/dev/api.md paths: @@ -281,7 +281,7 @@ paths: tags: - note summary: Creates a new GitHub Gist with the note's content. - description: 'If [GitHub integration](https://github.com/hedgedoc/server/blob/master/docs/configuration-env-vars.md#github-login) is configured, the user will be redirected to GitHub and a new Gist with the content of the note will be created.' + description: 'If [GitHub integration](https://github.com/hedgedoc/hedgedoc/blob/master/docs/configuration-env-vars.md#github-login) is configured, the user will be redirected to GitHub and a new Gist with the content of the note will be created.' responses: default: description: Redirect to the created gist (or the GitHub authentication before) diff --git a/docs/guides/auth/keycloak.md b/docs/guides/auth/keycloak.md index 6bb3ce7d..8f85d721 100644 --- a/docs/guides/auth/keycloak.md +++ b/docs/guides/auth/keycloak.md @@ -24,7 +24,7 @@ You may note that a separate realm is specified throughout this tutorial. It is 1. Select Client Scopes from the sidebar, and begin to create a new client scope using the Create button. 2. Ensure that the **Name** field is set to `id`. 3. Create a new mapper under the Mappers tab. This should reference the User Property `id`. `Claim JSON Type` should be String and all switches below should be enabled. Save the mapper. -4. Go to the client you set up in the previous steps using the Clients page, then choose the Client Scopes tab. Apply the scope you've created. This should mitigate errors as seen in [hedgedoc/server#56](https://github.com/hedgedoc/server/issues/56), as the `/userinfo` endpoint should now bring back the user's ID under the `id` key as well as `sub`. +4. Go to the client you set up in the previous steps using the Clients page, then choose the Client Scopes tab. Apply the scope you've created. This should mitigate errors as seen in [hedgedoc/server#56](https://github.com/hedgedoc/hedgedoc/issues/56), as the `/userinfo` endpoint should now bring back the user's ID under the `id` key as well as `sub`. --- diff --git a/docs/guides/migrate-etherpad.md b/docs/guides/migrate-etherpad.md index 00a48d2f..79784ef7 100644 --- a/docs/guides/migrate-etherpad.md +++ b/docs/guides/migrate-etherpad.md @@ -123,6 +123,6 @@ I put this file into my `etherpad.example.com` nginx config, such that all the u redirected accordingly. [etherpad 1.7.0]: https://github.com/ether/etherpad-lite/tree/1.7.0 -[codimd 1.2.1]: https://github.com/hedgedoc/server/tree/1.2.1 +[codimd 1.2.1]: https://github.com/hedgedoc/hedgedoc/tree/1.2.1 [hedgedoc-cli]: https://github.com/hedgedoc/cli/blob/master/bin/hedgedoc [howtolistallpads]: https://github.com/ether/etherpad-lite/wiki/How-to-list-all-pads/49701ecdcbe07aea7ad27ffa23aed0d99c2e17db diff --git a/docs/guides/migrations-and-breaking-changes.md b/docs/guides/migrations-and-breaking-changes.md index 20fa40f5..4c4be1f8 100644 --- a/docs/guides/migrations-and-breaking-changes.md +++ b/docs/guides/migrations-and-breaking-changes.md @@ -9,11 +9,11 @@ We dropped support for node 6 with this version. If you have any trouble running This is not a breaking change, but to stay up to date with the community repository, you may need to update a few urls. This is not a breaking change. -See more at [issue #10](https://github.com/hedgedoc/server/issues/10) +See more at [issue #10](https://github.com/hedgedoc/hedgedoc/issues/10) ### Native setup using git -Change the upstream remote using `git remote set-url origin https://github.com/hedgedoc/server.git`. +Change the upstream remote using `git remote set-url origin https://github.com/hedgedoc/hedgedoc.git`. ### Docker diff --git a/docs/history.md b/docs/history.md index 47792e3b..0c90b626 100644 --- a/docs/history.md +++ b/docs/history.md @@ -34,8 +34,11 @@ move the repository, so we simply forked it. We still welcome the HackMD team as part of our community, especially since a large portion of this code base originated with them. -*For the debate that lead to this step, please refer to the [governance debate](https://github.com/hackmdio/hackmd/issues/1170) and [the announcement of the new repository](https://github.com/hedgedoc/server/issues/10).* +*For the debate that lead to this step, please refer to the [governance debate](https://github.com/hackmdio/hackmd/issues/1170) and [the announcement of the new repository](https://github.com/hedgedoc/hedgedoc/issues/10).* ## CodiMD became HedgeDoc - +Many people were confused about the differences between the hackmd codimd and our codimd. +They asked us about features and bugs, that they found in the HackMD version. +That's why we decided, that we need a unique, new name and in March 2020 we started a [call to participation](https://community.codimd.org/t/renaming-yet-another-time/102). + diff --git a/docs/setup/heroku.md b/docs/setup/heroku.md index ea1356d1..e6280051 100644 --- a/docs/setup/heroku.md +++ b/docs/setup/heroku.md @@ -3,4 +3,4 @@ You can quickly setup a sample Heroku HedgeDoc application by clicking the button below. -[![Deploy on Heroku](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/hedgedoc/server/tree/master) +[![Deploy on Heroku](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/hedgedoc/hedgedoc/tree/master) diff --git a/docs/setup/manual-setup.md b/docs/setup/manual-setup.md index f197e477..4900093d 100644 --- a/docs/setup/manual-setup.md +++ b/docs/setup/manual-setup.md @@ -27,7 +27,7 @@ 3. Enter the directory and type `bin/setup`, which will install npm dependencies and create configs. -4. Modify the file named `config.json` or configure HedgeDoc through environment variables which will overwrite the configs, see docs [here](https://github.com/hedgedoc/server/blob/master/docs/configuration.md). +4. Modify the file named `config.json` or configure HedgeDoc through environment variables which will overwrite the configs, see docs [here](https://github.com/hedgedoc/hedgedoc/blob/master/docs/configuration.md). 5. Build front-end bundle by `yarn run build` (use `yarn run dev` if you are in development) diff --git a/lib/config/index.js b/lib/config/index.js index 495b5485..ecd25d96 100644 --- a/lib/config/index.js +++ b/lib/config/index.js @@ -157,7 +157,7 @@ for (let i = keys.length; i--;) { // Notify users about the prefix change and inform them they use legacy prefix for environment variables if (Object.keys(process.env).toString().indexOf('HMD_') !== -1) { - logger.warn('Using legacy HMD prefix for environment variables. Please change your variables in future. For details see: https://github.com/hedgedoc/server#environment-variables-will-overwrite-other-server-configs') + logger.warn('Using legacy HMD prefix for environment variables. Please change your variables in future. For details see: https://github.com/hedgedoc/hedgedoc#environment-variables-will-overwrite-other-server-configs') } // Generate session secret if it stays on default values diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs index 9a76f89f..cb96e628 100644 --- a/public/views/index/body.ejs +++ b/public/views/index/body.ejs @@ -162,7 +162,7 @@ <%- __('Powered by %s', 'HedgeDoc') %> | <%= __('Releases') %> | <%= __('Source Code') %><% if(imprint) { %> | <%= __('Imprint') %><% } %><% if(privacyStatement) { %> | <%= __('Privacy') %><% } %><% if(termsOfUse) { %> | <%= __('Terms of Use') %><% } %>

diff --git a/public/views/shared/help-modal.ejs b/public/views/shared/help-modal.ejs index 88c2d9de..29872ee7 100644 --- a/public/views/shared/help-modal.ejs +++ b/public/views/shared/help-modal.ejs @@ -19,7 +19,7 @@
<%= __('Meet us on %s', 'Matrix') %>
- <%= __('Report an issue') %> + <%= __('Report an issue') %>
<%= __('Help us translating') %> -- cgit v1.3.1 From a9026e0ec05abb72cad607a22f388aa22beca652 Mon Sep 17 00:00:00 2001 From: Tilman Vatteroth Date: Sun, 15 Nov 2020 15:39:04 +0100 Subject: Removed icon --- public/docs/features.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'public') diff --git a/public/docs/features.md b/public/docs/features.md index f4582728..8c88d7ae 100644 --- a/public/docs/features.md +++ b/public/docs/features.md @@ -2,7 +2,7 @@ ## Introduction - **HedgeDoc** is a real-time, multi-platform collaborative markdown note editor. +**HedgeDoc** 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*](/). -- cgit v1.3.1 From cdc5a89cd7a9d1c3cf3468e79620ac346f806874 Mon Sep 17 00:00:00 2001 From: Tilman Vatteroth Date: Sun, 15 Nov 2020 20:12:22 +0100 Subject: apply review suggestions --- README.md | 4 ++-- lib/config/index.js | 2 +- public/icons/html_code.html | 0 public/icons/site.webmanifest | 2 +- public/views/hedgedoc.ejs | 1 - public/views/hedgedoc/footer.ejs | 0 public/views/includes/favicon.ejs | 2 +- public/views/index/body.ejs | 2 +- public/views/shared/help-modal.ejs | 2 +- 9 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 public/icons/html_code.html delete mode 100644 public/views/hedgedoc/footer.ejs (limited to 'public') diff --git a/README.md b/README.md index 6f737387..4ead58e3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![HedgeDoc Logo](https://raw.githubusercontent.com/hedgedoc/hedgedoc-logo/main/LOGOTYPE/SVG/HedgeDoc-Logo%204b.svg) +![HedgeDoc Logo](https://raw.githubusercontent.com/hedgedoc/hedgedoc-logo/main/LOGOTYPE/SVG/HedgeDoc-Logo%204b.svg =300x) # HedgeDoc @@ -14,7 +14,7 @@ It is inspired by Hackpad, Etherpad and similar collaborative editors. This project originated with the team at [HackMD](https://hackmd.io) and now forked into its own organisation. [A longer writeup can be read in the history doc](docs/history.md). -[![HedgeDoc 1.3.2 with its feature demonstration page open](docs/images/HedgeDoc-1.7.0-features.png)][hedgedoc-demo-features] +[![HedgeDoc 1.7.0 with its feature demonstration page open](docs/images/HedgeDoc-1.7.0-features.png)][hedgedoc-demo-features] ## Community and Contributions diff --git a/lib/config/index.js b/lib/config/index.js index ecd25d96..f78513a0 100644 --- a/lib/config/index.js +++ b/lib/config/index.js @@ -157,7 +157,7 @@ for (let i = keys.length; i--;) { // Notify users about the prefix change and inform them they use legacy prefix for environment variables if (Object.keys(process.env).toString().indexOf('HMD_') !== -1) { - logger.warn('Using legacy HMD prefix for environment variables. Please change your variables in future. For details see: https://github.com/hedgedoc/hedgedoc#environment-variables-will-overwrite-other-server-configs') + logger.warn('Using legacy HMD prefix for environment variables. Please change your variables in future. For details see: https://github.com/hedgedoc/hedgedoc/blob/master/docs/configuration.md') } // Generate session secret if it stays on default values diff --git a/public/icons/html_code.html b/public/icons/html_code.html deleted file mode 100644 index e69de29b..00000000 diff --git a/public/icons/site.webmanifest b/public/icons/site.webmanifest index a3d61782..adbd7a98 100644 --- a/public/icons/site.webmanifest +++ b/public/icons/site.webmanifest @@ -13,6 +13,6 @@ "type": "image/png" } ], - "theme_color": "#303030", + "theme_color": "#b51f08", "background_color": "#303030" } diff --git a/public/views/hedgedoc.ejs b/public/views/hedgedoc.ejs index 1a6061ab..cfedb2b5 100644 --- a/public/views/hedgedoc.ejs +++ b/public/views/hedgedoc.ejs @@ -8,7 +8,6 @@ <%- include hedgedoc/header %> <%- include hedgedoc/body %> - <%- include hedgedoc/footer %> <%- include hedgedoc/foot %> diff --git a/public/views/hedgedoc/footer.ejs b/public/views/hedgedoc/footer.ejs deleted file mode 100644 index e69de29b..00000000 diff --git a/public/views/includes/favicon.ejs b/public/views/includes/favicon.ejs index 14b963fe..1cc8edb5 100644 --- a/public/views/includes/favicon.ejs +++ b/public/views/includes/favicon.ejs @@ -8,4 +8,4 @@ - + diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs index cb96e628..6176cb6e 100644 --- a/public/views/index/body.ejs +++ b/public/views/index/body.ejs @@ -45,7 +45,7 @@ <%= __('Best way to write and share your knowledge in markdown.') %>

- CodiMD was renamed to HedgeDoc. Read more + CodiMD was renamed to HedgeDoc. Read more <% if (infoMessage && infoMessage.length > 0) { %>
<%= infoMessage %>
diff --git a/public/views/shared/help-modal.ejs b/public/views/shared/help-modal.ejs index 29872ee7..7ffee93a 100644 --- a/public/views/shared/help-modal.ejs +++ b/public/views/shared/help-modal.ejs @@ -17,7 +17,7 @@
<%= __('Join the community') %>
- <%= __('Meet us on %s', 'Matrix') %> + <%= __('Meet us on %s', 'Matrix') %>
<%= __('Report an issue') %>
-- cgit v1.3.1