1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-12 08:54:00 +02:00
Commit Graph

127 Commits

Author SHA1 Message Date
Laurent Cozic
3bb9d2efd6
Update TinyMCE.tsx 2020-06-02 22:35:05 +01:00
Laurent Cozic
710026c8ac Fixed typo 2020-06-02 17:50:24 +01:00
Laurent Cozic
79c45af0d5 Merge branch 'master' into editable_resources 2020-06-02 17:32:21 +01:00
Laurent Cozic
a75db94da5 Desktop: Fixes #3302: Prevent drag and dropping of text in editor as it can lead to data loss 2020-06-01 21:30:51 +00:00
Laurent Cozic
468261906a Desktop: Fixes #3298: Fixed shortcut to focus Note List when editor is in focus 2020-06-01 21:24:14 +00:00
Laurent Cozic
3f1c9c989b Desktop: Fixes #3286: Disable editor toolbar when editor is not in focus 2020-06-01 21:01:10 +00:00
Laurent Cozic
0e5a0fdbe5 Delete temp files and stop watching when switching notes 2020-05-30 17:49:29 +01:00
Laurent Cozic
e43e3c198a Add support for editable resources 2020-05-30 13:25:05 +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
0f7deeeac1 Desktp: Put back Edit in External Editor button 2020-05-25 11:37:45 +01:00
Laurent Cozic
c99bd27e4d Desktop: Fixes #3259: Fixed inserting templates into existing notes 2020-05-23 23:06:08 +01:00
Laurent Cozic
0cfceab151 Desktop: Fix undo issue when loading new note 2020-05-23 00:14:26 +01:00
Laurent Cozic
a2fce031a2 Desktop: Dev fix: Fixed TypeScript 2020-05-21 17:12:18 +01:00
Laurent Cozic
f1dbc1d41c Desktop: Improved handling of dark and light theme auto-switch 2020-05-20 23:57:59 +00: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
b83eee751f Destkop: Fix selection-related issues 2020-05-21 08:17:08 +01:00
Laurent Cozic
0b6f5581f0 Tools: Added eslint rule arrow-parens 2020-05-20 17:16:43 +01:00
Laurent Cozic
9eac63c021 Desktop: Made sidebar chevrons consistent 2020-05-20 00:21:18 +00:00
Laurent Cozic
5eb084fd3b Desktop: Fixed issue with the editor showing previous note when it should show nothing 2020-05-20 00:13:59 +00:00
Laurent Cozic
a99db36578 Desktop: Fixed two way scrolling issue in Markdown editor 2020-05-19 23:51:00 +00:00
Laurent Cozic
38ced8cb09 Desktop: Dev fix: TypeScript error 2020-05-20 09:38:14 +01:00
Laurent Cozic
6f8332bad1 Desktop: Fixes #3228: Markdown editor would not scroll in sync with viewer in some cases 2020-05-20 01:16:03 +01:00
Laurent Cozic
7a1eecc815 Desktop: Fixes #3200: Fixed infinite rendering loop, which would cause the app to crash (white window) 2020-05-20 00:58:35 +01:00
Ayush Jain
341b763088
Desktop: Resolves #2883: Themes switched for more appealing text highlighting (#3192)
* conflicts fixed and changes made to aceEditor.tsx

* theme imported

* theme imported
2020-05-18 11:30:29 +01:00
Laurent Cozic
f8ad782991 Desktop: Fixes #3219: Fix notebook associated with note when doing search, and expand correct notebook 2020-05-17 16:45:27 +01:00
Laurent Cozic
c2684a8149 Desktop: Added more info on how to switch to Markdown editor 2020-05-17 16:29:55 +01:00
Laurent Cozic
c568f5b33c Desktop: Resolves #3137: Switch to Font Awesome as icon library 2020-05-17 15:34:42 +01:00
Laurent Cozic
e85d4fca5d Desktop: Moved note-related toolbar button next to tag bar 2020-05-17 14:01:42 +01:00
anirudh murali
ebe06c9c38
Desktop: Fixes #2865: Make sidebar resizable when note list is not displayed (#2895)
Co-authored-by: Laurent Cozic <laurent22@users.noreply.github.com>
2020-05-15 12:20: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
Laurent Cozic
ecc50790ed Desktop: Refactor: Minor refactoring following counter feature update in a09c7b72c7 2020-05-15 11:52:59 +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
Caleb John
b5fc8e7fc1
Merge pull request #3012 from Rishgod/theme-bold
Desktop: Changing bold-text preview color for Aritim-dark theme
2020-05-13 17:55:09 -06:00
Laurent Cozic
05adb06aeb Desktop: WYSIWYG: Allow pasting images in editor 2020-05-11 19:26:04 +01:00
Laurent Cozic
dacf6377ae Desktop: WYSIWYG: Fixed UI translation issue for certain languages 2020-05-11 18:59:23 +01:00
Laurent Cozic
6446a3c4de Revert "Desktop: Resolves #2894: Set editor color scheme according to theme (#3188)"
This reverts commit 488cb99d4c.

Reason: The app doesn't even start

https://github.com/laurent22/joplin/pull/3188#issuecomment-626334459
2020-05-10 16:33:28 +01:00
Laurent Cozic
9c4939e051 Merge branch 'master' of github.com:laurent22/joplin 2020-05-10 16:28:34 +01:00
Laurent Cozic
9f9f760ede Desktop: WYSIWYG: Handle drag and drop of notes and files 2020-05-10 16:28:22 +01:00
Ayush Jain
488cb99d4c
Desktop: Resolves #2894: Set editor color scheme according to theme (#3188)
* conflicts fixed and changes made to aceEditor.tsx

* theme imported
2020-05-10 15:13:55 +01:00
Laurent Cozic
6ca41ddf80 Desktop: WYSIWYG: Enable context menu on resources, links and text 2020-05-09 19:18:41 +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
Mohammed Rabeeh
b8158f3b53
Desktop: Fixes #3131: Long URIs break Note Info dialog (#3136) 2020-05-09 11:53:16 +01:00
Laurent Cozic
f4717d0a3d Desktop: Add option to "Reveal file in folder" when right-clicking on image
Co-authored-by: Vaidotas Šimkus
2020-05-09 11:10:47 +01:00
Shotaro Yamada
80112e7b35
Desktop: Handle compositionend event in TinyMCE (#3164) 2020-05-08 00:16:04 +01:00
Laurent Cozic
d41221bd90 Desktop: Fixed regression with Ace Editor list indentation, and cleaned up code 2020-05-07 18:20:07 +01:00
Laurent Cozic
132c6543b2 Desktop: Fixed regression with Ace Editor (switching layout had bugs) 2020-05-07 18:08:03 +01:00
Laurent Cozic
c273fd4d63 Desktop: Fixed regression with local search (could not be closed anymore) 2020-05-06 23:17:03 +01:00
Laurent Cozic
463b20013d Fixed linter errors 2020-05-05 19:03:13 +01:00
Laurent Cozic
204fbec648 Desktop: WYSIWYG: Handle "Paste as text" when pressing Ctrl+Shift+V 2020-05-05 18:52:06 +01:00
Laurent Cozic
d65706aa9c Desktop: TinyMCE: Fixed undo issue when pasting text 2020-05-05 00:01:13 +00:00