scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-09-16 23:41:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
Mirror of https://github.com/zotero/zotero.git
11978 commits 12 branches 401 tags 306 MiB
Find a file
Abe Jellinek ef82becf00
Merge attachments and update notes (#2336) 
We follow a different merge procedure for each attachment type:

- For PDF attachments, compare by MD5. If no match, get the top 50 words
  in the attachment's text and hash those, then check again for a match.
  Update references to item keys in notes and annotations.
- For web (snapshot / link) attachments, compare by title and URL.
  Prefer a title + URL match but accept a title-only match.
- For other attachment types, keep all attachments from all items being
  merged.

Also:

- Move most merge tests from Duplicates to Items#merge(). It just doesn't
  make sense to worry about the UI in these.
2022-03-09 17:26:26 -05:00
.github CI: Temporarily disable NPM cache due to a bug in the setup-node action 2021-07-22 04:46:10 -04:00
chrome Merge attachments and update notes (#2336) 2022-03-09 17:26:26 -05:00
components Remove note backup functionality 2022-03-05 06:12:29 -05:00
defaults/preferences Overhaul Scaffold (#2293) 2022-03-02 22:36:04 -05:00
note-editor@a3f0ea4ac9 Remove note backup functionality 2022-03-05 06:12:29 -05:00
pdf-reader@b97d62e02b Allow to Quick Copy annotations (#2377) 2022-03-04 03:52:23 -05:00
pdf-worker@1820c525da Update pdf-worker submodule 2022-03-09 04:02:51 -05:00
resource Add Preprint item type 2022-03-05 02:03:29 -05:00
scripts Overhaul Scaffold (#2293) 2022-03-02 22:36:04 -05:00
scss HTML Tree: Add a dotted border to pivot rows (#2375) 2022-03-02 05:41:59 -05:00
styles@085f270569 Update submodules 2022-02-19 13:53:03 -05:00
test Merge attachments and update notes (#2336) 2022-03-09 17:26:26 -05:00
translators@9d3c8688ea Update translators 2022-03-02 22:36:45 -05:00
.babelrc Add @babel/plugin-proposal-unicode-property-regex 2021-08-22 04:07:33 -04:00
.eslintignore ESLint: Ignore additional files 2019-02-26 06:07:54 -05:00
.eslintrc Update Babel and ESLint 2021-12-23 04:58:11 -05:00
.gitattributes Fix enforcing of Unix newlines for SQL files 2016-02-26 18:37:44 -05:00
.gitignore Cache PDF tools in the source directory between test runs 2018-01-18 19:24:09 -05:00
.gitmodules Remove shallow=true for translate and utilities submodules 2021-08-04 20:20:54 -04:00
chrome.manifest Add Greek locale 2022-02-19 14:18:50 -05:00
CONTRIBUTING.md Update CONTRIBUTING.md 2018-11-04 01:31:10 -04:00
COPYING Update COPYING 2018-03-26 11:27:48 +02:00
install.rdf Bump version to 6.0 2022-02-05 03:17:51 -05:00
package-lock.json Overhaul Scaffold (#2293) 2022-03-02 22:36:04 -05:00
package.json Overhaul Scaffold (#2293) 2022-03-02 22:36:04 -05:00
README.md Merge branch '4.0' 2015-11-01 21:22:13 -05:00
update.rdf Update Fx minVersion to 45 2016-12-13 09:12:55 -05:00

README.md

Zotero

Build Status

Zotero is a free, easy-to-use tool to help you collect, organize, cite, and share your research sources.

Please post feature requests or bug reports to the Zotero Forums. If you're having trouble with Zotero, see Getting Help.

For more information on how to use this source code, see the Zotero wiki.