self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-18 09:35:20 +02:00
Code Issues Releases Activity
4,789 Commits 244 Branches 1,266 Tags 536 MiB
433fa21069
Commit Graph

364 Commits

Author SHA1 Message Date
Laurent Cozic
61dbdd5f7c Update translations 2018-11-13 23:17:56 +00:00
Laurent Cozic
899219abd2 Merge branch 'master' of github.com:laurent22/joplin 2018-11-13 22:38:32 +00:00
Laurent Cozic
06091933e1 All: Moved resource app-specific state to different table 2018-11-13 00:45:08 +00:00
Ben Fisher
0eb18d206d Patch to implement feature, exporting notes to JSON (#912, issues/912). (#927) 
* Patch to implement feature, exporting notes to JSON (#912, issues/912).

* Revising based on feedback

* Directly calling JSON.stringify on the item
 2018-11-11 20:17:43 +00:00
Laurent Cozic
5ff8808f69 API: Allow setting the ID of newly created notes. 2018-11-08 01:14:13 +00:00
Ben Fisher
251f1bba55 Show note title in pdf export (#890) (#937) 
* Show note title in pdf export (#890)

An example of a possible approach, to temporarily change the html in the webview to show the note title. Works, but there may be a more elegant fix.

* Show title in pdf export

Revising based on feedback
Also, a couple changes to tests so that they pass in Windows.
 2018-11-07 23:35:14 +00:00
Laurent Cozic
e41896d6f3 All: Resolves #918: Skip properties that are on sync target but not handled by local client 2018-10-31 00:35:57 +00:00
Laurent Cozic
990591cc80 Minor improvments 2018-10-30 00:17:50 +00:00
Laurent Cozic
e209189faa All: Added resource test units 2018-10-11 17:18:24 +01:00
Laurent Cozic
2f62897fb6 All: Improved resource side loading 2018-10-08 19:11:53 +01:00
Laurent Cozic
dbdd602f50 All: Created ResourceFetcher class to handle resource downloads 2018-10-08 07:36:45 +01:00
Laurent Cozic
f6c5620682 Electron: Resolves #751: Allow switching between todo and note when multiple notes are selected 2018-10-04 18:34:30 +01:00
Laurent Cozic
720927f488 All: Fixes #832: Enex import: Don't add extra line breaks at the beginning of list item when it contains a block element 2018-10-01 20:55:24 +01:00
Laurent Cozic
0cd7ebf9d3 Electron: Fixes resources being incorrectly auto-deleted when inside an IMG tag 2018-09-30 19:24:02 +01:00
Laurent Cozic
f87d1f11b0 API: Allow downloading a resource data 2018-09-30 10:15:46 +01:00
Laurent Cozic
eb4aa2c026 API: Added more calls 2018-09-29 12:54:44 +01:00
Laurent Cozic
a1ad6c9712 API: Added more API calls 2018-09-28 19:24:57 +01:00
Laurent Cozic
ef711af5b5 Api: Added method to get notes 2018-09-27 18:35:10 +00:00
Laurent Cozic
8a619e4b8b All: Refactored REST API to make it testable and to allow further extension 2018-09-27 09:14:05 +01:00
Laurent Cozic
bc09d2c640 Clipper: Fixes #817: Added support for PICTURE tags, which will fix issues with certain pages from which images were not being imported 2018-09-25 21:19:54 +01:00
Laurent Cozic
f82dfde6f4 Clipper: Fixed importing certain images with sources that contain brackets 2018-09-24 20:15:23 +01:00
Laurent Cozic
32c81ad8c2 All: Fixes #657: Disallow giving name of existing tag to another tag 2018-09-06 18:33:21 +01:00
Laurent Cozic
d5d0732bf3 Clipper: Upgrade joplin-turndonw to fix import of literal HTML code 2018-06-30 16:12:01 +01:00
Laurent Cozic
f5a72ffbaf All: Fixes #593: Resource should not be auto-deleted if they've never been linked to any note 2018-06-17 16:59:06 +01:00
Laurent Cozic
ab9675544c All: Fixes #597: Also import sub-notebooks when importing JEX data 2018-06-10 19:15:40 +01:00
Laurent Cozic
1127eb6e09 Clipper: Fixes #573: Better handling of certain code blocks 2018-06-09 20:00:26 +01:00
Laurent Cozic
f81dce3321 Merge branch 'clipper' 2018-05-25 13:31:15 +01:00
Laurent Cozic
9db9d98419 Clipper: Skip style section when importing HTML 2018-05-24 13:32:43 +01:00
Laurent Cozic
f79d7b9626 Clipper: Set source URL and fixed issues with tables and urls 2018-05-24 12:44:13 +01:00
Laurent Cozic
a8da469523 Clipper: Improved download of images and conversion to resources 2018-05-23 14:25:59 +01:00
Laurent Cozic
3c5eb99c59 Clipper: Download images and convert them to resources 2018-05-23 12:14:38 +01:00
Laurent Cozic
7cf267254f Clipper: Improved Html To Md conversion 2018-05-22 00:54:23 +01:00
Laurent Cozic
acb90935c7 Fixed tests 2018-05-20 13:33:26 +01:00
Laurent Cozic
7ed9c2770c Clipper: Improved UI and integration with main app 2018-05-20 10:19:59 +01:00
Laurent Cozic
795fd8b58c HtmlToMD: Finish restoring codes that could be saved, and scoped tests to ENEX-like data 2018-05-16 10:56:30 +01:00
Laurent Cozic
a2b1181f7c HtmlToMd: Fixed handling of inline tags 2018-05-15 13:26:53 +01:00
Laurent Cozic
8cce2f17d5 HtmlToMd: Improved import of inline and code block 2018-05-15 13:13:55 +01:00
Laurent Cozic
658b911513 HtmlToMd: Minor tweak on LI tag 2018-05-15 09:52:56 +01:00
Laurent Cozic
3c95979d94 HtmlToMd: Fix LI tags that contains blocks 2018-05-14 23:13:17 +01:00
Laurent Cozic
2e32211a28 HtmlToMd: Fix conversion of tables 2018-05-14 23:04:40 +01:00
Laurent Cozic
ba2874173d HtmlToMd: Added more test cases and fixed some issues 2018-05-14 19:48:52 +01:00
Laurent Cozic
ba9598682c HtmlToMd: Fixed various tests 2018-05-14 18:46:04 +01:00
Laurent Cozic
2e2b35dfeb Fixed import of tables and added tests 2018-05-14 11:36:02 +01:00
Laurent Cozic
a37005446a Fixed tests 2018-05-14 11:23:18 +01:00
Laurent Cozic
394f2df664 All: More robust HTML to MD conversion and started adding test units for it 2018-05-12 11:48:39 +01:00
Laurent Cozic
b9118a90be All: Resolves #443: Various optimisations to make dealing with large notes easier and make Katex re-rendering faster 2018-05-10 12:02:39 +01:00
Laurent Cozic
567596643c Electron: Handle drag and dropping notebooks to change the parent 2018-05-09 09:53:47 +01:00
Laurent Cozic
a6a351e68d Electron: Export/Import links to notes 2018-05-03 13:11:45 +01:00
Laurent Cozic
4f5e7367d0 Minor tweals 2018-03-27 17:48:55 +01:00
Laurent Cozic
0f4324c2f8 All: Added backend for Dropbox support 2018-03-24 19:35:10 +00:00
Laurent Cozic
544f93bf22 All: Handle deletion of resources that are not linked to any note 2018-03-16 17:39:44 +00:00
Laurent Cozic
c1bb51c12b All: Finished service to clean up resources 2018-03-15 18:08:46 +00:00
Laurent Cozic
945018b698 All: Allow deleting and syncing deleted resources 2018-03-15 17:46:54 +00:00
Laurent Cozic
3370b57134 Finished removing prettier 2018-03-10 15:34:29 +00:00
Laurent Cozic
55c5ddedf4 Revert "Applied prettier to code base" 
This reverts commit c4f19465a6.
 2018-03-09 20:59:12 +00:00
Laurent Cozic
4df5f668dc All: Improved sync when dealing with many items, in particular when using Nextcloud 2018-03-09 19:07:38 +00:00
Laurent Cozic
c4f19465a6 Applied prettier to code base 2018-03-09 17:49:35 +00:00
Laurent Cozic
a078947d6d Allow importing and exporting single notes and notebooks 2018-03-01 18:35:17 +00:00
Laurent Cozic
8f2e5faff3 Support importing JEX and raw data 2018-02-25 17:01:16 +00:00
Laurent Cozic
c46d123503 All: Fixed: Local items were no longer being deleted via sync. Also fixed Nextcloud sync target. 2018-02-18 21:52:07 +00:00
Laurent Cozic
3a4bbd571e All: Provide Content-Length header for WebDAV for better compatibility with more servers 2018-02-15 18:33:08 +00:00
Laurent Cozic
3551c26e28 Fixed race condition when testing with memory driver and fixed encoding issue 2018-02-15 17:12:09 +00:00
Laurent Cozic
7841421c0d All: Fixes #209: Items with non-ASCII characters end up truncated on Nextcloud 2018-02-12 18:15:22 +00:00
Laurent Cozic
fa5f418c22 All: Added sync config check to config screens 2018-02-06 18:59:36 +00:00
Laurent Cozic
a4106436c4 Fixed delta function when processing many items 2018-01-30 21:10:54 +00:00
Laurent Cozic
5cb5ccc781 All: Optimised Nextcloud sync delta functionality 2018-01-29 20:51:14 +00:00
Laurent Cozic
2780c38c45 Fixed WebDAV error handling 2018-01-28 17:36:11 +00:00
Laurent Cozic
5a9e0bfc26 Handle password text input in mobile and desktop 2018-01-25 22:44:09 +00:00
Laurent Cozic
8f3fdb3afe Tweaks to make sure Nextcloud driver passes all test units 2018-01-25 21:15:58 +00:00
Laurent Cozic
1bfeed377a All: Optimised file sync logic so that it doesn't fetch the content of 
all the items on each sync. Also limit the number of items in a batch
to 1000
 2018-01-21 18:54:47 +00:00
Laurent Cozic
86eee376bb All: Handle case where resource blob is missing during sync 2018-01-21 17:48:50 +00:00
Laurent Cozic
1a5c8d126d All: Refactored filesystem sync driver to support mobile 2018-01-17 18:51:15 +00:00
Laurent Cozic
961b5bfd25 All: Fixes #85: Don't record deleted_items entries for folders deleted via sync 2018-01-15 18:10:14 +00:00
Laurent Cozic
78ce10ddf0 All: Fixed race condition when a note is being uploaded while it's being modified in the text editor 2018-01-08 20:09:01 +01:00
Laurent Cozic
685f541bb4 All: Fixed issue with local resource needlessly marked as encrypted 2017-12-04 19:15:14 +00:00
Laurent Cozic
71e877d369 All: Improved encryption and synchronisation 2018-01-02 20:17:14 +01:00
Laurent Cozic
7750b954fc All: Make sure existing resources are encrypted once E2EE has been enabled 2017-12-20 19:43:43 +00:00
Laurent Cozic
edbff5a26a All: Simplified encryption header 2017-12-20 19:14:27 +00:00
Laurent Cozic
18846c11ed All: Allow disabling encryption and added more test cases 2017-12-20 20:45:25 +01:00
Laurent Cozic
cc02c1d585 All: Simplified synchronisation of resources to simplify encryption, and implemented resource encryption 2017-12-19 19:01:29 +00:00
Laurent Cozic
3f4f154949 All: Refactored encryption/decryption method to use same algorithm for both file and string encryption 2017-12-18 20:54:03 +01:00
Laurent Cozic
4c0b472f67 All: Testing and better handling of E2EE initialisation 2017-12-17 20:51:45 +01:00
Laurent Cozic
df05d04dad All: Made model naming more consistent 2017-12-14 18:12:14 +00:00
Laurent Cozic
55266e5694 Fixed test units 2017-12-14 17:41:53 +00:00
Laurent Cozic
1008b1835b All: Handle tag encryption and started CLI and Electron encryption front-end 2017-12-14 00:23:32 +00:00
Laurent Cozic
bd20ecff78 All: Handle conflict for encrypted notes 2017-12-13 22:53:20 +00:00
Laurent Cozic
5951ed3f55 All: Support encrypting notes and notebooks 2017-12-13 18:57:40 +00:00
Laurent Cozic
4abe5d07c4 All: Handling of impossible-to-sync items (such as when they are over the size limit of the cloud provider) 2017-12-04 23:38:09 +00:00
Laurent Cozic
ab8c66a361 Updated tools 2017-12-04 18:16:14 +00:00
Laurent Cozic
0eac8b25e1 Deleted uneeded file 2017-12-03 23:06:02 +00:00
Laurent Cozic
9a40851c77 Electron, Mobile: Created alarm service and drivers 2017-11-27 22:50:46 +00:00
Laurent Cozic
a96b91cfef All: Removed sync target info out of setting class 2017-11-24 19:21:30 +00:00
Laurent Cozic
03251d4c40 All: renamed sync targets 2017-11-24 19:09:15 +00:00
Laurent Cozic
112609c5f1 All: Moving sync target logic to SyncTarget classes 2017-11-24 18:59:16 +00:00
Laurent Cozic
cc7cbc2ecf All: Started moving sync target logic under SyncTarget classes 2017-11-24 18:37:40 +00:00
Laurent Cozic
d7f3cfd778 All: Started moving sync glue logic to SyncTarget classes 2017-11-23 23:10:55 +00:00
Laurent Cozic
c5214b6c44 Core: Fixed potential out-of-sync issue if user cancels while in the middle of delta step 2017-11-21 18:17:50 +00:00
Laurent Cozic
be77f15ef7 Electron: Fixed issue with conflict folder and fixed sync tests 2017-11-12 18:57:59 +00:00
Laurent Cozic
a1cb172bc3 Removed babel 2017-11-03 18:39:08 +00:00
Laurent Cozic
8a78ee5df6 Changed export to module.exports 2017-11-03 00:13:17 +00:00
Laurent Cozic
7781fbad76 Changed import statements to require to reduce dependency to Babel 2017-11-03 00:09:34 +00:00
Laurent Cozic
742cff5598 Improve sync conflict handling when the changes between local and remote don't matter 2017-11-02 22:48:17 +00:00
Laurent Cozic
6e49aa45c0 Fixed synchronization issue 2017-10-21 19:07:56 +01:00
Laurent Cozic
f228b48365 Various tweaks 2017-07-28 17:57:01 +00:00
Laurent Cozic
971c3e12dc Started support for onedrive tests 2017-07-26 21:00:16 +01:00
Laurent Cozic
d5e39d153f Support for tags 2017-07-25 19:36:52 +01:00
Laurent Cozic
a983a9f108 Tidy settings and sync creation 2017-07-24 18:58:11 +00:00
Laurent Cozic
0f95e97d19 Refactored handling of multiple sync targets 2017-07-24 18:01:40 +00:00
Laurent Cozic
d05c62f69f Fixed note edition 2017-07-23 15:11:44 +01:00
Laurent Cozic
5ca8647d35 Sync fixes 2017-07-19 20:15:55 +01:00
Laurent Cozic
7aa21174f6 Handle delta api for filesystem 2017-07-18 23:14:20 +01:00
Laurent Cozic
0c30c1b70b Fixed delta API for sync 2017-07-18 21:03:07 +01:00
Laurent Cozic
980e4bded1 Various changes 2017-07-18 19:27:10 +00:00
Laurent Cozic
268dfec554 Fixed sync issue with conflicted notes 2017-07-17 23:22:22 +01:00
Laurent Cozic
c2ba2105ff Change folder from RN 2017-07-16 17:06:05 +01:00
Laurent Cozic
24f61177d1 Improved handling of multiple sync targets 2017-07-16 13:53:59 +01:00
Laurent Cozic
7859a1b990 Fixed synchronizer conflict handling when deleting folders 2017-07-13 18:47:31 +00:00
Laurent Cozic
216a6780cb Fixes for release apk 2017-07-07 18:49:07 +00:00
Laurent Cozic
8751aa1a34 Better error handling during sync setup 2017-07-06 23:15:31 +01:00
Laurent Cozic
40ed3216a3 Fixed RN sync issue 2017-07-06 20:01:12 +00:00
Laurent Cozic
9e3a2a894e Fixed imports 2017-07-05 23:29:03 +01:00
Laurent Cozic
e323a86563 Various changes 2017-07-04 19:12:30 +00:00
Laurent Cozic
62c56044b0 Better handling of db errors 2017-07-04 18:09:47 +00:00
Laurent Cozic
c5e71a668c Fixed syncing of tags 2017-07-03 23:08:14 +01:00
Laurent Cozic
c28323bfab Clean up 2017-07-03 20:50:45 +01:00
Laurent Cozic
b36905cb3c tags 2017-07-03 18:58:01 +00:00
Laurent Cozic
dde3ea2008 Fixed tags and added unit tests 2017-07-03 18:29:19 +00:00
Laurent Cozic
ab312d70f5 Removed requirement for unique folder title 2017-07-03 18:03:14 +00:00
Laurent Cozic
09bcf8df35 Improved test unit 2017-07-02 22:01:37 +01:00
Laurent Cozic
8f5219fb79 Fixed note conflict sync 2017-07-02 21:40:50 +01:00
Laurent Cozic
a11acb0fa8 sync tags 2017-07-02 19:38:34 +01:00
Laurent Cozic
f04c1c58f1 Import Evernote tags 2017-07-02 16:46:03 +01:00
Laurent Cozic
d56fb48299 More sync checks 2017-07-02 11:34:07 +01:00
Laurent Cozic
71ae18c254 Unit test case when two clients both delete folders 2017-07-01 16:17:49 +01:00
Laurent Cozic
2ccb00b147 sync update 2017-07-01 13:12:00 +01:00
Laurent Cozic
bca694afeb Fixed deletion of synced folders 2017-07-01 11:30:50 +01:00
Laurent Cozic
51e38b4023 Sync fuzzing 2017-06-30 23:53:22 +01:00
Laurent Cozic
dc4982e17c Handle duplicate folder titles 2017-06-30 18:19:30 +00:00
Laurent Cozic
8d46752fe0 clean up 2017-06-30 18:09:49 +00:00
Laurent Cozic
0fb7463c7e Various fixes and added fuzzing program 2017-06-30 16:33:40 +01:00
Laurent Cozic
5f6db113cf Better handling of source 2017-06-29 21:52:52 +01:00
Laurent Cozic
9060ed489c Fixed onedrive sync issue 2017-06-29 18:03:16 +00:00
Laurent Cozic
6622f18f76 clean up 2017-06-25 16:17:40 +01:00
Laurent Cozic
cf494cfd17 Improve browsing of notes 2017-06-25 10:00:54 +01:00
Laurent Cozic
79e0bb2e65 Removed default folder concept 2017-06-25 08:52:25 +01:00
Laurent Cozic
38be57c1f6 Handle default folder 2017-06-25 00:19:11 +01:00
Laurent Cozic
58791b1963 re-organise code 2017-06-24 19:06:28 +01:00
Laurent Cozic
e521ca9427 Improved sync reporting 2017-06-24 18:40:03 +01:00
Laurent Cozic
45ac9daebe Improved logging handling 2017-06-23 22:32:24 +01:00
Laurent Cozic
bb822b44f2 clean up 2017-06-20 21:31:12 +01:00
Laurent Cozic
4b63500143 handle sync conflictgs 2017-06-20 19:25:01 +00:00
Laurent Cozic
a4374e3bdb sync fixes 2017-06-20 19:18:19 +00:00
Laurent Cozic
b3939887b8 handle deleted sync items 2017-06-19 23:18:24 +01:00
Laurent Cozic
c6ed94b446 Clean up 2017-06-19 20:26:27 +01:00
Laurent Cozic
cb7067ddf4 Handle sync conflicts 2017-06-19 20:18:22 +01:00
Laurent Cozic
baa1a01ed0 Handle sync conflicts 2017-06-19 18:58:49 +00:00
Laurent Cozic
02ff02a9d9 refactored sync class 2017-06-18 23:06:10 +01:00
Laurent Cozic
f9480cb882 sync 2017-06-18 21:19:13 +01:00
Laurent Cozic
2e8a56ad5e testing sync 2017-06-18 00:49:52 +01:00
Laurent Cozic
f0aa00945e sync 2017-06-15 19:18:48 +01:00
Laurent Cozic
efe7d0a45a sync 2017-06-15 00:14:15 +01:00
Laurent Cozic
d8f71e89df sync 2017-06-14 20:59:46 +01:00
Laurent Cozic
a0400a5e38 sync 2017-06-14 20:59:02 +01:00
Laurent Cozic
226353ecb7 Test sync 2017-06-13 23:39:45 +01:00