self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-02-04 19:16:07 +02:00
Code Issues Releases Activity
4,027 Commits 244 Branches 1,281 Tags
Commit Graph

1318 Commits

Author SHA1 Message Date
Laurent Cozic
776411f882 Desktop: WYSIWYG: Added support for tables 2020-04-10 18:22:17 +00:00
Laurent Cozic
ae4cecc621 Desktop: WYSIWYG: Handle internal note links 2020-04-10 17:59:51 +00:00
Laurent Cozic
5be98a46e3 Desktop: WYSIWYG: Improved documentation on what plugins are compatible with WYSIWYG editor 2020-04-10 17:33:09 +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
75b28c46af Desktop: Wait for note to be saved before closing the app 2020-04-09 18:57:20 +01:00
Laurent Cozic
ec499eecd5 Desktop: WYSIWYG: Added support for code blocks edition and creation 2020-04-09 17:47:12 +01:00
Laurent Cozic
7ccd19e21d Cli: Fixes #2981: Add support for retrying decryption after it has failed multiple times 2020-04-08 18:02:31 +01:00
Laurent Cozic
a6459d3641 Mobile: Fixes #2941: Fixed resource download auto mode 2020-04-08 17:40:32 +00: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
Laurent Cozic
6d56bb8afd Revert "Mobile: Fixes #2847: Fixed text issue in config screen on some devices (#2851)" 
Reverted to fix regression (crash) in iOS app.

https://github.com/laurent22/joplin/pull/2851#issuecomment-610688103

This reverts commit e024015d5e4056c54d2c7eadda961004716c801e.
 2020-04-08 01:38:39 +01:00
