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,898 Commits 244 Branches 1,266 Tags 536 MiB
03063f1137
Commit Graph

281 Commits

Author SHA1 Message Date
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
Laurent Cozic
ea9f1dc91d CLI v1.0.123 2019-02-10 16:47:42 +00:00
Laurent Cozic
5710e3fad0 CLI v1.0.122 2019-02-10 16:34:41 +00:00
Laurent Cozic
242926d381 Fixed regressions in test units 2019-01-31 09:48:48 +00:00
Laurent Cozic
384ca09842 Merge branch 'master' into search_engine_fts_fix 2019-01-15 19:33:42 +00:00
Laurent Cozic
8d16ad7035 Updated dates 2019-01-15 19:10:27 +00:00
Laurent Cozic
2e12b2655b More fixes to search engine and better handling of non-ASCII searches 2019-01-14 19:11:54 +00:00
Laurent Cozic
37c4f99341 CLI v1.0.120 2019-01-10 19:00:42 +00:00
Helmut K. C. Tessarek
958979e1d7
CLI v1.0.119 2018-12-19 11:13:18 +01:00
Helmut K. C. Tessarek
0a0afd7245
CLI v1.0.118 2018-11-20 15:38:32 -05:00
Laurent Cozic
07b724d65b All: Fixes #992: Allow non-ASCII chars when exporting MD and handle duplicate filenames 2018-11-20 00:42:21 +00:00
Laurent Cozic
7b85c33213 CLI v1.0.117 2018-10-29 23:24:19 +00:00
Laurent Cozic
b880be8b7c All: Fixes #853: Replace characters to equivalent US-ASCII ones when exporting files 2018-10-05 17:53:55 +01:00
Helmut K. C. Tessarek
2858c0fce0
CLI v1.0.116 2018-09-30 18:28:54 -04:00
Helmut K. C. Tessarek
ff2d793fbb
CLI v1.0.115 2018-09-28 14:08:21 -04: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
f82dfde6f4 Clipper: Fixed importing certain images with sources that contain brackets 2018-09-24 20:15:23 +01:00
Laurent Cozic
7f80f67fd6 CLI v1.0.114 2018-09-05 12:30:09 +01:00
Laurent Cozic
4b6964b683 CLI v1.0.113 2018-07-25 17:59:00 +02:00
Laurent Cozic
f63668350b CLI v1.0.110 2018-06-30 19:58:36 +01:00
Laurent Cozic
3fc54d7ffd CLI: Updating SQLite to support Node 10 2018-06-30 19:57:49 +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
26fc26c9fe CLI v1.0.109 2018-06-28 20:49:26 +01:00
Laurent Cozic
df4c07d204 CLI: Added way to decrypt string 2018-06-28 20:48:39 +01:00
Laurent Cozic
1c78722573 CLI: Upgraded Turndown plugins 2018-06-25 18:19:27 +01:00
Laurent Cozic
f599ae065a CLI v1.0.108 2018-06-14 22:42:43 +01:00
Laurent Cozic
a8da469523 Clipper: Improved download of images and conversion to resources 2018-05-23 14:25:59 +01:00
Laurent Cozic
7cf267254f Clipper: Improved Html To Md conversion 2018-05-22 00:54:23 +01:00
Laurent Cozic
7ed9c2770c Clipper: Improved UI and integration with main app 2018-05-20 10:19:59 +01:00
Laurent Cozic
a2b1181f7c HtmlToMd: Fixed handling of inline tags 2018-05-15 13:26:53 +01:00
Laurent Cozic
65065a62d8 CLI v1.0.107 2018-05-11 13:50:19 +01:00
Laurent Cozic
cf9246796d CLI: Added support for sub-notebooks 2018-05-09 12:39:27 +01:00
Laurent Cozic
1ba3fae101 All: Resolves #470: Make it clear that spaces in URLs are invalid. 2018-05-01 19:05:14 +01:00
Laurent Cozic
9004b710ea CLI v1.0.106 2018-03-27 23:22:06 +01:00
Laurent Cozic
58601dfc04 CLI v1.0.104 2018-03-23 18:06:06 +00:00
Laurent Cozic
f81dbf4a4c CLI v1.0.103 2018-03-16 14:36:09 +00:00
Laurent Cozic
c2507cbc4e CLI v1.0.101 2018-03-16 08:17:27 +00:00
Laurent Cozic
e868102c98 Revert "Adding prettier to all projects" 
This reverts commit d6a4436313.
 2018-03-09 17:45:42 +00:00
