diff options
| -rw-r--r-- | CONTRIBUTING.md | 2 | ||||
| -rw-r--r-- | README.md | 3 | ||||
| -rw-r--r-- | docs/legal/developer-certificate-of-origin.txt (renamed from contribute/developer-certificate-of-origin) | 0 | ||||
| -rw-r--r-- | docs/setup/docker-linuxserver.md | 14 | ||||
| -rw-r--r-- | docs/setup/docker.md | 2 | ||||
| -rw-r--r-- | locales/de.json | 6 | ||||
| -rw-r--r-- | locales/sv.json | 2 |
7 files changed, 22 insertions, 7 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 05228746..781e0d91 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,7 +23,7 @@ We use the Developer Certificate of Origin (DCO) as a additional safeguard for the CodiMD project. This is a well established and widely used mechanism to assure contributors have confirmed their right to license their contribution under the project's license. -Please read [contribute/developer-certificate-of-origin][dcofile]. +Please read [docs/legal/developer-certificate-of-origin.txt][dcofile]. If you can certify it, then just add a line to every git commit message: ```` @@ -37,10 +37,11 @@ You can run CodiMD in a number of ways, and we created setup instructions for all of these: * [Docker](docs/setup/docker.md) +* [Docker (LinuxServer.io)](docs/setup/docker-linuxserver.md) * [Kubernetes](docs/setup/kubernetes.md) * [Cloudron](docs/setup/cloudron.md) * [Heroku](docs/setup/heroku.md) -* [manual setup](docs/setup/manual-setup.md) +* [Manual setup](docs/setup/manual-setup.md) If you do not wish to run your own setup, you can find a commercial offering at https://hackmd.io. This is not the same codebase as this one, but it is a very diff --git a/contribute/developer-certificate-of-origin b/docs/legal/developer-certificate-of-origin.txt index a6bbb984..a6bbb984 100644 --- a/contribute/developer-certificate-of-origin +++ b/docs/legal/developer-certificate-of-origin.txt diff --git a/docs/setup/docker-linuxserver.md b/docs/setup/docker-linuxserver.md new file mode 100644 index 00000000..237630d8 --- /dev/null +++ b/docs/setup/docker-linuxserver.md @@ -0,0 +1,14 @@ +LinuxServer.io CodiMD Image +=== +[](https://discord.gg/YWrKVTn)[](https://microbadger.com/images/linuxserver/codimd "Get your own version badge on microbadger.com")[](https://microbadger.com/images/linuxserver/codimd "Get your own version badge on microbadger.com")[](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-codimd/job/master/)[](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/codimd/latest/index.html) + +[LinuxServer.io](https://linuxserver.io) have created an Ubuntu based multiarch container for x86-64, arm64 and armhf which supports PDF export from all architectures using PhatomJS. + +It supports all the environmental variables detailed [here](https://github.com/codimd/server/blob/master/docs/configuration-env-vars.md) to modify it according to your needs. + +It gets rebuilt on new releases from CodiMD and also weekly if necessary to update any other package changes in the underlying container, making it easy to keep your CodiMD instance up to date. + +It also details how to easily [utilise Docker networking to reverse proxy](https://github.com/linuxserver/docker-codimd/#application-setup) CodiMD using their [LetsEncrypt docker image](https://github.com/linuxserver/docker-letsencrypt) + +[Github Repository](https://github.com/linuxserver/docker-codimd/) +[Docker Hub Image](https://hub.docker.com/r/linuxserver/codimd)
\ No newline at end of file diff --git a/docs/setup/docker.md b/docs/setup/docker.md index e72026e2..0268727c 100644 --- a/docs/setup/docker.md +++ b/docs/setup/docker.md @@ -1,4 +1,4 @@ -CodiMD by docker container +CodiMD Docker Image === [](http://play-with-docker.com?stack=https://github.com/codimd/container/raw/master/docker-compose.yml&stack_name=codimd) diff --git a/locales/de.json b/locales/de.json index a4758db7..4a9e38a8 100644 --- a/locales/de.json +++ b/locales/de.json @@ -2,11 +2,11 @@ "Collaborative markdown notes": "Gemeinschaftliche Markdown Notizen", "Realtime collaborative markdown notes on all platforms.": "Gemeinschaftliche Notizen in Echtzeit auf allen Plattformen.", "Best way to write and share your knowledge in markdown.": "Der beste Weg, Notizen zu schreiben und teilen.", - "Intro": "Intro", + "Intro": "Einleitung", "History": "Verlauf", "New guest note": "Neue Gast Notiz", "Collaborate with URL": "Zusammenarbeiten mit URL", - "Support charts and MathJax": "Unterstützt charts und Mathjax", + "Support charts and MathJax": "Unterstützt Charts und MathJax", "Support slide mode": "Unterstützt Präsentationsmodus", "Sign In": "Einloggen", "Below is the history from browser": "Lokaler Browserverlauf", @@ -106,7 +106,7 @@ "Select Visibility Level": "Sichtbarkeit bestimmen", "Night Theme": "Nachtmodus", "Follow us on %s and %s.": "Folge uns auf %s und %s.", - "Privacy": "Privatsphäre", + "Privacy": "Datenschutz", "Terms of Use": "Nutzungsbedingungen", "Do you really want to delete your user account?": "Möchten Sie wirklich Ihr Nutzeraccount löschen?", "This will delete your account, all notes that are owned by you and remove all references to your account from other notes.": "Hiermit löschen Sie Ihren Account, alle Ihre Dokumente und alle Verweise auf Ihren Account aus anderen Dokumenten.", diff --git a/locales/sv.json b/locales/sv.json index 93eeb891..66676b67 100644 --- a/locales/sv.json +++ b/locales/sv.json @@ -62,7 +62,7 @@ "Refresh": "Ladda om", "Contacts": "Kontakter", "Report an issue": "Rapportera ett fel", - "Meet us on %s": "Träffa oss på% s", + "Meet us on %s": "Träffa oss på %s", "Send us email": "Skicka e-post till oss", "Documents": "Dokument", "Features": "Funktioner", |