Mirror of https://github.com/zotero/zotero.git

Dan Stillman 2d5d157fda Removed incorrect check causing "Local [object] 1 not in update array" error ... The remote object could legitimately not have been updated locally since the last sync if the server data was cleared and synched from a different client, potentially resulting in a different key condition on sync. The two sides should now be properly merged (at least in theory).		2008-07-13 07:31:20 +00:00
chrome	Removed incorrect check causing "Local [object] 1 not in update array" error	2008-07-13 07:31:20 +00:00
components	Addresses #1057, Won't start on Windows	2008-07-03 16:44:52 +00:00
csl	Correct macros	2008-07-10 16:34:21 +00:00
defaults/preferences	Auto-sync on first open of Zotero pane after starting Firefox	2008-07-01 20:39:20 +00:00
scripts	Adds rudimentary Zeroconf support to Zotero (a.k.a. "Z(ot)eroconf")	2008-06-03 05:26:30 +00:00
chrome.manifest	Merged revisions 2710-2712,2714-2716,2718-2728,2730-2731,2734,2736-2738,2740-2750,2752-2753,2755,2758-2768,2770-2779,2782,2789-2790,2794,2797-2802,2804,2808-2810,2812,2814-2824,2826-2832,2834-2835 via svnmerge from 1.0 branch	2008-06-11 08:55:59 +00:00
install.rdf	For nightlies	2008-06-11 07:50:37 +00:00
license.txt	Closes #63, Add ECL license info to source code	2006-10-04 17:16:56 +00:00
scrapers.sql	Merged revisions 2890,2895-2896,2898,2900-2901,2905,2909-2911,2913,2916-2917,2919,2922,2936-2937,2953-2954,2957,2959,2962-2965,2969-2970,2973-2975,2979-2980,2983 via svnmerge from 1.0 branch	2008-07-07 15:18:49 +00:00
system.sql	- Fixes tag editing	2008-06-16 05:46:10 +00:00
triggers.sql	- Saved search syncing, with automatic latest-wins conflict resolution	2008-06-02 09:15:43 +00:00
update.rdf	Version and compatibility bump	2007-10-23 07:36:23 +00:00
userdata.sql	Update userdata version	2008-07-08 16:27:24 +00:00