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

Merge branch '3.0'

Browse source 
Conflicts:
	chrome/content/zotero/xpcom/attachments.js
	chrome/content/zotero/xpcom/utilities.js
This commit is contained in:
Simon Kornblith 2012-10-29 15:54:44 -04:00
commit 1ed47f4823
3 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
chrome/content/zotero/xpcom/attachments.js
View file

@ -359,6 +359,8 @@ Zotero.Attachments = new function(){
wbp.saveURI(nsIURL, null, null, null, null, file, null); wbp.saveURI(nsIURL, null, null, null, null, file, null);
} }
if(callback) callback(attachmentItem);
return attachmentItem; return attachmentItem;
} }
catch (e){ catch (e){

1
chrome/content/zotero/xpcom/data/itemFields.js
View file

@ -315,6 +315,7 @@ Zotero.ItemFields = new function() {
'archive', 'archive',
'archiveLocation', 'archiveLocation',
'language', 'language',
'programmingLanguage',
'rights', 'rights',
// TEMP - NSF // TEMP - NSF

2
translators

@ -1 +1 @@
Subproject commit f60972d26e97034438c36ef0e1d7efde3b4205ad Subproject commit a685b279c61b5c1b1368ea7997fc2b4914eedf8a