Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,637 Commits
244 Branches
1,281 Tags
606 MiB
Commit Graph

145 Commits (5395d57df87ea3d355836ae2c0c1d259115a7f1a)

Author SHA1 Message Date
Laurent Cozic 688edd4b32 Moved the Joplin renderer back to the main repository to make development easier 2020-01-30 21:05:23 +00:00
Laurent Cozic c61e4cae4d CLI v1.0.153 2020-01-24 23:17:46 +00:00
Laurent Cozic be210233be Desktop, Mobile: Fixes #2339, Fixes #2343, Fixes #2345: Fixed issues with Katex and MultiMd table plugin 2020-01-22 17:16:37 +00:00
Laurent Cozic fc61b474cd Clipper: Fixes #2252: Some pages that contain tables with only one cell would trigger an error 2020-01-08 18:35:41 +00:00
Devon Zuegel 4a2d9bb028 CLI: Upgrade sqlite (#2248) 
* Upgrade sqlite

* Add info about sqlite installation to docs
 2020-01-06 22:24:38 +00:00
Laurent Cozic 589f0803e6 Fixed Electron upgrade regressions 2019-12-30 15:10:43 +01:00
Laurent Cozic 2a63ecef2a
All: Extract note renderer to separate package (WIP) (#2206) 
* Started updating to use external renderer package

* Added way to build renderer assets

* Done mobile compatilibty

* Upgrade joplin-renderer

* Added joplin-renderer package
 2019-12-29 18:58:40 +01:00
Laurent Cozic 03522b48a5 CliClient: Fixed regression following recent PR 2019-12-14 10:55:42 +00:00
Laurent Cozic 3da32f007e Clipper: Fixes #2015: Fix issue with certain PRE code blocks 2019-11-07 20:06:33 +00:00
Christian Moritz 17584b52af CLI: update sharp tp v0.23.2 (for node 13 compatibility) (#2063) 2019-11-06 09:52:48 +00:00
Laurent Cozic cc51ba4f90 Tools: Upgraded jasmine and made it easier to filter tests 2019-11-02 10:19:24 +00:00
Laurent Cozic 90bc84c010 Clipper: Fixed: Some tables were imported with a duplicate header 2019-10-12 19:36:06 +02:00
Laurent Cozic 7f1e684dab Updated package to fix tests 2019-10-12 10:47:16 +02:00
Laurent Cozic e92741edd6 CLI v1.0.149 2019-09-27 22:19:13 +01:00
Laurent Cozic 58e299383d CLI v1.0.148 2019-09-27 19:43:22 +01:00
Laurent Cozic 391f7d22a3 CLI v1.0.147 2019-09-25 22:27:58 +01:00
Devon Zuegel 172d925f0f Desktop: Fix import interop service (#1887) 
* Revert "Revert "Desktop: Add ENEX to HTML export (#1795)""

This reverts commit 50b66cceca.

* Revert "Revert "Desktop, Cli: Fixed interop service so that it still allow auto-detecting importer based on format (required for Cli and for test units)""

This reverts commit c7c57ab2a5.

* Fix the .md importer

* Add comment re future refactor

* Rm importerClass for .md importer

* Fix EnexToMd module name
 2019-09-23 22:18:30 +01:00
Laurent Cozic 50b66cceca Revert "Desktop: Add ENEX to HTML export (#1795)" 
This reverts commit 2f14832c34.

Reverting PR #1795 due to broken MD import and other issues
 2019-09-20 22:18:09 +01:00
Devon Zuegel 2f14832c34 Desktop: Add ENEX to HTML export (#1795) 
* Add `escape` to go back from Dropbox Login screen

* Add .vscode/ to .gitignore

* Remove call to enexXmlToMd

* The 2 enex importers have distinct functionality!

* Add tmp #deleteAllNotebooks

* checkbox state still not persisting

* images now fixed, but checkboxes still broken

* Figured out that #ipcProxySendToHost is important for handling checkbox

* cleanup closing br and en-todo tags + add notes

* Handle en-media, add NOTEs & TODOs, & format html

* Clean up some of the logging

* cleanHtml is a nice beautifier, but callback hell ensues...

* Rm #htmlFormat

* Recreating the xml actually seems to work

* Add test (not functional rn)

* Add test for checkboxes

* Add test for image en-media

* Separate tests into 2 function calls

* Clean up test

* Add `en-media-audio` test

* Add bad resource test

* Misc cleanup

* Rm SlateEditor files

* Misc cleanup

* Remove #deleteAllNotebooks button

* Add names to tests

* Extract resourceUtils

* Rm DropboxLoginScreen esc behavior, part of another PR

* Misc cleanup

* Improve audioElement, add attachment import support

* Misc cleanup

* Add svg test for enex_to_html

* Clean up test

* Set markup_language to MARKUP_LANGUAGE_HTML to tell renderer that the content is only HTML

* Rename to newModuleByFormat_ for clarity

* Add comment to clarify newModuleFromPath_
 2019-09-17 21:19:32 +01:00
Laurent Cozic 1b2767167d Cli: Upgrade joplin-turndown-plugin-gfm to fix import of certain Enex tables 2019-09-09 18:35:22 +01:00
Laurent Cozic bb0bf46f81 CLI v1.0.146 2019-09-08 20:12:49 +01:00
Laurent Cozic 05e0a2c29d CLI v1.0.145 2019-09-08 17:24:00 +01:00
Laurent Cozic 78e0efb95f Trying CLI release 2019-09-08 17:19:22 +01:00
Laurent Cozic 3d6c932e1b
Cli: Added headless server command (Beta) (#1860) 
* Trying to implement headless server

* Cli: Cleaned up and completed server command so that it is usable. Added warnings as it is advanced usage only at this point.

* Restored welcome assets
 2019-09-08 17:16:45 +01:00
Laurent Cozic 1bf2bec805 CLI v1.0.141 2019-07-28 22:54:45 +02:00
Laurent Cozic 3a41ac9be0 CLI: Upgraded packages to fix security issues 2019-07-28 22:54:29 +02:00
Laurent Cozic 36168a9a5d Use regex instead of jsdom for compability with mobile app 2019-07-21 00:18:51 +01:00
Laurent Cozic 14fc73b388 Use markupToHtml everywhere 2019-07-19 17:48:38 +01:00
Laurent Cozic a0dd0702fb Clipper: Adding support for clipping page as HTML 2019-07-14 16:00:02 +01:00
Laurent Cozic a1e3260309 Clipper: Resolves #1160: Allow importing MathJax formulas, in particular from StackExchange 2019-07-13 19:17:28 +01:00
Laurent Cozic 21897a3cd4 Clipper: Resolves #1669: Handle special case of code block used on Microsoft website 2019-06-22 18:57:41 +01:00
Laurent Cozic 86136e0c6c Clipper: Fixes #1622: Import named anchors from clipped pages 2019-06-13 00:26:19 +01:00
Laurent Cozic 0b24433db3 CLI v1.0.140 2019-06-10 08:56:11 +01:00
Laurent Cozic a72ab67473 CLI v1.0.139 2019-06-05 18:09:10 +01:00
Laurent Cozic 6bcbedd6a4 CLI v1.0.137 2019-05-19 12:05:02 +01:00
Laurent Cozic 1924ea062c CLI v1.0.136 2019-05-19 11:20:17 +01:00
Laurent Cozic 5c069c38f5 CLI v1.0.135 2019-05-13 23:59:27 +01:00
Laurent Cozic 451b9c0ae9 CLI v1.0.133 2019-05-13 23:55:53 +01:00
Laurent Cozic e705e6e990 CLI v1.0.129 2019-05-13 23:18:57 +01:00
Laurent Cozic 9de7c15e93 CLI v1.0.128 2019-05-13 22:53:08 +01:00
Laurent Cozic 82b6dd23a7 CLI v1.0.127 2019-05-13 10:11:10 +01:00
Laurent Cozic a82f8c7dd0 CLI v1.0.126 2019-05-13 00:42:16 +01:00
Laurent Cozic e1b7b64e1b All: Make sure resource filesize is set in all cases 2019-05-12 11:41:07 +01:00
Laurent Cozic 7628506926 Merge branch 'master' of github.com:laurent22/joplin 2019-05-11 11:13:23 +01:00
Laurent Cozic dccd489fcc Clipper: Fix: Fix handling of tables with empty headers 2019-05-11 09:23:31 +01:00
Don Bowman 6e36ca32b4 CLI: Fix: Bump sqlite3 to v4.0.7 for node12 support (#1508) 2019-05-10 01:18:04 +01:00
Laurent Cozic 08af9de190
All: Resolves #712: New: Support for note history (#1415) 
* Started revisions support

* More rev changes

* More rev changes

* More revs changes

* Fixed deletion algorithm

* More tests and moved updated time to separate field

* Display info when restoring note

* Better handling of existing notes

* wip

* Further improvements and fixed tests

* Better handling of changes created via sync

* Enable chokidar again

* Testing special case

* Further improved logic to handle notes that existed before the revision service

* Added tests

* Better handling of encrypted revisions

* Improved handling of deleted note revisions by moving logic to collectRevision

* Improved handling of old notes by moving logic to collectRevision()

* Handle case when deleting revisions while one is still encrypted

* UI tweaks

* Added revision service to mobile app

* Fixed config screens on mobile and desktop

* Enabled revisions on CLI app
 2019-05-06 21:35:29 +01:00
Christian Moritz 788dc42684 CLI: Improved: Update sharp (for node 12 compatibility) (#1471) 2019-04-30 17:32:51 +01:00
Laurent Cozic 9419e3af9c CLI v1.0.125 2019-04-29 18:36:32 +01:00
Laurent Cozic 20bb1238c5 CLI v1.0.124 2019-03-11 19:37:52 +00:00