zotero/chrome/content/zotero
Dan Stillman 0061ff3ca5 Merge branch '3.0'
Conflicts:
	chrome/content/zotero/preferences/preferences.xul
	chrome/content/zotero/xpcom/data/item.js
	chrome/content/zotero/xpcom/utilities_translate.js
2013-02-04 07:02:38 -05:00
..
bindings Make date parts indicator match order in date itself 2013-01-11 22:31:27 -05:00
ingester Add type="application/javascript;version=1.8" to all JS script tags (for now) 2013-01-15 03:22:00 -05:00
integration Merge branch '3.0' 2013-02-04 07:02:38 -05:00
locale Update submodules and repotime 2012-11-18 23:27:04 -05:00
preferences Merge branch '3.0' 2013-02-04 07:02:38 -05:00
standalone Add type="application/javascript;version=1.8" to all JS script tags (for now) 2013-01-15 03:22:00 -05:00
test Add type="application/javascript;version=1.8" to all JS script tags (for now) 2013-01-15 03:22:00 -05:00
tinymce Merge branch '3.0' 2012-11-01 22:14:08 -04:00
tools Merge branch '3.0' 2013-01-31 01:51:54 -05:00
webpagedump [WebPageDump] Don't crash when @import stylesheets are null (caused by adblock) 2012-12-10 20:07:56 -06:00
xpcom Merge branch '3.0' 2013-02-04 07:02:38 -05:00
about.xul Add type="application/javascript;version=1.8" to all JS script tags (for now) 2013-01-15 03:22:00 -05:00
advancedSearch.js
advancedSearch.xul Add type="application/javascript;version=1.8" to all JS script tags (for now) 2013-01-15 03:22:00 -05:00
bibliography.js "Citations"/"Notes" instead of "Citation"/"Note" in right-click dialog 2012-11-06 01:16:03 -05:00
bibliography.xul Add type="application/javascript;version=1.8" to all JS script tags (for now) 2013-01-15 03:22:00 -05:00
browser.js Merge branch '3.0' 2012-12-19 23:16:56 -05:00
charsetMenu.js
downloadOverlay.js
downloadOverlay.xul Add type="application/javascript;version=1.8" to all JS script tags (for now) 2013-01-15 03:22:00 -05:00
duplicatesMerge.js
errorReport.xul Add type="application/javascript;version=1.8" to all JS script tags (for now) 2013-01-15 03:22:00 -05:00
exportOptions.js
exportOptions.xul Add type="application/javascript;version=1.8" to all JS script tags (for now) 2013-01-15 03:22:00 -05:00
fileInterface.js Merge branch '3.0' 2013-01-22 23:05:15 -05:00
include.js
itemPane.js Merge branch '3.0' 2012-11-20 03:22:49 -05:00
itemPane.xul Add type="application/javascript;version=1.8" to all JS script tags (for now) 2013-01-15 03:22:00 -05:00
locateManager.xul Add type="application/javascript;version=1.8" to all JS script tags (for now) 2013-01-15 03:22:00 -05:00
locateMenu.js
longTagFixer.js
longTagFixer.xul Add type="application/javascript;version=1.8" to all JS script tags (for now) 2013-01-15 03:22:00 -05:00
lookup.js Merge branch '3.0' 2012-11-01 22:14:08 -04:00
merge.js
merge.xul Add type="application/javascript;version=1.8" to all JS script tags (for now) 2013-01-15 03:22:00 -05:00
note.js
note.xul Add type="application/javascript;version=1.8" to all JS script tags (for now) 2013-01-15 03:22:00 -05:00
overlay.js
overlay.xul Add type="application/javascript;version=1.8" to all JS script tags (for now) 2013-01-15 03:22:00 -05:00
pdfProgress.xul
progressWindow.xul
proxy.js
proxy.xul Add type="application/javascript;version=1.8" to all JS script tags (for now) 2013-01-15 03:22:00 -05:00
recognizePDF.js Detect CAPTCHA 2013-01-29 17:45:57 -05:00
reportInterface.js
rtfScan.js
rtfScan.xul Add type="application/javascript;version=1.8" to all JS script tags (for now) 2013-01-15 03:22:00 -05:00
searchDialog.js
searchDialog.xul Add type="application/javascript;version=1.8" to all JS script tags (for now) 2013-01-15 03:22:00 -05:00
selectItemsDialog.js
selectItemsDialog.xul Add type="application/javascript;version=1.8" to all JS script tags (for now) 2013-01-15 03:22:00 -05:00
tab.js
tab.xul Add type="application/javascript;version=1.8" to all JS script tags (for now) 2013-01-15 03:22:00 -05:00
timelineInterface.js
updateCSL.xsl
upgrade.xul Add type="application/javascript;version=1.8" to all JS script tags (for now) 2013-01-15 03:22:00 -05:00
zoteroPane.js Merge branch '3.0' 2013-02-04 07:02:38 -05:00
zoteroPane.xul Merge branch '3.0' and modify recognizePDF.js to use promises 2013-01-21 01:04:05 -05:00