aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornodiscc <nodiscc@gmail.com>2018-12-18 18:44:03 +0000
committerGitHub <noreply@github.com>2018-12-18 18:44:03 +0000
commit516a17bfbca3c3268483e4bd70c76f7a697cf58c (patch)
treedb20847dd3f5e40966aefd4aa7b0d990560fbdbd
parentMerge pull request #1573 from Kickball/Add_Booking (diff)
parentadd to author (diff)
downloadawesome-selfhosted-516a17bfbca3c3268483e4bd70c76f7a697cf58c.tar.gz
awesome-selfhosted-516a17bfbca3c3268483e4bd70c76f7a697cf58c.zip
Merge pull request #1583 from matsest/master
Remove Laverna (dead), add Joplin (Note-taking and Editors)
-rw-r--r--AUTHORS.md1
-rw-r--r--README.md2
2 files changed, 2 insertions, 1 deletions
diff --git a/AUTHORS.md b/AUTHORS.md
index ce14503c..1a69a53e 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -385,6 +385,7 @@
|1|Martin Malinda <malindacz@gmail.com>|
|1|Marvin <Groruk@uberdoge.network>|
|1|MatFluor <MatFluor@users.noreply.github.com>|
+|1|Mats Estensen <matsest@mxe.no>|
|1|Matt Lee <mattl@users.noreply.github.com>|
|1|Matteo Piccina <matteo@beiphone.it>|
|1|Matthew Dews <matthew-dews@users.noreply.github.com>|
diff --git a/README.md b/README.md
index ba8621e2..6365abda 100644
--- a/README.md
+++ b/README.md
@@ -981,7 +981,7 @@ See https://github.com/n1trux/awesome-sysadmin#monitoring and https://github.com
- [CodiMD](https://demo.codimd.org/) - Realtime collaborative markdown notes on all platforms, formerly HackMD CE. ([Source Code](https://github.com/hackmdio/codimd/)) `AGPL-3.0` `Node.js`
- [dillinger](http://dillinger.io/) - The last Markdown editor, ever. ([Source Code](https://github.com/joemccann/dillinger/)) `MIT` `Nodejs`
- [draw.io](https://draw.io) - Diagram software for making flowcharts, process diagrams, org charts, UML, ER and network diagrams. ([Source Code](https://github.com/jgraph/drawio)) `Apache-2.0` `JavaScript`
-- [Laverna](https://laverna.cc/) - Laverna is a Javascript note taking application with Markdown editor and encryption support. Consider it like open source alternative to Evernote. ([Demo](https://laverna.cc/index.html#notes), [Source Code](https://github.com/Laverna/laverna)) `MPL-2.0` `Nodejs`
+- [Joplin](https://joplin.cozic.net/) - Joplin is a note taking application with Markdown editor and encryption support for mobile and desktop platforms. Runs client-side and syncs through self hosted Nextcloud or similar. Consider it like open source alternative to Evernote. ([Source Code](https://github.com/laurent22/joplin)) `MIT` `Nodejs`
- [Leanote](http://leanote.org/) - Leanote, Not Just A Notepad! Open source cloud notepad. ([Demo](https://leanote.com/note), [Source Code](https://github.com/leanote/leanote)) `GPL-2.0` `Go`
- [Markdown Edit](http://georgeosddev.github.com/markdown-edit/) - Online markdown editor/viewer. ([Source Code](https://github.com/georgeOsdDev/markdown-edit)) `MIT` `HTML5`
- [Meemo](https://meemo.minimal-space.de/) - Personal notes stream with Markdown support. ([Source Code](https://github.com/nebulade/meemo)) `MIT` `Nodejs`