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

348 Commits (7a1707d8649ad494d6216c30e2058c3797c07e0c)

Author SHA1 Message Date
Laurent Cozic 64d7603eed Revert "All: Added support for hierarchical/nested tags (#2572)" 
This reverts commit e11e57f1d8.
 2020-07-28 18:50:34 +01:00
Laurent Cozic e2d3630783 Tools: Added sync target snapshots 2020-07-25 11:38:43 +01:00
Laurent Cozic 8f8d11c9b3 Desktop: Fixes #3510: Note links would be broken after saving a note in Rich Text editor 2020-07-23 19:38:42 +00:00
alexchee 9a55afec01
All: Add support for AWS S3 synchronisation (Beta) (#2815) 2020-07-15 10:22:55 +01:00
Laurent Cozic 657cebfda9 Desktop: Improved GotoAnything speed and made it safer 
Previously we'd use the remove-markdown package to create the note
preview however this function would freeze on certain notes, and was
probably unsafe as it used regex to parse Markdown. Replaced this in
favour of Markdown-it along with htmlparser2 to strip all markup from a
note.
 2020-07-14 23:27:45 +01:00
Laurent Cozic 3fbfba2c03 Merge branch 'master' of github.com:laurent22/joplin 2020-07-12 19:20:32 +01:00
Laurent Cozic 8a5e6875f0 Desktop, Cli: Fixes #3473: Fix filename when exporting notebook as Markdown 2020-07-12 19:13:08 +01:00
Vaidotas Šimkus e11e57f1d8
All: Added support for hierarchical/nested tags (#2572) 
The implementation uses / symbol as a nesting separator. I.e. tag/subtag is a nested tag, where tag is the parent tag and subtag is its child. Creating a tag named tag/subtag/subsubtag creates three tags, one for each level. The tags are associated using parent_id field.

In the app, viewing notes with a tag will also show all notes that are associated with any of the tag's descendant tags (same for the note count). Deleting a tag will also delete all its descendant tags.

In the desktop app the tags are shown nested just like the notebooks.
 2020-07-12 18:09:07 +01:00
Laurent Cozic e0a87d6253 Revert "All: Add support for sync target lock" 
This reverts commit 51235f191d.

Not ready yet, moving to a branch
 2020-07-12 16:38:54 +01:00
Laurent Cozic 51235f191d All: Add support for sync target lock 
The goal is to allow locking a sync target so that maintenance
operations, such as upgrading the target to a more efficient format,
can be done. For now, only the lock mechanism is in place, as a way to
evaluate it, and to see if it can cause any issue.
 2020-07-10 23:42:03 +01:00
Laurent Cozic 003ead2511 Clean up 2020-07-10 19:54:29 +01:00
Laurent Cozic 8dc8527fdc CLI v1.0.165 2020-07-10 19:52:58 +01:00
Laurent Cozic 77a03599de Desktop: WYSIWYG: Fixed inserting date time and other content inside header 2020-07-04 12:17:30 +01:00
Laurent Cozic 6046f40e45 Tools: Fixed tests following highlight.js upgrade (changed in HTML escape mode) 2020-07-03 22:30:33 +01:00
Laurent Cozic acf1ff6d1d Desktop, Cli: Fixes #3402: Fixed import of checkboxes in ENEX files 2020-06-28 18:55:47 +01:00
Laurent Cozic eb8841379c Desktop, Cli: Fixes #2331: Only de-duplicate imported notebook titles when needed 2020-06-28 18:00:51 +01:00
Laurent Cozic fcd00b3212 Desktop, Cli: Fixed various bugs related to the import of ENEX files as HTML 2020-06-15 17:10:51 +01:00
Laurent Cozic 9a9cfbd130 Mobile: Resolves #2595: Add undo/redo support 2020-06-13 16:20:18 +01:00
Laurent Cozic b7f5f848f2 All: Refactored themes to allow using the same ones in both desktop and mobile version 
Will also allow using them when exporting HTML or PDF from CLI.
 2020-06-10 22:08:59 +01:00
Laurent Cozic faabd17fc6 Desktop: Fixed issue with setting filename for edited attachments 2020-06-09 19:15:43 +00:00
Laurent Cozic be1895a080 Clipper: Fixes #3241: Handle certain special cases of ordered lists 2020-06-08 18:44:13 +01:00
Laurent Cozic f36e0c2513 All: Fixes #3334: Prevent notebook to be the parent of itself 2020-06-07 12:47:43 +01:00
Naveen M V 643b06ffa7
Tools: Rewrite randomly failing test (#3328) 2020-06-05 16:05:47 +01:00
Laurent Cozic afcfb0e341 Tools: Disabled tests that are randomly failing 2020-06-04 18:26:42 +01:00
Laurent Cozic 26ce102113
Desktop: Resolves #2773: Add support for system keychain to save sensitive settings (#3207) 2020-06-03 17:07:50 +01:00
叡山电车 5082181c49
Desktop: Fixes #3153: Make GotoAnyting work with East Asian charactors (#3180) 2020-06-03 17:06:14 +01:00
Laurent Cozic d0de79bffa Trying to fix Travis-ci test units 2020-05-31 21:07:24 +01:00
Laurent Cozic fbd42726c0 Added test unit for conflict handling when deleting resource 2020-05-31 20:22:55 +01:00
Laurent Cozic 36776cd615 Handle resource conflicts 2020-05-31 16:57:16 +01:00
Laurent Cozic 1852d9291d Handle sync when resource has been edited 2020-05-31 00:31:29 +01:00
Laurent Cozic 53eba3f062 Fixed handling of resource paths 2020-05-30 15:28:42 +01:00
Laurent Cozic 40d39d6268
Desktop: Resolves #51: Add way to manually order notes by dragging them (#3235) 
* Allow custom sorting

* Implement UI

* Set order from message box

* Fixed mistake

* Update NoteListItem.tsx

* Desktop: Fixed date popup dialog overflow issue inside info dialog
 2020-05-27 17:21:46 +01:00
Laurent Cozic 8c338675d2 Desktop: Fixes #3267: Fixed issue with invalid image paths when config path contains spaces 2020-05-25 09:52:10 +01:00
Laurent Cozic a96734f5be Revert "Tools: Added eslint rule arrow-parens" 
This reverts commit 0b6f5581f0.

It causes too many conflicts with pull requests.
 2020-05-21 09:14:33 +01:00
Laurent Cozic 0b6f5581f0 Tools: Added eslint rule arrow-parens 2020-05-20 17:16:43 +01:00
Laurent Cozic bec91863e2 All: Fixes #3234: Sync would fail in some cases due to a database error 2020-05-19 23:17:56 +01:00
Naveen M V b3f32ffc59
Desktop: Resolves #2409: Add note history (back/forward buttons) (#2819) 2020-05-15 12:13:42 +01:00
RedDocMD a09c7b72c7
Desktop: Fixes #3009: Word/character counter includes Markdown syntax and HTML tags (#3037) 
* Updated commit

* Update package.json

* Update package.json

Co-authored-by: Laurent Cozic <laurent22@users.noreply.github.com>
 2020-05-15 11:28:31 +01:00
Siddhant Sehgal 0f8f7aeb14
Desktop: Fixes #3052: Fixed order of notebooks in "Move to notebook" dialog (#3084) 
* Added Folder::sortFolderTree

* Added unit tests
 2020-05-09 16:19:30 +01:00
anirudh murali 57cf826e2c
All: Resolves #2915: Improve automatic title generation (#2955) 2020-05-09 15:55:00 +01:00
Laurent Cozic ec8ccc94aa Revert "Tests: Fix random failures (#2777)" 
This reverts commit d1cab4b7f5.
Part of this revert: d2582f4fdf

For rationale see https://github.com/laurent22/joplin/pull/2819#issuecomment-616148984
 2020-05-02 16:45:25 +01:00
mic704b 125fa8647a
All: Fix format of geolocation data (#2673) 
* Maintain geolocation data format through serialization.

* Add test.
 2020-04-30 16:56:47 +01:00
mic704b d1cab4b7f5
Tests: Fix random failures (#2777) 
* Update new feature tests following test harness fixes.

* Fix lint errors.
 2020-04-20 11:32:42 +01:00
Laurent Cozic d2582f4fdf Revert "Restored note history feature by Naveen M V <naveenmv7@gmail.com>" 
This reverts commit 61d3582357.

For rational see https://github.com/laurent22/joplin/pull/2819#issuecomment-616148984
 2020-04-19 17:14:57 +01:00
Laurent Cozic 35df8e5d9e All: Added support for basic search 2020-04-18 12:45:54 +01:00
Laurent Cozic 2050889590 Desktop: Fixes #2968: Trying to resource path issue in WYSIWYG editor 2020-04-13 22:55:24 +00:00
Laurent Cozic 6164e2d8eb Desktop: Search in title and body by default when using Goto Anything 2020-04-13 22:10:59 +00:00
Laurent Cozic bd99b25848 Desktop: WYSIWYG: Preserve HTML code in Markdown when editing from wysiwyg editor 2020-04-10 17:12:41 +00:00
Laurent Cozic ec499eecd5 Desktop: WYSIWYG: Added support for code blocks edition and creation 2020-04-09 17:47:12 +01:00
Laurent Cozic 9b26378fdd All: Fixes #2709: When modifying a conflicted note, it would disappear from the view 2020-04-07 23:06:29 +00:00