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 0aecaad761 Update conflict resolution for API syncing
This will appear much less frequently, since non-conflicting field changes on
both sides can be resolved automatically, but genuine field conflicts still
require manual conflict resolution.

The merge pane is no longer editable, since the itembox code to do that is
async and can't run in a modal window, but it's not really necessary,
particularly with conflicts happening less frequently.

TODO:

- Remote item deletions
- File conflicts
- Maybe handle some edge cases where the conflicted items fail to save
2015-08-06 04:14:49 -04:00
chrome Update conflict resolution for API syncing 2015-08-06 04:14:49 -04:00
components API syncing megacommit 2015-07-20 18:16:57 -04:00
defaults/preferences Merge branch '4.0' 2015-06-27 16:59:58 -04:00
resource Update conflict resolution for API syncing 2015-08-06 04:14:49 -04:00
styles@5a9216bcb3 Update versions and submodules 2015-06-26 02:40:18 -04:00
test Update conflict resolution for API syncing 2015-08-06 04:14:49 -04:00
translators@5153df8b6e Update translators 2015-07-12 23:57:58 -04:00
.gitmodules Unit testing infrastructure 2015-03-07 16:34:55 -05:00
.travis.yml Reenable Travis testing 2015-05-19 04:07:45 -04: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 Update versions 2015-07-10 17:51:08 -04:00
README.md Update Travis badge for master branch 2015-05-22 03:00:58 -04:00
update.rdf Update versions 2015-07-10 17:51:08 -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.