CI to automate build of zotero tarball for zotero aport https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/testing/zotero
Find a file
Dan Stillman 083588e211 Save correct data to cache when merging non-conflicting sync changes
When non-conflicting changes were automatically merged, the local object
would be correctly marked as unsynced, but the merged object rather than
the remote object would be saved to the sync cache. When the object was
then uploaded, it matched the cache version exactly, so an empty patch
object (other than an unchanged dateModified, which is always included)
would be uploaded and the local change wouldn't make it to the server.
The empty patch would result in an 'unchanged' response, which would
cause the empty patch object to be saved to the sync cache (which is a
bug that I'll fix separately). If the local object was modified again,
the patch would include all fields (since the cache object was empty)
and the local change would be uploaded, but there could also be
unnecessary conflicts due to it looking like all local fields had been
modified.

This patch causes the remote object to be saved to the sync cache
instead, so the local change looks like a local edit and is correctly
uploaded.
2020-04-13 03:42:28 -04:00
.github Update issue template 2019-01-25 17:07:14 -05:00
chrome Save correct data to cache when merging non-conflicting sync changes 2020-04-13 03:42:28 -04:00
components Fix zotero://open-pdf links on Windows if no handler is set in registry 2020-02-09 14:07:11 -05:00
defaults/preferences Add extensions.zotero.reopenPanesOnRestart hidden pref 2019-11-21 23:51:37 -07:00
resource Update translators 2020-03-23 16:05:26 -04:00
scripts Reactify item tags box 2019-11-08 06:41:06 -05:00
scss Fix size of Add button in React tags box 2019-11-30 00:50:02 -07:00
styles@653221fcee Update submodules 2020-03-24 14:13:21 -04:00
test Save correct data to cache when merging non-conflicting sync changes 2020-04-13 03:42:28 -04:00
translators@f0c32b0f8a Update translators 2020-03-23 16:05:26 -04:00
.babelrc Don't convert tabs to spaces in Scaffold templates 2020-04-09 01:28:08 -04:00
.eslintignore ESLint: Ignore additional files 2019-02-26 06:07:54 -05:00
.eslintrc Add separate .eslintrc for tests 2019-09-16 01:28:52 -04: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 Update submodules 2019-12-01 01:51:55 -07:00
.travis.yml Use Firefox 60.9.0esr build in Travis 2019-10-24 01:59:50 -04:00
chrome.manifest Update schema submodule and document chrome.manifest locale dependencies 2020-01-18 17:37:32 -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 Update version 2020-03-24 14:13:21 -04:00
package-lock.json Update 'colors' package 2019-12-23 05:01:17 -05:00
package.json Update 'colors' package 2019-12-23 05:01:17 -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

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.