Laurent Cozic
d6a4436313 Adding prettier to all projects 2018-03-09 17:32:10 +00:00
Laurent Cozic
5ba98b4200 CLI v1.0.100 2018-02-28 21:18:27 +00:00
Laurent Cozic
9f8a46b9d9 All: Added more export options including jpz format 2018-02-23 19:32:19 +00:00
Laurent Cozic
e6d821a45f CLI v1.0.99 2018-02-19 22:59:09 +00:00
Laurent Cozic
51fc2d8e51 CLI v1.0.98 2018-02-16 23:49:22 +00:00
Laurent Cozic
1bc4d6b423 CLI v1.0.97 2018-02-16 23:08:57 +00:00
Laurent Cozic
e4d477fb4c CLI: Resolve #63: Allow customizing shortcuts 2018-02-16 22:53:53 +00:00
Laurent Cozic
41df355a7e CLI v1.0.96 2018-02-15 23:51:00 +00:00
Laurent Cozic
3a1fa583ab CLI v1.0.95 2018-02-12 18:07:20 +00:00
Laurent Cozic
acf0c79341 Graduated E2EE and WebDAV from beta, and moved to v1.0 2018-02-11 13:50:59 +00:00
Laurent Cozic
69fd32e7c6 All: Use mutex when saving model to avoid race conditions when decrypting and syncing at the same time 2018-02-07 19:02:07 +00:00
Laurent Cozic
d25d9b3f44 CLI v0.10.93 2018-02-06 13:17:10 +00:00
Laurent Cozic
fcf8a1649d CLI v0.10.92 2018-01-31 19:28:31 +00:00
Laurent Cozic
5c66042a2d CLI v0.10.91 2018-01-28 17:59:34 +00:00
Laurent Cozic
b6cb0056c7 CLI v0.10.90 2018-01-26 17:19:42 +00:00
Laurent Cozic
7ab135c099 Various tweaks to get Nextcloud working in mobile 2018-01-25 20:48:01 +00:00
Laurent Cozic
6a7d368184 All: Started Nextcloud support 2018-01-21 17:01:37 +00:00
Laurent Cozic
99c7111f8c CLI: Fixes #168: Invalid code block would crash app 2018-01-17 17:52:55 +00:00
Laurent Cozic
f67e4a03e4 CLI: Detect installed Node version 2018-01-09 19:56:38 +00:00
Laurent Cozic
a8576a55d6 CLI v0.10.87 2018-01-09 09:31:03 +01:00
Laurent Cozic
77fec75f23 CLI v0.10.86 2018-01-05 21:02:23 +01:00
Laurent Cozic
6252a4d8c8 Merge branch 'master' into encryption 2018-01-03 20:23:26 +01:00
Laurent Cozic
d13d7bec45 Minor changes 2018-01-03 20:20:16 +01:00
Laurent Cozic
7b82dacbf2 Update website 2018-01-03 00:17:31 +01:00
Laurent Cozic
500fbc5294 Merge branch 'master' into encryption 2017-12-31 15:26:16 +01:00
Laurent Cozic
70a33f8533 CLI 0.10.84 2017-12-29 11:17:07 +01:00
Laurent Cozic
1891eb4998 All: Upgraded to fs-extra 5.0 2017-12-22 18:58:09 +00:00
Laurent Cozic
d9c1e30e9b Merge master into encryption branch 2017-12-15 07:31:57 +00:00
Laurent Cozic
caae7f7cf8 CLI v0.10.83 2017-12-11 20:12:41 +00:00
Laurent Cozic
238b5ab9b9 CLI: version bump to fix Homebrew formula 2017-12-08 21:41:41 +00:00
Laurent Cozic
027f96d100 Electron: Fixes #36: Set installation directory for Windows installer 2017-12-07 18:17:41 +00:00
Laurent Cozic
507e7e6014 All: Improved ENEX import for web pages that have been saved as notes 2017-12-06 19:29:58 +00:00
Laurent Cozic
4b55fefcb1 Cleaned up build tools 2017-12-04 17:55:06 +00:00
Laurent Cozic
7851b6b429 Version update 2017-12-02 15:57:19 +00:00
Laurent Cozic
6c3918ebd2 All: Improved Evernote import for blockquotes and sup tags 2017-12-02 12:49:42 +00:00
Laurent Cozic
9d984596cc CLI: fixed crash when inputting command without closed quote 2017-12-01 17:51:27 +00:00
Laurent Cozic
033d356b56 Removed dependency to marked and update locale 2017-11-28 18:07:49 +00:00
Laurent Cozic
914a2554ab All: Updated translations 2017-11-24 19:59:21 +00:00
Laurent Cozic
27af0e69ef Electron release v0.10.23 2017-11-21 18:26:17 +00:00
Laurent Cozic
3722012da5 Added command to export debug information from mobile and CLI 2017-11-21 18:48:50 +00:00
Laurent Cozic
1c1228bb88 Electron release v0.10.22 2017-11-20 18:59:13 +00:00
Laurent Cozic
3d6fe4c2cd Android: Fixed image picker issues 2017-11-20 19:01:19 +00:00
Laurent Cozic
716b1315a9 Electron release v0.10.21 2017-11-17 23:42:45 +00:00
Laurent Cozic
f09cec794b Updading website 2017-11-17 22:12:30 +00:00
Laurent Cozic
94a800aa3c Electron release v0.10.18 2017-11-16 19:21:23 +00:00
Laurent Cozic
48061457ac Various tweaks to get prod version to work 2017-11-13 18:47:35 +00:00
Laurent Cozic
a2219bedd7 Merge branch 'master' into no-babel 2017-11-08 21:39:07 +00:00
Laurent Cozic
dd4a640480 Version 2017-11-07 18:05:49 +00:00
Laurent Cozic
5024dcf668 Improving markdown renderer 2017-11-06 23:56:33 +00:00
Laurent Cozic
a1cb172bc3 Removed babel 2017-11-03 18:39:08 +00:00
Laurent Cozic
8b454e1e95 Fixing website 2017-11-01 17:39:56 +00:00
Laurent Cozic
494b9b01c1 Translation and rebuilt website 2017-10-30 22:43:11 +00:00
Laurent Cozic
12b6902a49 Fixed RN text field and gave different OneDrive token to demo 2017-10-30 21:29:36 +00:00
Laurent Cozic
5a7028bd11 Got Android version working again 2017-10-30 00:29:10 +00:00
Laurent Cozic
ddbae876de Added readme 2017-10-29 00:31:51 +01:00
Laurent Cozic
269a77e5f3 Improved loading of notes 2017-10-28 18:07:10 +01:00
Laurent Cozic
aefeca66d5 Added demo and improved parsing of markdown URLs 2017-10-28 00:20:03 +01:00
Laurent Cozic
9628d369a3 Upgraded tkwidgets 2017-10-26 23:10:24 +01:00
Laurent Cozic
0b80859055 Improved sync 2017-10-26 23:56:32 +02:00
Laurent Cozic
31bfa72bca More info in case of error 2017-10-25 21:23:48 +01:00
Laurent Cozic
52f25c26d2 Minor UI changes and reverter back to npm 2017-10-25 18:23:45 +01:00
Laurent Cozic
3532b7ae87 Fixed headless sync 2017-10-25 17:41:36 +00:00
Laurent Cozic
3f56404c25 Allow cancelling OAuth dance, and fixed status bar display issue 2017-10-24 18:03:12 +00:00
Laurent Cozic
3de107d937 Fixed tag selection and made entered commands more visible 2017-10-23 23:11:50 +01:00
Laurent Cozic
01d01b76cd Implemented search and fixed Redux update loop 2017-10-23 21:34:04 +01:00
Laurent Cozic
0ee82bd5ce Better handling of network errors and improved borders 2017-10-22 13:45:56 +01:00
Laurent Cozic
6e49aa45c0 Fixed synchronization issue 2017-10-21 19:07:56 +01:00
Laurent Cozic
2675a89dda Fixed note sorting 2017-10-21 17:53:43 +01:00
Laurent Cozic
ad1c0f3958 Added command attach and support for non-gui mode 2017-10-19 23:02:13 +01:00
Laurent Cozic
4db08d1a26 Minor fixes and improvements 2017-10-17 22:56:22 +01:00
Laurent Cozic
d4af90832b Cleaned up command processing logic and fixed a few bugs 2017-10-17 18:18:31 +01:00
Laurent Cozic
3d8327ae0b Improved network error handling 2017-10-15 12:13:09 +01:00
Laurent Cozic
6a3eb65a66 Changed to use object properties 2017-10-07 21:04:53 +01:00
Laurent Cozic
fa11607a3b Started tkwidgets gui 2017-10-05 18:17:56 +01:00
Laurent Cozic
5118779a67 minor fixes 2017-09-12 18:01:15 +00:00
Laurent Cozic
7cc26a4fe4 Allow selecting note if ID matches more than one 2017-09-10 18:32:04 +01:00
Laurent Cozic
7aaf4fb491 Improved back button handling when note has been modified 2017-08-24 18:10:03 +00:00
Laurent Cozic
d9c85a7275 Various changes 2017-08-22 19:57:35 +02:00
Laurent Cozic
1da06734f1 Various improvements on mobile app 2017-08-21 20:32:43 +02:00
Laurent Cozic
97c73b22d1 Fixed argument parsing 2017-08-21 19:56:40 +02:00
Laurent Cozic
36743bb4d7 Handle user timestamp 2017-08-20 22:11:32 +02:00
Laurent Cozic
671e8a3fc8 Allow exporting notes and notebooks 2017-08-20 16:29:18 +02:00
Laurent Cozic
d708c8b48d Bigger click target on checkboxes 2017-08-19 23:59:08 +02:00
Laurent Cozic
0cf8d3fd74 Don't deal with files outside of root during OneDrive sync 2017-08-18 22:46:39 +02:00
Laurent Cozic
e81178ec3d Minor changes 2017-08-05 00:15:08 +02:00
Laurent Cozic
af977df8c6 Should launch main.js 2017-08-04 22:15:55 +02:00
Laurent Cozic
3a5887ff14 Optimised loading time by getting rid of launcher and caching module paths 2017-08-04 22:13:29 +02:00
Laurent Cozic
024be942a9 Clean up packages 2017-08-04 19:18:19 +02:00
Laurent Cozic
9ed22265ba Removed vorpal 2017-08-04 17:51:01 +00:00
Laurent Cozic
60c8b7530b Removing vorpal 2017-08-03 17:48:14 +00:00
Laurent Cozic
df1a063a52 Website 2017-07-31 19:47:58 +00:00
Laurent Cozic
eb5d131620 Doc building 2017-07-27 23:59:34 +01:00
Laurent Cozic
bd06fa781e Fixed note sorting and changed colour of header 2017-07-27 18:25:42 +01:00
Laurent Cozic
fc7163b324 Sync when changing note or folder 2017-07-24 21:36:49 +01:00
Laurent Cozic
0f95e97d19 Refactored handling of multiple sync targets 2017-07-24 18:01:40 +00:00
Laurent Cozic
7bea097b42 There must be at least 3 dashes separating each header cell. 2017-07-20 19:58:06 +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
ca68b85837 Fixed various issue in RN app 2017-07-17 21:22:05 +01:00
Laurent Cozic
58fa4a69b0 Started adding support for localisation 2017-07-17 20:26:19 +00:00
Laurent Cozic
2688ad7caa Use lock file for sync 2017-07-17 19:37:59 +00:00
Laurent Cozic
c2ba2105ff Change folder from RN 2017-07-16 17:06:05 +01:00
Laurent Cozic
cd6d8ce284 Fixed geolocation bug and improved saving of notes and folders 2017-07-16 11:17:40 +01:00
Laurent Cozic
22cb2fdfbe Various improvements 2017-07-15 23:47:11 +01:00
Laurent Cozic
4dc540e589 Minor changes 2017-07-14 18:02:45 +00:00
Laurent Cozic
74e112fef9 Long list format 2017-07-12 21:39:47 +01:00