joplin/plugin-conflict-resolution

plugin-conflict-resolution's Issues

Mysterious popup shown instead of conflict resolution window

When I try to resolve a conflict and I right-click on the note and select Resolve Conflict this comes up instead:

Joplin 2.12.15, running on Linux.
Conflict Resolution v. 1.2.3

setFitToContent does not exist (Incompatible Joplin version)

Uncaught exception in plugin "joplin-plugin-conflict-resolution": Error: Property or method "setFitToContent" does not exist in "joplin.views.dialogs.setFitToContent"

Plugin has an app min version of 2.0.9, but the command setFitToContent does not exist in any released or beta version yet!

Context Menu Entry not showing

Hello!
After opening Joplin again after quite some time on my PC I had a new Notebook called "Konflikte (Anhänge)" (in english "Conflicts (Attachments)")
I looked up the link in the note, and it told me to install this plugin to help with conflict resolution.
However, after installing the plugin and restarting, I don't see the new context menu entry when right-clicking a note in the conflicts-notebook.
Is there anything I can do to resolve this issue? Do you need further information to help me out? Please let me know!

Investigate escaping note contents.

Currently, due to the way that I use to pass note contents into the webview, if the note contains a doublequote character, the contents of the note are cut off at that position and the rest of the contents are appended as html.

In the future, I may look into using an actual escaping library to handle all characters. Also we need to check if we need to "unescape" the notes in the webview side.

Suggestion: add `joplin-plugin` topic to the repo

Adding the joplin-plugin topic could help with discovery via GitHub.

Add a move title contents button.

The button would act similar to CodeMirrors in lines.

Diff window doesn't react to Joplin width.

The window should be responsive to the current screen width.

Diff editor doesn't use Joplin color Theme.

Changes to the Theme of Joplin are not adopted by the editor.

Conflict Editor keeps the light colors even if the Theme use dark ones for the editor.

Possibly the --joplin-{property} variables should be used.

Resolve Conflict button always enabled

For some reason, the button is always enabled even when right clicking a normal note. This is not intended behaviour.
May be a Joplin bug, pending investigation.

Resolve window not coming up

Just installed the plugin, restarted the app, right clicked the note in the conflicts folder, but am not getting any window.
The conflict note does have some text shown Joplin.
Am on windows version 2.12.10 (prod, win32)
Any thoughts?

Is it possible to check conflicts/diff in any folder?

Sorry if this is not the correct channel for questions/support. I could not find any info on the readme.md

I had conflicts in a mobile instance. Since I cannot run plugins in mobile, I moved them to a temp folder to run in a desktop instance. To my surprise, apparently I cannot run it out of the conflicts folder, nor I can create such folder and move notes to it.

IIUC, the plugin is just a diff GUI. Maybe you could extend it to add this functionality, or create a new plugin with this specific intention. I can imagine other cases of use.