diff --git a/README.md b/README.md index 170d9e4f95..44dc8dd733 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ Joplin is a free, open source note taking and to-do application, which can handl Notes exported from Evernote via .enex files [can be imported](#importing) into Joplin, including the formatted content (which is converted to Markdown), resources (images, attachments, etc.) and complete metadata (geolocation, updated time, created time, etc.). Plain Markdown files can also be imported. -The notes can be [synchronised](#synchronisation) with various cloud services including [Nextcloud](https://nextcloud.com/), Dropbox, OneDrive or the file system (for example with a network directory). When synchronising the notes, notebooks, tags and other metadata are saved to plain text files which can be easily inspected, backed up and moved around. +The notes can be [synchronised](#synchronisation) with various cloud services including [Nextcloud](https://nextcloud.com/), Dropbox, OneDrive, WebDAV or the file system (for example with a network directory). When synchronising the notes, notebooks, tags and other metadata are saved to plain text files which can be easily inspected, backed up and moved around. -The UI of the terminal client is built on top of the great [terminal-kit](https://github.com/cronvel/terminal-kit) library, the desktop client using [Electron](https://electronjs.org/), and the Android client front end is done using [React Native](https://facebook.github.io/react-native/). +The application is available for Windows, Linux, macOS, Android and iOS. A [Web Clipper](https://github.com/laurent22/joplin/blob/master/readme/clipper.md), to save web pages and screenshots from your browser, is also available for Firefox and Chrome.
@@ -45,6 +45,10 @@ To start it, type `joplin`. For usage information, please refer to the full [Joplin Terminal Application Documentation](https://joplin.cozic.net/terminal). +## Web Clipper + +The Web Clipper is a browser extension that allows you to save web pages and screenshots from your browser. For more information on how to install and use it, see the [Web Clipper Help Page](https://github.com/laurent22/joplin/blob/master/readme/clipper.md). + # Table of contents @@ -53,6 +57,7 @@ For usage information, please refer to the full [Joplin Terminal Application Doc - [Desktop application](https://github.com/laurent22/joplin/blob/master/readme/desktop.md) - [Mobile applications](https://github.com/laurent22/joplin/blob/master/readme/mobile.md) - [Terminal application](https://github.com/laurent22/joplin/blob/master/readme/terminal.md) + - [Web Clipper](https://github.com/laurent22/joplin/blob/master/readme/clipper.md) - Support @@ -72,6 +77,7 @@ For usage information, please refer to the full [Joplin Terminal Application Doc # Features - Desktop, mobile and terminal applications. +- [Web Clipper](https://github.com/laurent22/joplin/blob/master/readme/clipper.md) for Firefox and Chrome. - End To End Encryption (E2EE) - Synchronisation with various services, including NextCloud, Dropbox, WebDAV and OneDrive. - Import Enex files (Evernote export format) and Markdown files. diff --git a/docs/changelog/index.html b/docs/changelog/index.html index 203bfc873e..0b90d099a5 100644 --- a/docs/changelog/index.html +++ b/docs/changelog/index.html @@ -226,6 +226,7 @@
  • Desktop application
  • Mobile applications
  • Terminal application
  • +
  • Web Clipper
  • diff --git a/docs/clipper/index.html b/docs/clipper/index.html index be9b45da5c..fb40d61cb4 100644 --- a/docs/clipper/index.html +++ b/docs/clipper/index.html @@ -226,6 +226,7 @@
  • Desktop application
  • Mobile applications
  • Terminal application
  • +
  • Web Clipper
  • diff --git a/docs/debugging/index.html b/docs/debugging/index.html index 28154394f4..f3771fc95f 100644 --- a/docs/debugging/index.html +++ b/docs/debugging/index.html @@ -226,6 +226,7 @@
  • Desktop application
  • Mobile applications
  • Terminal application
  • +
  • Web Clipper
  • diff --git a/docs/desktop/index.html b/docs/desktop/index.html index 573ccde2d2..88cf372e41 100644 --- a/docs/desktop/index.html +++ b/docs/desktop/index.html @@ -226,6 +226,7 @@
  • Desktop application
  • Mobile applications
  • Terminal application
  • +
  • Web Clipper
  • diff --git a/docs/donate/index.html b/docs/donate/index.html index 12ef35d5d7..23ccb51cc1 100644 --- a/docs/donate/index.html +++ b/docs/donate/index.html @@ -226,6 +226,7 @@
  • Desktop application
  • Mobile applications
  • Terminal application
  • +
  • Web Clipper
  • diff --git a/docs/e2ee/index.html b/docs/e2ee/index.html index 4c8e8338d9..552f15214b 100644 --- a/docs/e2ee/index.html +++ b/docs/e2ee/index.html @@ -226,6 +226,7 @@
  • Desktop application
  • Mobile applications
  • Terminal application
  • +
  • Web Clipper
  • diff --git a/docs/faq/index.html b/docs/faq/index.html index 3302b93dd4..f01e6ccdc3 100644 --- a/docs/faq/index.html +++ b/docs/faq/index.html @@ -226,6 +226,7 @@
  • Desktop application
  • Mobile applications
  • Terminal application
  • +
  • Web Clipper
  • diff --git a/docs/index.html b/docs/index.html index c7bbdb208e..11aad26fdf 100644 --- a/docs/index.html +++ b/docs/index.html @@ -226,6 +226,7 @@
  • Desktop application
  • Mobile applications
  • Terminal application
  • +
  • Web Clipper
  • @@ -251,8 +252,8 @@

    Donate Donate with Bitcoin Travis Build Status Appveyor Build Status

    Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format.

    Notes exported from Evernote via .enex files can be imported into Joplin, including the formatted content (which is converted to Markdown), resources (images, attachments, etc.) and complete metadata (geolocation, updated time, created time, etc.). Plain Markdown files can also be imported.

    -

    The notes can be synchronised with various cloud services including Nextcloud, Dropbox, OneDrive or the file system (for example with a network directory). When synchronising the notes, notebooks, tags and other metadata are saved to plain text files which can be easily inspected, backed up and moved around.

    -

    The UI of the terminal client is built on top of the great terminal-kit library, the desktop client using Electron, and the Android client front end is done using React Native.

    +

    The notes can be synchronised with various cloud services including Nextcloud, Dropbox, OneDrive, WebDAV or the file system (for example with a network directory). When synchronising the notes, notebooks, tags and other metadata are saved to plain text files which can be easily inspected, backed up and moved around.

    +

    The application is available for Windows, Linux, macOS, Android and iOS. A Web Clipper, to save web pages and screenshots from your browser, is also available for Firefox and Chrome.

    Installation

    @@ -332,9 +333,12 @@

    To start it, type joplin.

    For usage information, please refer to the full Joplin Terminal Application Documentation.

    +

    Web Clipper

    +

    The Web Clipper is a browser extension that allows you to save web pages and screenshots from your browser. For more information on how to install and use it, see the Web Clipper Help Page.

    Features

  • diff --git a/docs/spec/index.html b/docs/spec/index.html index c17a7d57c0..caf7340a64 100644 --- a/docs/spec/index.html +++ b/docs/spec/index.html @@ -226,6 +226,7 @@
  • Desktop application
  • Mobile applications
  • Terminal application
  • +
  • Web Clipper
  • diff --git a/docs/stats/index.html b/docs/stats/index.html index 06d32f5ba6..43674f3450 100644 --- a/docs/stats/index.html +++ b/docs/stats/index.html @@ -226,6 +226,7 @@
  • Desktop application
  • Mobile applications
  • Terminal application
  • +
  • Web Clipper
  • diff --git a/docs/terminal/index.html b/docs/terminal/index.html index e00f4a32cf..9f8017bb94 100644 --- a/docs/terminal/index.html +++ b/docs/terminal/index.html @@ -226,6 +226,7 @@
  • Desktop application
  • Mobile applications
  • Terminal application
  • +
  • Web Clipper