Github/plugins
1
0
Fork 0
mirror of synced 2024-07-05 03:58:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update: joplin-plugin-conflict-resolution@1.2.2

Browse Source 
8703fe0d8e..19de0ffd80
This commit is contained in:
Joplin Bot 2021-08-18 23:00:14 +00:00
parent 4d772b6f2d
commit e835d73f83
No known key found for this signature in database
GPG Key ID: B9E410D53EF34309
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -18,7 +18,7 @@ This repository contains the following plugins:
| [🏠](https://discourse.joplinapp.org/t/insert-referencing-notes-backlinks-plugin/13632) | [⬇️](https://github.com/joplin/plugins/raw/master/plugins/joplin.plugin.ambrt.backlinksToNote/plugin.jpl) | Automatic Backlinks to note | 2.0.10 | Creates backlinks to opened note, also in automatic way | ambrt |
| - | [⬇️](https://github.com/joplin/plugins/raw/master/plugins/com.xUser5000.bibtex/plugin.jpl) | BibTeX | 0.5.0 | Use locally stored BibTeX files to integrate citation into Joplin | Abdallah Ahmed |
| [🏠](https://github.com/JackGruber/joplin-plugin-combine-notes) | [⬇️](https://github.com/joplin/plugins/raw/master/plugins/io.github.jackgruber.combine-notes/plugin.jpl) | Combine notes | 1.0.1 | Combine one or more notes | JackGruber |
| [🏠](https://discourse.joplinapp.org/t/plugin-conflict-resolution/19204) | [⬇️](https://github.com/joplin/plugins/raw/master/plugins/joplin-plugin-conflict-resolution/plugin.jpl) | Conflict Resolution | 1.2.1 | A plugin that makes process of resolving conflicts easier. | Ahmed Alwasifey |
| [🏠](https://discourse.joplinapp.org/t/plugin-conflict-resolution/19204) | [⬇️](https://github.com/joplin/plugins/raw/master/plugins/joplin-plugin-conflict-resolution/plugin.jpl) | Conflict Resolution | 1.2.2 | A plugin that makes process of resolving conflicts easier. | Ahmed Alwasifey |
| [🏠](https://discourse.joplinapp.org/t/create-note-from-highlighted-text/12511) | [⬇️](https://github.com/joplin/plugins/raw/master/plugins/joplin.plugin.ambrt.convertToNewNote/plugin.jpl) | Convert Text To New Note | 1.5.0 | Converts highlighted text to new one in same folder | ambrt |
| [🏠](https://discourse.joplinapp.org/t/copy-markdown-link-to-active-note/14402) | [⬇️](https://github.com/joplin/plugins/raw/master/plugins/joplin.plugin.ambrt.copyNoteLink/plugin.jpl) | Copy link to active note | 1.0.1 | Adds entry to right click menu in editor to get link to active note | a |
| [🏠](https://discourse.joplinapp.org/t/go-to-note-tag-or-notebook-via-highlighting-text-in-editor/12731) | [⬇️](https://github.com/joplin/plugins/raw/master/plugins/joplin.plugin.ambrt.goToItem/plugin.jpl) | Create and go to #tags and @notebooks | 1.3.7 | Go to tag,notebook or note via links or via text | a |

6
manifests.json
View File

@ -735,15 +735,15 @@
"manifest_version": 1,
"id": "joplin-plugin-conflict-resolution",
"app_min_version": "2.0.9",
"version": "1.2.1",
"version": "1.2.2",
"name": "Conflict Resolution",
"description": "A plugin that makes process of resolving conflicts easier.",
"author": "Ahmed Alwasifey",
"homepage_url": "https://discourse.joplinapp.org/t/plugin-conflict-resolution/19204",
"repository_url": "https://github.com/joplin/plugin-conflict-resolution",
"keywords": [],
"_publish_hash": "sha256:7e5a07dcab27c6c081c9ff75170e6ed8861a43c5be025ca901ad1dc69dcbeee9",
"_publish_commit": "master:8703fe0d8ec329635d683dc48eac74f848e63696",
"_publish_hash": "sha256:84ee143ff4099dd93b31b0ab3d3619b1c272225de25ca2b745fbb02722563b9c",
"_publish_commit": "master:19de0ffd803ad5980446d7e6602fa138648246a4",
"_npm_package_name": "joplin-plugin-conflict-resolution"
},
"com.gitlab.BeatLink.joplin-plugin-repeating-todos": {

6
plugins/joplin-plugin-conflict-resolution/manifest.json
View File

@ -2,14 +2,14 @@
"manifest_version": 1,
"id": "joplin-plugin-conflict-resolution",
"app_min_version": "2.0.9",
"version": "1.2.1",
"version": "1.2.2",
"name": "Conflict Resolution",
"description": "A plugin that makes process of resolving conflicts easier.",
"author": "Ahmed Alwasifey",
"homepage_url": "https://discourse.joplinapp.org/t/plugin-conflict-resolution/19204",
"repository_url": "https://github.com/joplin/plugin-conflict-resolution",
"keywords": [],
"_publish_hash": "sha256:7e5a07dcab27c6c081c9ff75170e6ed8861a43c5be025ca901ad1dc69dcbeee9",
"_publish_commit": "master:8703fe0d8ec329635d683dc48eac74f848e63696",
"_publish_hash": "sha256:84ee143ff4099dd93b31b0ab3d3619b1c272225de25ca2b745fbb02722563b9c",
"_publish_commit": "master:19de0ffd803ad5980446d7e6602fa138648246a4",
"_npm_package_name": "joplin-plugin-conflict-resolution"
}

BIN
plugins/joplin-plugin-conflict-resolution/plugin.jpl
View File

Binary file not shown.