Laurent Cozic
be9e873277 Mobile: Fixes #1437: Allow scrolling past end of note 2020-04-08 01:22:18 +01:00
Laurent Cozic
10feeeeb6b All: Fixes #2257: Prevent decryption loop when a resource cannot be decrypted 2020-04-08 01:00:01 +01:00
Tobias Johansson
2a8b27033f
Desktop: Added new Aritim-Dark theme (#2997) 
* Working on an aritim-dark theme, very WIP still

* Update aritim.js

* Added new theme "Aritim-Dark"

* removing aritim-dark "brace" theme for now

* Updating style with some changes

* Reset branch back to the original upstream state, to create a different pull-request for moving all themes outside

* Reset branch back to the original upstream state

* Moved all themes out into their own .js theme files

* Updating master to use the seperated themes stuff

* Moved themes into their own const

* Removed switch case for themes and simplified it. Thanks Laurent for the help!

* Adding Aritim-Dark to theme options
 2020-04-07 10:23:40 +01:00
Helmut K. C. Tessarek
e319864669
Tools: Fix Korean language name: 한국어 (#2989) 2020-04-05 21:14:31 +01:00
Ishant Gupta
7251813634
Mobile: Fixed config text input not visible in dark mode (#2910) 2020-04-05 20:47:30 +01:00
Ishant Gupta
e024015d5e
Mobile: Fixes #2847: Fixed text issue in config screen on some devices (#2851) 
* fixed text issue on some devices and closes #2847

* changes added to global file
 2020-04-05 20:05:04 +01:00
Laurent Cozic
f550d847c4 Desktop: Resolves #2688: Add "Retry All" option to synchronisation page 
Based on pull request #2712 by fhfuih

commit 7d3815e51dbf682ecc1ed3544a15e51b79d5d12d
Author: Laurent Cozic <laurent@cozic.net>
Date:   Sat Apr 4 18:26:01 2020 +0100

    Fix issues

commit dad1d2c4d4eb37fdd23096a3344cf4f14498e335
Merge: 16cf0a3058 0a1ba511ea
Author: Laurent Cozic <laurent@cozic.net>
Date:   Sat Apr 4 18:09:46 2020 +0100

    Merge branch 'master' of https://github.com/fhfuih/joplin into fhfuih-master

commit 0a1ba511ea4cb04a20a1334dbc45a9ad6ad15300
Merge: 6207b42044 bdd760f343
Author: fhfuih <fhfuih@outlook.com>
Date:   Sat Mar 14 20:30:27 2020 -0400

    Merge branch 'master' into master

commit 6207b42044127b49fdd879217fc080fa11fb686b
Author: fhfuih <sam.zyhuang@outlook.com>
Date:   Sat Mar 14 20:13:28 2020 -0400

    Decryption Retry All RN frontend

commit 6f46d1985f580ce4b1428c0a2ce16800b696ce1d
Author: fhfuih <sam.zyhuang@outlook.com>
Date:   Sat Mar 14 20:10:55 2020 -0400

    Decryption Retry All backend & desktop

commit 4c3d37b311991dcbb76e984c299d5c5517bd2437
Author: fhfuih <sam.zyhuang@outlook.com>
Date:   Fri Mar 13 13:21:21 2020 -0400

    Revert "Add "retry all" option to synchronisation page"

    This reverts commit 15daaa16fdb961003af78d54a083a3a35c79d7b3.

commit cffc919791f86dd980bf326c913c4931c3261eca
Author: fhfuih <sam.zyhuang@outlook.com>
Date:   Fri Mar 13 13:19:51 2020 -0400

    Revert "Refactor "retry all" renderer to avoid hacks"

    This reverts commit 51ba6ea65521c8bfa953d90f8078684d8293122b.

commit 51ba6ea65521c8bfa953d90f8078684d8293122b
Author: fhfuih <sam.zyhuang@outlook.com>
Date:   Tue Mar 10 18:27:22 2020 -0400

    Refactor "retry all" renderer to avoid hacks

commit 57d71712e1718d9bdb18bc2b5fdaea94211a01e8
Merge: 15daaa16fd b367955e56
Author: fhfuih <sam.zyhuang@outlook.com>
Date:   Mon Mar 9 20:42:02 2020 -0400

    Merge branch 'master' of https://github.com/fhfuih/joplin

commit 15daaa16fdb961003af78d54a083a3a35c79d7b3
Author: fhfuih <sam.zyhuang@outlook.com>
Date:   Mon Mar 9 20:36:09 2020 -0400

    Add "retry all" option to synchronisation page
 2020-04-04 18:30:13 +01:00
Laurent Cozic
0512fa6208 Desktop: Fixed regression when drag and dropping files 2020-04-02 23:01:14 +01:00
Laurent Cozic
27ab2b8e30 Desktop: Fixed styling issues with rendered Markdown 2020-04-02 22:54:06 +01:00
Laurent Cozic
9fa7c9c20a Desktop: WYSIWYG: Better handling of links on macOS and inside Katex block 2020-04-02 19:58:25 +01:00
Laurent Cozic
6bd0250ef8 Desktop: WYSIWYG: Handle resource download mode 2020-04-02 18:16:11 +01:00
Laurent Cozic
c1129604ba Tools: Disable logging to console by default 2020-04-01 18:15:40 +01:00
Laurent Cozic
693f6cbfe7 Desktop: Add message box to ask confirmation when resizing image 2020-03-31 22:40:38 +01:00
Anjula Karunarathne
a45128807e
Desktop: Resolves #2683: Go To Anything by body (#2686) 
* Go to anything by body

* Made limit parameter required

* Made parameter required

Co-authored-by: Laurent Cozic <laurent22@users.noreply.github.com>
 2020-03-28 13:05:00 +00:00
Laurent Cozic
11d8466db1 Desktop: WYSIWYG: Getting links to work 2020-03-27 18:26:52 +00:00
Bart
37158fdb89
Desktop: Fixes #2334: MD importer handle special chars in linked image name (#2346) 
* md importer: decode uri encoded links to cover case of special chars in linked image names

* md importer: temp debug logs for linux test pipeline

* md importer: more temp debug logs

* md importer: tests, add special char image name on linux

* md importer: tests, use const not let

* md importer: remove debug logs
 2020-03-27 12:20:38 +00:00
Ishant Gupta
62db3d09ea
Mobile: Fixes #2900: Fixed bold text not visible in dark theme (#2909) 
* fixed bold text not visible in oled dark theme

* fixed variable names
 2020-03-27 12:13:22 +00:00
Amit singh
f82aa0adde
Mobile: Fixes #2867: Fixed styling issue in config screen (#2868) 
* fixes hidden path text

* fixes hidden path text lable
 2020-03-27 12:09:26 +00:00
Ishant Gupta
d622ff4a78
Mobile: Fixes #2843: Fixed overlapping text in Dropbox sync page (#2845) 2020-03-25 11:18:39 +00:00
Devon Zuegel
b6d4fd16c9
Mobile: Add toolbar, list continuation and Markdown preview to editor (#2224) 
* The basic editor is working! No list continuation still though

* List continuation is working! Now to delete when entering again and not typing on line + handle ordered lists

* Supports checkboxes + attempted at setting font

* Editor font works now; now need to fix the delete (look at past state)

* Fix deletion problem

* Add ordered list handler

* Add comments

* Extract insertListLine

* End lists on enter for empty bullets

* Add MarkdownView (renders badly though)

* Save edited text from MarkdownEditor

* Cleanup

* Refactor react-native-markdown-editor/

* Rename react-native-markdown-editor/ => MarkdownEditor/

* Cleanup

* Fix preview styles; still need to fix checkbox problem

* Fix keyboard padding

* Change name back to #body_changeText

* Incorporate PR feedback from @laurent22

* wip: Move MarkdownEditor/ from ReactNativeClient/lib/ to ReactNativeClient/

* Move MarkdownEditor/ from ReactNativeClient/lib/ to ReactNativeClient/

* Remove log statement

* Focus TextInput in MarkdownEditor from grandparent

* Make eslint happy

* Extract textInputRefName to shared variable

* Remove accidental #setState

* Cleanup

* Cleanup

* Run linter

* Cleanup

* Update button order

* Improve styles for config descriptions

* Allow descriptions to be added to BOOL type Setting configs

* Add editorBeta Setting

* Move FailSafe details to description text

* Update descriptionText styles

* Put the editor under the beta flag toggle

* Incorporate PR feedback from @laurent22

* Refactor Markdown editor focusing

* Cleanup

* Reorder MarkdownEditor formats

* Make applyListFormat behavior more intuitive

* Add comment

* Show MarkdownEditor with preview by default

* Show preview by default, then hide on typing

* Fix MarkdownEditor selection bug

* Cleanup

* Update Markdown button styles

* Make Markdown button colors theme-conscious

* Fix merge conflict resolution mistake

* Fix broken import

* Delete package-lock.json

* Reset package-lock.json

Co-authored-by: Laurent Cozic <laurent22@users.noreply.github.com>
 2020-03-25 10:50:45 +00:00
Ishant Gupta
622049dfad
Mobile: Fixes #2859: Fixed code block styling in OLED theme (#2876) 2020-03-23 23:15:00 +00:00
Ishant Gupta
9749a2b9b7
Mobile: Resolves #2738: Auto-save after closing a note (#2782) 
* latest changes merged

* fixed linting syntax
 2020-03-23 22:34:13 +00:00
Laurent Cozic
8d045f0c96 Revert "Mobile: Resolves #2286: Always show scrollbar in editor mode (#2594)" 
This reverts commit 91d864bdedfb6b2ab1ce3c775e3e4999d4bab8c5.

To try to fix this: https://github.com/laurent22/joplin/issues/2856
 2020-03-23 09:35:54 +00:00
Laurent Cozic
41acdce165 Desktop: Added support for checkboxes and fixed various issues with WYSIWYG editor 2020-03-23 00:47:25 +00:00
Naveen M V
3ecd29d0b5
All: Fixes #2803: Remember last selected note (#2809) 
* Fix : Remember last selected note

Fixes #2803

* Add unit test
 2020-03-21 11:29:22 +00:00
mic704b
8cd26c9380
All: Fix integration test harness issues. (#2723) 2020-03-16 13:30:54 +11:00
mic704b
63a2f7b7a5
All: Fix calls to non-existent function (#2675) 
* Fix calls to non-existent function

* Add tests.

* Fix travis lint problems.
 2020-03-16 08:53:49 +11:00
mic704b
a17e01793e
All: Fix format of note timestamps (#2672) 
* Correct format of timestamps during unserialization.

* Add tests.
 2020-03-15 12:07:01 +00:00
mic704b
7fb061ea76
Desktop: Fix show-all-notes update bugs. (#2642) 2020-03-15 12:05:17 +00:00
gasolin
91d864bded
Mobile: Resolves #2286: Always show scrollbar in editor mode (#2594) 
* Mobile: show scrollbar in editor mode

* always show the scrollbar
 2020-03-15 11:55:41 +00:00
Laurent Cozic
339d7d16c7 Desktop: Fix issue with tag not being displayed below note when it is created 2020-03-15 11:45:33 +00:00
Laurent Cozic
8e5762c3a3 Merge branch 'master' of github.com:laurent22/joplin 2020-03-15 10:19:46 +00:00
Rahul Mohata
50a811720f
Mobile: Fixes #2695: Fixed colour of background in OLED dark theme (#2757) 2020-03-15 10:13:44 +00:00
Laurent Cozic
e7b11a2d82 Desktop: Fixes #2618: Fixed renaming tag issue 2020-03-15 09:47:47 +00:00
Laurent Cozic
61d3582357 Restored note history feature by Naveen M V <naveenmv7@gmail.com> 2020-03-15 09:40:57 +00:00
Laurent Cozic
9e66219690 Revert "Desktop: Reolves #2409: Added arrows to go front and back through note history (#2563)" 
Fixing merge issue...

This reverts commit d049b8846c2fa85260b64df4673746fe52685030.
 2020-03-15 09:40:12 +00:00
Naveen M V
d049b8846c
Desktop: Reolves #2409: Added arrows to go front and back through note history (#2563) 2020-03-15 09:38:19 +00:00
RedDocMD
bdd760f343
Desktop: Resolves #2703: Fast notebook deletion (#2730) 
* Batch delete for Notebooks added

* Extended the Folder.delete() unit test

* Unit tests added for Note.batchDelete()
 2020-03-14 21:01:45 +11:00
Helmut K. C. Tessarek
1ee88618e8
reencrypt -> re-encrypt 2020-03-13 20:52:28 -04:00
Laurent Cozic
e399474b4e Tools: Apply "curly" eslint rule 2020-03-13 23:57:34 +00:00