Huge News!Announcing our $40M Series B led by Abstract Ventures.Learn More
Socket
Sign inDemoInstall
Socket

joplin-plugin-conflict-resolution

Package Overview
Dependencies
Maintainers
4
Versions
7
Alerts
File Explorer

Advanced tools

Socket logo

Install Socket

Detect and block malicious and high-risk dependencies

Install

joplin-plugin-conflict-resolution

This plugin adds a context menu option on conflict notes to open a merge menu. Once clicked a diff viewer will be shown to aid in merging the notes together.

  • 1.2.3
  • latest
  • npm
  • Socket score

Version published
Maintainers
4
Created
Source

Conflict Resolution Plugin

This plugin adds a context menu option on conflict notes to open a merge menu. Once clicked a diff viewer will be shown to aid in merging the notes together.

Preview

Timeline

June 7 - June 21 (2 weeks)

  • Start work on plugin user interface.
  • Add original note ID to conflicting note data.
  • Add conflict menu notification and button to open the plugin window.

June 21 - July 5 (2 weeks)

  • Create plugin initial behavior for loading the notes.
  • Add Save and Cancel behaviors.
  • Write tests to make sure basic plugin works as intended.

July 5 - July 12 (1 week) - Phase 1 Eval

  • Submit forum for Community feedback of the plugin.
  • Submission of the first evaluation.
  • University final exams period (from first of July until 15th)

July 12 - July 26 (2 weeks)

  • University final exams period (from first of July until 15th)
  • Implement any feedback from the community and/or bugs.

July 26 - August 9 (2 weeks)

  • Implement any leftover feedback from the community and/or bugs.
  • If all is done, I could maybe start working on another plugin, preferably a MathTex Autocomplete plugin. To be completed post-GSoC if not done within the time.

August 9 - August 16 (1 week)

  • Do any leftover work in the main GSoC plugin. Extra week just in case.

August 16 - August 23 (1 week) - Final Eval

  • Review all code and cleanup.
  • Code delivery.
  • Mentor Evaluation.

Keywords

FAQs

Package last updated on 08 Sep 2021

Did you know?

Socket

Socket for GitHub automatically highlights issues in each pull request and monitors the health of all your open source dependencies. Discover the contents of your packages and block harmful activity before you install or update your dependencies.

Install

Related posts

SocketSocket SOC 2 Logo

Product

  • Package Alerts
  • Integrations
  • Docs
  • Pricing
  • FAQ
  • Roadmap
  • Changelog

Packages

npm

Stay in touch

Get open source security insights delivered straight into your inbox.


  • Terms
  • Privacy
  • Security

Made with ⚡️ by Socket Inc