From 64d96040e6518640bec8c0d4b7b10bb26ab66ba2 Mon Sep 17 00:00:00 2001 From: frangoud Date: Tue, 2 Mar 2021 22:28:23 +0200 Subject: [PATCH] Initial commit --- .gitattributes | 2 + .gitignore | 2 + LICENSE | 4 +- README.md | 21 +- build.sh | 5 + chrome.manifest | 5 + chrome/content/options.xul | 52 +++ chrome/content/overlay.xul | 66 ++++ chrome/content/scripts/getPref.js | 0 .../content/scripts/zoteroduplicatesmerger.js | 318 ++++++++++++++++++ .../locale/en-US/duplicatesmerger.properties | 14 + chrome/locale/en-US/options.dtd | 15 + chrome/locale/en-US/options.properties | 0 chrome/locale/en-US/overlay.dtd | 17 + defaults/preferences/prefs.js | 3 + install.rdf | 34 ++ update.rdf | 21 ++ 17 files changed, 575 insertions(+), 4 deletions(-) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 build.sh create mode 100644 chrome.manifest create mode 100644 chrome/content/options.xul create mode 100644 chrome/content/overlay.xul create mode 100644 chrome/content/scripts/getPref.js create mode 100644 chrome/content/scripts/zoteroduplicatesmerger.js create mode 100644 chrome/locale/en-US/duplicatesmerger.properties create mode 100644 chrome/locale/en-US/options.dtd create mode 100644 chrome/locale/en-US/options.properties create mode 100644 chrome/locale/en-US/overlay.dtd create mode 100644 defaults/preferences/prefs.js create mode 100644 install.rdf create mode 100644 update.rdf diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..eba1110 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Auto detect text files and perform LF normalization +* text=auto \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4ffe5a6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.project +*.xpi diff --git a/LICENSE b/LICENSE index a612ad9..f4bbcd2 100644 --- a/LICENSE +++ b/LICENSE @@ -35,7 +35,7 @@ Mozilla Public License Version 2.0 means any form of the work other than Source Code Form. 1.7. "Larger Work" - means a work that combines Covered Software with other material, in + means a work that combines Covered Software with other material, in a separate file or files, that is not Covered Software. 1.8. "License" @@ -370,4 +370,4 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice --------------------------------------------------------- This Source Code Form is "Incompatible With Secondary Licenses", as - defined by the Mozilla Public License, v. 2.0. + defined by the Mozilla Public License, v. 2.0. \ No newline at end of file diff --git a/README.md b/README.md index e6c0601..97b56fd 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,19 @@ -# ZoteroDuplicatesMerger -A zotero plugin to automatically merge duplicate items +# Zotero Duplicates Merger + +This is an add-on for Zotero that automatically merges duplicated items, without having to manually go through the list. + +Please report any bugs, questions, or feature requests on the Zotero forums. + +Code for this extension is based in part [Zotero DOI Manager](https://github.com/bwiernik/zotero-shortdoi) by Brenton M. Wiernik. + +### Plugin Functions + + - Merge duplicate items automatically + o Select which of the duplicate copies will be the master one + o Select how to handle type conflicts + +### License + +Copyright (C) 2021 Fotos Frangoudes + +Distributed under the Mozilla Public License (MPL) Version 2.0. diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..1a4f9af --- /dev/null +++ b/build.sh @@ -0,0 +1,5 @@ +#!/bin/sh +echo Enter version number: +read version +rm zotero-duplicatesmerger-${version}.xpi +zip -r zotero-duplicatesmerger-${version}.xpi chrome/* defaults/* chrome.manifest install.rdf options.xul diff --git a/chrome.manifest b/chrome.manifest new file mode 100644 index 0000000..b8d203c --- /dev/null +++ b/chrome.manifest @@ -0,0 +1,5 @@ +content zoteroduplicatesmerger chrome/content/ +locale zoteroduplicatesmerger en-US chrome/locale/en-US/ +skin zoteroduplicatesmerger default chrome/skin/default/zoteroduplicatesmerger/ + +overlay chrome://zotero/content/zoteroPane.xul chrome://zoteroduplicatesmerger/content/overlay.xul \ No newline at end of file diff --git a/chrome/content/options.xul b/chrome/content/options.xul new file mode 100644 index 0000000..c7cda5f --- /dev/null +++ b/chrome/content/options.xul @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +