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

Dan Stillman bd070f7b63 - Adds file conflict resolution -- not particularly attractive at the moment, and no Apply to All button, but possibly functional ... - Fixes file syncing after editing a file locally - Fixes a few storage bugs that could result in eternal spinning, invalid percentages, and other unpleasantries - Made the attachment display box more flexible, including a filename field that we may or may not want to keep in the main view		2009-01-15 06:58:06 +00:00
chrome	- Adds file conflict resolution -- not particularly attractive at the moment, and no Apply to All button, but possibly functional	2009-01-15 06:58:06 +00:00
components	Merge [3617-3838] from branch to trunk	2008-11-30 20:18:48 +00:00
defaults/preferences	Merge [3617-3838] from branch to trunk	2008-11-30 20:18:48 +00:00
scripts	Adds rudimentary Zeroconf support to Zotero (a.k.a. "Z(ot)eroconf")	2008-06-03 05:26:30 +00:00
styles	Add ASA style to trunk	2008-11-10 03:56:23 +00:00
translators	Addresses #1242, incorporated santaworts code, still some issues with PDF download	2009-01-15 03:34:39 +00:00
chrome.manifest	Merged revisions 3080-3081,3084,3087-3088,3090,3092,3099-3103,3113-3114,3132,3134-3143,3145,3148-3151,3154-3159,3165,3174,3194,3234-3235,3239-3240,3244,3246-3254,3258-3262,3268,3270,3274,3279,3286-3288,3294-3295 from 1.0 branch via svnmerge	2008-09-01 01:54:00 +00:00
install.rdf	Update maxVersion to 3.1b3pre on trunk and branch	2008-12-04 17:06:05 +00:00
license.txt	Closes #63, Add ECL license info to source code	2006-10-04 17:16:56 +00:00
repotime.txt	Pushed updated The Economist translator that fixes single-page saves, while we figure out what's wrong with the processDocuments() call	2009-01-12 23:40:06 +00:00
system.sql	- Fixes tag editing	2008-06-16 05:46:10 +00:00
triggers.sql	- Fix inability to add existing tags to item	2008-08-15 05:32:18 +00:00
update.rdf	Update maxVersion to 3.1b3pre on trunk and branch	2008-12-04 17:06:05 +00:00
userdata.sql	- Add automatic merging of collection and tag metadata and associated items, with warning alerts (eventually to be converted to logged notifications)	2008-12-27 05:42:52 +00:00