mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/connector' into 4.0

Browse source
This commit is contained in:
Simon Kornblith 2015-03-14 18:32:54 -04:00
commit b4142342a5
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chrome/content/zotero/xpcom/connector/cachedTypes.js
View file

@ -87,7 +87,7 @@ Zotero.Connector_Types = new function() {
} else if(Zotero.isChrome) { } else if(Zotero.isChrome) {
return chrome.extension.getURL("images/"+icon); return chrome.extension.getURL("images/"+icon);
} else if(Zotero.isSafari) { } else if(Zotero.isSafari) {
return safari.extension.baseURI+"images/itemTypes/"+icon; return safari.extension.baseURI+"images/"+icon;
} }
}; };
} }

2
install.rdf
View file

@ -6,7 +6,7 @@
<em:id>zotero@chnm.gmu.edu</em:id> <em:id>zotero@chnm.gmu.edu</em:id>
<em:name>Zotero</em:name> <em:name>Zotero</em:name>
<em:version>4.0.26.SOURCE</em:version> <em:version>4.0.26.1.SOURCE</em:version>
<em:creator>Center for History and New Media<br/>George Mason University</em:creator> <em:creator>Center for History and New Media<br/>George Mason University</em:creator>
<em:contributor>Dan Cohen</em:contributor> <em:contributor>Dan Cohen</em:contributor>
<em:contributor>Sean Takats</em:contributor> <em:contributor>Sean Takats</em:contributor>

2
resource/config.js
View file

@ -14,7 +14,7 @@ var ZOTERO_CONFIG = {
BOOKMARKLET_ORIGIN: 'https://www.zotero.org', BOOKMARKLET_ORIGIN: 'https://www.zotero.org',
HTTP_BOOKMARKLET_ORIGIN: 'http://www.zotero.org', HTTP_BOOKMARKLET_ORIGIN: 'http://www.zotero.org',
BOOKMARKLET_URL: 'https://www.zotero.org/bookmarklet/', BOOKMARKLET_URL: 'https://www.zotero.org/bookmarklet/',
VERSION: '4.0.26.SOURCE' VERSION: '4.0.26.1.SOURCE'
}; };
EXPORTED_SYMBOLS = ["ZOTERO_CONFIG"]; EXPORTED_SYMBOLS = ["ZOTERO_CONFIG"];

2
update.rdf
View file

@ -7,7 +7,7 @@
<RDF:Seq> <RDF:Seq>
<RDF:li> <RDF:li>
<RDF:Description> <RDF:Description>
<version>4.0.26.SOURCE</version> <version>4.0.26.1.SOURCE</version>
<targetApplication> <targetApplication>
<RDF:Description> <RDF:Description>
<id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</id> <id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</id>