Zotero is a free, easy-to-use tool to help you collect, organize, cite, and share your research sources.
Go to file
Dan Stillman abaa4da5ab Much better data object change detection
Replace Z.DataObjects::diff() with Z.DataObjectUtilities.diff(). Instead
of just returning two objects with the differing fields, the new diff()
generates a changeset with operations to apply with applyChanges(),
including at the array member level for collections and tags. This,
combined with cached pristine copies of objects, will allow for vastly
better conflict resolution, with automatic merging of non-conflicting
changes.

Creators currently don't show granular changes, and ordering might make
it too tough to do so. Relations diffing isn't yet implemented.
2015-05-19 01:17:12 -04:00
chrome Much better data object change detection 2015-05-19 01:17:12 -04:00
components Add -b option to skip translator/style installation in tests 2015-04-16 20:50:15 -04:00
defaults/preferences Remove default for lastViewedFolder pref 2015-05-13 11:20:12 -04:00
resource Include running function in current count in ConcurrentCaller log line 2015-05-15 01:47:20 -04:00
styles@188e5914c7 Update submodules, repotime, and versions 2015-02-10 00:13:42 -05:00
test Much better data object change detection 2015-05-19 01:17:12 -04:00
translators@daa1a05939 Update translators 2015-02-10 22:52:53 -05:00
.gitmodules Unit testing infrastructure 2015-03-07 16:34:55 -05:00
chrome.manifest Add Ukrainian locale 2014-05-16 14:51:49 -04:00
COPYING Switch client code license to Affero GPL version 3 2011-05-18 18:34:22 +00:00
install.rdf Merge branch '4.0' into api_syncing 2015-04-13 02:01:43 -04:00
README.md Add Travis status to README.md 2015-03-09 20:03:06 -04:00
update.rdf Merge branch '4.0' into api_syncing 2015-04-13 02:01:43 -04:00

Zotero

Build Status

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

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