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,425 Commits 244 Branches 1,266 Tags 536 MiB
a9390affaa
Commit Graph

70 Commits

Author SHA1 Message Date
Laurent Cozic
fd4e5d7d30 Android release v1.0.333 2020-06-28 19:57:33 +01:00
Laurent Cozic
254735fcae Desktop: WYSIWYG: Fix undo issue 2020-06-21 14:37:04 +01:00
Laurent Cozic
e7f3aa3764 Updated British spelling 2020-06-20 12:18:41 +01:00
Caleb John
77005fc495
Tools: Try to add codemirror types again (#3380) 
* Try add codemirror type again

* Add global typedef for codemirror

* Add comment
 2020-06-18 18:58:11 +01:00
Laurent Cozic
1205908233 Revert "Desktop: Change codemirror to user import syntax (#3375)" 
This reverts commit 3a7a068196.
 2020-06-17 23:45:36 +01:00
Caleb John
3a7a068196
Desktop: Change codemirror to user import syntax (#3375) 2020-06-17 18:47:11 +01:00
Caleb John
2f15178ff6
Desktop: Remove auto-indent for in note html/xml for Code Mirror (#3374) 
html/xml inside of a codeblock will still benefit from auto-indent
 2020-06-16 13:00:58 +01:00
Caleb John
a4b13be0d1
Desktop: Fix getLineSpan logic and list token regex logic (#3365) 
- previously getLineSpan was included line text as a token (dumb
oversight)
- the regex was updated to include a space after a OL element (was
missing for some reason)
 2020-06-16 13:00:17 +01:00
Caleb John
23ae4fb790
Desktop: Add swapLineUp and swapLineDown keys to Code Mirror editor (#3363) 2020-06-16 12:59:33 +01:00
Laurent Cozic
780c5c80ae Revert "Desktop: Fixes #3302: Prevent drag and dropping of text in editor as it can lead to data loss" 
This reverts commit a75db94da5.

It turns out people often drag and drop text, so restoring the functionality.

See https://discourse.joplinapp.org/t/9406
 2020-06-15 19:16:22 +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
e915549f6d Merge branch 'master' of github.com:laurent22/joplin 2020-06-07 11:02:02 +01:00
Laurent Cozic
30b3f3190b Desktop: Regression: Fixed issue with note being needlessly reloaded in WYSIWYG editor 2020-06-07 11:01:33 +01:00
Caleb John
005bfe799c
Desktop: Fixes #3337: Fixed regression when applying theme for Ace Editor (#3338) 2020-06-07 09:59:00 +01:00
Caleb John
a8c8539e7a
Desktop: Add option to choose Code Mirror as code editor (#3284) 2020-06-06 16:00:20 +01:00
Shotaro Yamada
949c92f6d6
Desktop: Resolves #2614: Unindent empty list markup on Enter (#2772) 2020-06-04 18:36:10 +01:00
Laurent Cozic
a1364a621a Tools: Apply linter rules 2020-06-04 18:24:11 +01:00
Laurent Cozic
39a506ad52 Desktop: Fixes #3324: Attaching an image, then cancelling the resize dialog, would crash the app 2020-06-04 09:08:13 +01:00
Laurent Cozic
d9c266e3f1 Merge branch 'master' of github.com:laurent22/joplin 2020-06-04 07:55:13 +01:00
Laurent Cozic
f4092c0824 Desktop: Dev fix: Only disable editor toolbar in preview mode 
Reverts 468261906a

Disabling the toolbar when the editor is not in focus means it
was disabled when trying to click on one of the button, because
the editor loses focus before the click event is processed.
 2020-06-03 23:59:45 +01:00
Laurent Cozic
560db37025 Tools: Added prefer-default-export eslint rule 2020-06-02 20:13:15 +00:00
Laurent Cozic
3bb9d2efd6
Update TinyMCE.tsx 2020-06-02 22:35:05 +01:00
Laurent Cozic
e117b6f732 Fixed typo 2020-06-02 17:50:43 +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
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
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
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
Naveen M V
b3f32ffc59
Desktop: Resolves #2409: Add note history (back/forward buttons) (#2819) 2020-05-15 12:13:42 +01: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