From 9961fb64bbdb6fd2c5dc2cfc69f0ee38eb93574d Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Thu, 29 Mar 2018 00:52:27 +0100 Subject: [PATCH] Updated website --- .../app/gui/EncryptionConfigScreen.jsx | 2 +- README.md | 4 +- .../components/screens/encryption-config.js | 2 +- Tools/build-website.js | 6 +- Tools/git-hooks/pre-commit-sh | 2 +- docs/changelog/index.html | 435 ++++++++++++++++ docs/{help => }/e2ee/index.html | 2 +- docs/index.html | 18 +- docs/{help => }/spec/index.html | 0 docs/stats/index.html | 474 ++++++++++++++++++ readme/e2ee.md | 2 +- 11 files changed, 929 insertions(+), 18 deletions(-) create mode 100644 docs/changelog/index.html rename docs/{help => }/e2ee/index.html (99%) rename docs/{help => }/spec/index.html (100%) create mode 100644 docs/stats/index.html diff --git a/ElectronClient/app/gui/EncryptionConfigScreen.jsx b/ElectronClient/app/gui/EncryptionConfigScreen.jsx index afd1273566..e88cd6fdbc 100644 --- a/ElectronClient/app/gui/EncryptionConfigScreen.jsx +++ b/ElectronClient/app/gui/EncryptionConfigScreen.jsx @@ -184,7 +184,7 @@ class EncryptionConfigScreenComponent extends React.Component {
{

- {_('For more information about End-To-End Encryption (E2EE) and advices on how to enable it please check the documentation')} {bridge().openExternal('https://joplin.cozic.net/help/e2ee')}} href="#">https://joplin.cozic.net/help/e2ee + {_('For more information about End-To-End Encryption (E2EE) and advices on how to enable it please check the documentation')} {bridge().openExternal('https://joplin.cozic.net/e2ee')}} href="#">https://joplin.cozic.net/e2ee

}

{_('Status')}

