Zotero is a free, easy-to-use tool to help you collect, organize, cite, and share your research sources.
Go to file
Dan Stillman d5b2f67afa Automatically resolve item deletion/trash conflicts
If the item was deleted on one side and moved to the trash on the other,
just delete the item on the trash side. Since trash emptying happens
automatically, this would otherwise result in a conflict even if the
user carefully avoided making changes before a manual sync.
2016-07-30 23:03:30 -04:00
chrome Automatically resolve item deletion/trash conflicts 2016-07-30 23:03:30 -04:00
components Set Zotero.automatedTest flag instead of .noUserInput on Travis 2016-06-24 18:28:32 -04:00
defaults/preferences Add a second horizontal layout to Zotero for small screens (#1010) 2016-05-27 20:57:29 -04:00
resource Merge branch '4.0' 2016-06-06 16:42:39 -04:00
styles@b354fbecbd Update submodules 2016-06-06 16:14:21 -04:00
test Automatically resolve item deletion/trash conflicts 2016-07-30 23:03:30 -04:00
translators@7ea3b45ac1 Update submodules 2016-06-06 16:14:21 -04:00
.gitattributes Fix enforcing of Unix newlines for SQL files 2016-02-26 18:37:44 -05:00
.gitmodules Add Chai-as-Promised 2015-09-18 03:34:03 -05:00
.travis.yml Only test against stable Firefox for now 2016-06-23 05:41:46 -04:00
chrome.manifest Add Ukrainian locale 2014-05-16 14:51:49 -04:00
CONTRIBUTING.md Create CONTRIBUTING.md 2016-02-08 19:28:05 -05:00
COPYING Switch client code license to Affero GPL version 3 2011-05-18 18:34:22 +00:00
install.rdf Remove "alpha" from version number (handled by build script) 2016-03-20 15:00:38 -04:00
README.md Merge branch '4.0' 2015-11-01 21:22:13 -05:00
update.rdf Remove "alpha" from version number (handled by build script) 2016-03-20 15:00:38 -04: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.