diff --git a/README.md b/README.md index cf56cca010..c9eb7da59b 100644 --- a/README.md +++ b/README.md @@ -150,9 +150,9 @@ On the **terminal application**, to initiate the synchronisation process, type ` # Encryption -Joplin supports end-to-end encryption (E2EE) on all the applications. E2EE is a system where only the owner of the notes, notebooks, tags or resources can read them. It prevents potential eavesdroppers - including telecom providers, internet providers, and even the developers of Joplin from being able to access the data. Please see the [End-To-End Encryption Tutorial](https://joplin.cozic.net/help/e2ee) for more information about this feature and how to enable it. +Joplin supports end-to-end encryption (E2EE) on all the applications. E2EE is a system where only the owner of the notes, notebooks, tags or resources can read them. It prevents potential eavesdroppers - including telecom providers, internet providers, and even the developers of Joplin from being able to access the data. Please see the [End-To-End Encryption Tutorial](https://joplin.cozic.net/e2ee) for more information about this feature and how to enable it. -For a more technical description, mostly relevant for development or to review the method being used, please see the [Encryption specification](https://joplin.cozic.net/help/spec). +For a more technical description, mostly relevant for development or to review the method being used, please see the [Encryption specification](https://joplin.cozic.net/spec). # Attachments / Resources diff --git a/ReactNativeClient/lib/components/screens/encryption-config.js b/ReactNativeClient/lib/components/screens/encryption-config.js index 4d86ff8669..2705eb81bd 100644 --- a/ReactNativeClient/lib/components/screens/encryption-config.js +++ b/ReactNativeClient/lib/components/screens/encryption-config.js @@ -224,7 +224,7 @@ class EncryptionConfigScreenComponent extends BaseScreenComponent { { {_('For more information about End-To-End Encryption (E2EE) and advices on how to enable it please check the documentation:')} - { Linking.openURL('https://joplin.cozic.net/help/e2ee') }}>https://joplin.cozic.net/help/e2ee + { Linking.openURL('https://joplin.cozic.net/e2ee') }}>https://joplin.cozic.net/e2ee } {_('Status')} diff --git a/Tools/build-website.js b/Tools/build-website.js index 35c8c17201..b1070b30ad 100644 --- a/Tools/build-website.js +++ b/Tools/build-website.js @@ -317,8 +317,10 @@ async function main() { selectedDesktop: 'selected', }); - renderFileToHtml(rootDir + '/readme/e2ee.md', rootDir + '/docs/help/e2ee/index.html', {}); - renderFileToHtml(rootDir + '/readme/spec.md', rootDir + '/docs/help/spec/index.html', {}); + renderFileToHtml(rootDir + '/readme/e2ee.md', rootDir + '/docs/e2ee/index.html', {}); + renderFileToHtml(rootDir + '/readme/spec.md', rootDir + '/docs/spec/index.html', {}); + renderFileToHtml(rootDir + '/readme/stats.md', rootDir + '/docs/stats/index.html', {}); + renderFileToHtml(rootDir + '/readme/changelog.md', rootDir + '/docs/changelog/index.html', {}); renderFileToHtml(rootDir + '/readme/donate.md', rootDir + '/docs/donate/index.html', {}); } diff --git a/Tools/git-hooks/pre-commit-sh b/Tools/git-hooks/pre-commit-sh index c065f7b7e8..ac1bf72842 100644 --- a/Tools/git-hooks/pre-commit-sh +++ b/Tools/git-hooks/pre-commit-sh @@ -5,7 +5,7 @@ ROOT_DIR="$PWD" # If any README file has been changed, update the website -git status -s | grep ' README\| build-website.js' > /dev/null 2>&1 +git status -s | grep ' README\| readme\| build-website.js' > /dev/null 2>&1 readmeStatus=$? if [ $readmeStatus -eq 0 ]; then node "$ROOT_DIR/Tools/build-website.js" diff --git a/docs/changelog/index.html b/docs/changelog/index.html new file mode 100644 index 0000000000..f927090b5c --- /dev/null +++ b/docs/changelog/index.html @@ -0,0 +1,435 @@ + + + + Joplin - an open source note taking and to-do application with synchronisation capabilities + + + + + + + + + + + + +
+ +
+ +

oplin

+

An open source note taking and to-do application with synchronisation capabilities.

+
+ +
+
+
    +
    • +
    • +
    • +
+
+ + + +
+
+
+ +
+

changelog

+

v1.0.81 - 2018-03-28T08:13:58Z

+
    +
  • New: Dropbox synchronisation
    • +
  • New: Czech translation
    • +
  • Fixes #318: Display full links in editor
    • +
  • Resolves #329: Add link to E2EE doc
    • +
+

v1.0.79 - 2018-03-23T18:00:11Z

+
    +
  • New: Resolves #144, Resolves #311: Highlight search results and search in real time. Associated Ctrl+F with searching.
    • +
  • New: Resolves #73: Show modified date next to note in editor
    • +
  • New: Danish translation
    • +
  • Improved: Fixes #318, Fixes #317: ENEX: Improved handling and rendering of plain text links. Improved detection and import of resources. Improved import of tables.
    • +
  • Updated: Resolves #307: Use blue colour for sidebar, to be consistent with mobile app and logo
    • +
  • Updated: Translations
    • +
+

v1.0.78 - 2018-03-17T15:27:18Z

+
    +
  • Improved: Handle deletion of resources that are not linked to any note
    • +
+

v1.0.77 - 2018-03-16T15:12:35Z

+

Note: This fixes an invalid database upgrade in the previous version.

+
    +
  • New: Resolves #237: Export to PDF and print option
    • +
  • New: Resolves #154: No longer used resources are automatically deleted after approximately 24h
    • +
  • Improved: Resolves #298: Removed extraneous first characters from auto-title
    • +
  • Improved: Made WebDAV options dynamics so that changing username or password doesn't require restarting the app
    • +
  • Fix: Fixes #291: Crash with empty backtick
    • +
  • Fix: Fixes #292: Improved auto-update feature and fixed incorrect notifications
    • +
  • Fix: Signed executables on Windows
    • +
  • Updated Russian, German, Portuguese, Spanish and French translations. Many thanks to the translators!
    • +
+

v1.0.72 - 2018-03-14T09:44:35Z

+
    +
  • New: Allow exporting only selected notes or notebook
    • +
  • New: Resolves #266: Allow setting text editor font family
    • +
  • New: Display icon next to resources and allow downloading them from Electron client
    • +
  • Improved: Optimised sync when dealing with many items, in particular when using Nextcloud or WebDAV
    • +
  • Improved: Display last sync error unless it's a timeout or network error
    • +
  • Improved: Fixes #268: Improve error message for invalid flags
    • +
  • Fix: Fixes #271: Sort by created time was not respected
    • +
+

v1.0.70 - 2018-02-28T20:04:30Z

+
    +
  • New: Resolves #97: Export to JEX format or RAW format
    • +
  • New: Import JEX and RAW format
    • +
  • New: Resolves #52: Import Markdown files or directory
    • +
  • New: Allow sorting notes by various fields
    • +
  • New: Resolves #243: Added black and white tray icon for macOS
    • +
  • Fix: #247: Unreadable error messages when checking for updates
    • +
  • Fix: Fixed sync interval sorting order
    • +
  • Fix: #256: Check that no other instance of Joplin is running before launching a new one
    • +
+

v1.0.67 - 2018-02-19T22:51:08Z

+
    +
  • Fixed: #217: Display a message when the note has no content and only the note viewer is visible
    • +
  • Fixed: #240: Tags should be handled in a case-insensitive way
    • +
  • Fixed: #241: Ignore response for certain WebDAV calls to improve compatibility with some services.
    • +
  • Updated: French and Español translation
    • +
+

v1.0.66 - 2018-02-18T23:09:09Z

+
    +
  • Fixed: Local items were no longer being deleted via sync.
    • +
  • Improved: More debug information when WebDAV sync target does not work.
    • +
  • Improved: Compatibility with some WebDAV services (Seafile in particular)
    • +
+

v1.0.65 - 2018-02-17T20:02:25Z

+
    +
  • New: Added several keyboard shortcuts
    • +
  • New: Convert new lines in tables to BR tags, and added support for HTML tags in Markdown viewers
    • +
  • Fixed: Confirmation message boxes, and release notes text
    • +
  • Fixed: Issue with items not being decrypted immediately when they are created due to a sync conflict.
    • +
  • Updated: Translations
    • +
+

v1.0.64 - 2018-02-16T00:58:20Z

+

Still more fixes and improvements to get v1 as stable as possible before adding new features.

+

IMPORTANT: If you use Nextcloud it is recommended to sync all your notes before installing this release (see below).

+
    +
  • Fixed: Nextcloud sync target ID (which was incorrectly set to WebDAV sync ID). As a result items that have been created since this bug will be re-synced with Nextcloud. This sync will not duplicate or delete any item but is necessary to preserve data integrity. IF YOU HAVE NOTES IN CONFLICT AFTER SYNC: Close the app completely and restart it to make sure all the lists are visually up-to-date. The notes in conflict most likely can be ignored - they are just duplicate of the real ones. To be safe, check the content but most likely they can simply be deleted.
    • +
  • Improved: Provide Content-Length header for WebDAV for better compatibility with more servers
    • +
  • Fixed: Allow copy and paste from config and encryption screen on macOS
    • +
  • Fixed: #201, #216: Make sure only one update check can run at a time, and improved modal dialog boxes
    • +
+

v1.0.63 - 2018-02-14T19:40:36Z

+
    +
  • Improved the way settings are changed. Should also fixed issue with sync context being accidentally broken.
    • +
  • Improved WebDAV driver compatibility with some services (eg. Seafile)
    • +
+

v1.0.62 - 2018-02-12T20:19:58Z

+
    +
  • Fixes #205: Importing Evernote notes while on import page re-imports previous import
    • +
  • Fixes #209: Items with non-ASCII characters end up truncated on Nextcloud
    • +
  • Added Basque translation, fixed issue with handling invalid translations. Updated translation FR.
    • +
+

v0.10.61 - 2018-02-08T18:27:39Z

+
    +
  • New: Display message when creating new note or to-do so that it doesn't look like the previous note content got deleted.
    • +
  • New: Also support $ as delimiter for Katex expressions
    • +
  • New: Added sync config check to config screens
    • +
  • New: Allowing opening and saving resource images
    • +
  • New: Toolbar button to set tags
    • +
  • Update: Improved request repeating mechanism
    • +
  • Fix: Make sure alarms and resources are attached to right note when creating new note
    • +
  • Fix: Use mutex when saving model to avoid race conditions when decrypting and syncing at the same time
    • +
+

v0.10.60 - 2018-02-06T13:09:56Z

+
    +
  • New: WebDAV synchronisation target
    • +
  • New: Support for math typesetting Katex
    • +
  • New: Tray icon for Windows and macOS
    • +
  • Fixed: Don't allow adding notes to conflict notebook
    • +
  • Updated: Russian translation
    • +
  • Updated: French translation
    • +
  • New: List missing master keys in encryption screen
    • +
  • Fixed: Attaching images in Linux was no longer working
    • +
  • Fixed crash in macOS
    • +
+

v0.10.54 - 2018-01-31T20:21:30Z

+
    +
  • Optimised Nextcloud functionality so that it is faster and consumes less resources
    • +
  • Fixed Nextcloud sync issue when processing many items.
    • +
  • Fixed: Handle case where file is left half-uploaded on Nextcloud instance (possibly an ocloud.de issue only)
    • +
  • Fixed: Allow decryption of other items to continue even if an item cannot be decrypted
    • +
  • Add Content-Size header for WebDAV, which is required by some services
    • +
  • Fixed auto-title when title is manually entered first
    • +
  • Improved auto-update process to avoid random crashes
    • +
  • New: Allow focusing either title or body when creating a new note or to-do
    • +
  • Fixed crash when having invalid UTF-8 string in text editor
    • +
+

v0.10.52 - 2018-01-31T19:25:18Z

+
    +
  • Optimised Nextcloud functionality so that it is faster and consumes less resources
    • +
  • Fixed Nextcloud sync issue when processing many items.
    • +
  • Fixed: Handle case where file is left half-uploaded on Nextcloud instance (possibly an ocloud.de issue only)
    • +
  • Fixed: Allow decryption of other items to continue even if an item cannot be decrypted
    • +
  • Add Content-Size header for WebDAV, which is required by some services
    • +
  • Fixed auto-title when title is manually entered first
    • +
  • Improved auto-update process to avoid random crashes
    • +
  • New: Allow focusing either title or body when creating a new note or to-do
    • +
+

v0.10.51 - 2018-01-28T18:47:02Z

+
    +
  • Added Nextcloud support (Beta)
    • +
  • Upgraded Electron to 1.7.11 to fix security vulnerability
    • +
  • Fixed checkbox issue in config screen
    • +
  • Fixed detection of encrypted item
    • +
+

v0.10.48 - 2018-01-23T11:19:51Z

+
    +
  • Improved and optimised file system sync target when many items are present.
    • +
  • Fixes #155: Caret alignment issue with Russian text
    • +
  • Dutch translation (Thanks @tcassaert)
    • +
  • Removed certain log statements so that sensitive info doesn't end up in logs
    • +
  • Fix: Handle case where resource blob is missing during sync
    • +
+

v0.10.47 - 2018-01-16T17:27:17Z

+
    +
  • Improved the way new note are created, and automatically add a title. Made saving and loading notes more reliable.
    • +
  • Fix: race condition when a note is being uploaded while it's being modified in the text editor
    • +
  • Fixes #129: Tags are case insensitive
    • +
  • Schedule sync only after 30 seconds
    • +
  • Schedule sync after enabling or disabling encryption
    • +
  • Display sync items being fetched
    • +
  • Fixed logic of what note is used when right-clicking one or more notes
    • +
  • Fix: Don't scroll back to top when note is reloaded via sync
    • +
  • Display URL for links
    • +
  • Fix: Move prompt to top to avoid issue with date picker being hidden
    • +
  • Fixed table font size and family
    • +
  • Fixed logic to save, and make sure scheduled save always happen even when changing note
    • +
  • Fixed OneDrive sync when resync is requested
    • +
  • Fixes #85: Don't record deleted_items entries for folders deleted via sync
    • +
  • Updated translations
    • +
+

v0.10.43 - 2018-01-08T10:12:10Z

+
    +
  • Fixed saving and loading of settings, which could affect synchronisation
    • +
+

v0.10.41 - 2018-01-05T20:38:12Z

+
    +
  • Added End-To-End Encryption support (E2EE)
    • +
+

v0.10.40 - 2018-01-02T23:16:57Z

+
    +
  • Fixed undo in text editor
    • +
  • Updated German translation
    • +
  • Added Russian, Japanese and Chinese translations
    • +
+

v0.10.39 - 2017-12-11T21:19:44Z

+
    +
  • Fixes #55: Added support for HTML tags found in ENEX files: colgroup, col, ins, kbd, address, caption, var, area, map
    • +
  • Resolve #7: Show storage location in Options screen
    • +
  • Fixes #84: Fields losing focus in Config screen
    • +
  • Fixes #86: App icon missing on Linux
    • +
  • Fixes #87: Show warningn when deleting notebook that contains notes.
    • +
  • Fixes #3: Paths with '.' would cause JSX compilation to fail
    • +
+

v0.10.38 - 2017-12-08T10:12:06Z

+
    +
  • Dialog to export sync status
    • +
  • Enabled support for filesystem sync
    • +
+ + + + + diff --git a/docs/help/e2ee/index.html b/docs/e2ee/index.html similarity index 99% rename from docs/help/e2ee/index.html rename to docs/e2ee/index.html index 666bd7a836..8809993987 100644 --- a/docs/help/e2ee/index.html +++ b/docs/e2ee/index.html @@ -226,7 +226,7 @@

Disabling E2EE

Follow the same procedure as above but instead disable E2EE on each device one by one. Again it might be simpler to do it one device at a time and to wait every time for the synchronisation to complete.

Technical specification

-

For a more technical description, mostly relevant for development or to review the method being used, please see the Encryption specification.

+

For a more technical description, mostly relevant for development or to review the method being used, please see the Encryption specification.

+ + + + + +
+ +
+ +

oplin

+

An open source note taking and to-do application with synchronisation capabilities.

+
+ +
+
+
    +
    • +
    • +
    • +
+
+ + + +
+
+
+ +
+

statistics

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameValue
Total Windows downloads28567
Total macOs downloads16422
Total Linux downloads10914
Windows %51%
macOS %29%
Linux %20%
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
VersionDateWindowsmacOSLinuxTotal
v1.0.812018-03-28T08:13:58Z37161164
v1.0.792018-03-23T18:00:11Z8774863401703
v1.0.782018-03-17T15:27:18Z12858108372932
v1.0.772018-03-16T15:12:35Z1608121262
v1.0.722018-03-14T09:44:35Z39222728647
v1.0.702018-02-28T20:04:30Z1829101012104049
v1.0.672018-02-19T22:51:08Z14605742034
v1.0.662018-02-18T23:09:09Z31110370484
v1.0.652018-02-17T20:02:25Z183100112395
v1.0.642018-02-16T00:58:20Z106552310952683
v1.0.632018-02-14T19:40:36Z28313980502
v1.0.622018-02-12T20:19:58Z5382683441150
v0.10.612018-02-08T18:27:39Z9545989382490
v0.10.602018-02-06T13:09:56Z7094885371734
v0.10.542018-01-31T20:21:30Z18048253042933
v0.10.522018-01-31T19:25:18Z308442
v0.10.512018-01-28T18:47:02Z13089753162599
v0.10.482018-01-23T11:19:51Z19541122143090
v0.10.472018-01-16T17:27:17Z1213637571907
v0.10.432018-01-08T10:12:10Z3418171511936326
v0.10.412018-01-05T20:38:12Z10199152232157
v0.10.402018-01-02T23:16:57Z157811413223041
v0.10.392017-12-11T21:19:44Z51263060256010746
v0.10.382017-12-08T10:12:06Z10346012981933
+ + + + + diff --git a/readme/e2ee.md b/readme/e2ee.md index c963d23d19..c4e8748d2c 100644 --- a/readme/e2ee.md +++ b/readme/e2ee.md @@ -27,4 +27,4 @@ Follow the same procedure as above but instead disable E2EE on each device one b # Technical specification -For a more technical description, mostly relevant for development or to review the method being used, please see the [Encryption specification](https://joplin.cozic.net/help/spec). \ No newline at end of file +For a more technical description, mostly relevant for development or to review the method being used, please see the [Encryption specification](https://joplin.cozic.net/spec). \ No newline at end of file