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

Merge branch '3.0' into 3.1

Browse source 
Conflicts:
	chrome/content/zotero/tinymce/note.html
	chrome/content/zotero/tinymce/noteview.html
	chrome/content/zotero/xpcom/zotero.js
	install.rdf
	update.rdf
This commit is contained in:
Dan Stillman 2013-02-25 12:46:43 -05:00
commit f92ed125b6
5 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
chrome/content/zotero/xpcom/integration.js
View file

@ -2155,6 +2155,9 @@ Zotero.Integration.Session.prototype.getCitationField = function(citation) {
serializeCitationItem.id = citationItem.itemData.id;
serializeCitationItem.uris = citationItem.uris;
// XXX For compatibility with older versions of Zotero; to be removed at a later date
serializeCitationItem.uri = serializeCitationItem.uris;
// always store itemData, since we have no way to get it back otherwise
serializeCitationItem.itemData = citationItem.itemData;
addSchema = true;

5
chrome/content/zotero/xpcom/itemTreeView.js
View file

@ -507,6 +507,11 @@ Zotero.ItemTreeView.prototype.notify = function(action, type, ids, extraData)
for each(var item in items) {
var id = item.id;
// Make sure row map is up to date
// if we made changes in a previous loop
if (madeChanges) {
this._refreshHashMap();
}
var row = this._itemRowMap[id];
// Deleted items get a modify that we have to ignore when

2
resource/schema/repotime.txt
View file

@ -1 +1 @@
2013-02-08 07:00:00
2013-02-19 00:25:00

2
styles

@ -1 +1 @@
Subproject commit a482d1ea39213aaebaabfa372879f41f627d8a49
Subproject commit 47c49468f4d829a43bee6c4105f83b37c91a2fb7

2
translators

@ -1 +1 @@
Subproject commit 23c54a2766497e2a5cf9103cfe44ff83b04c41b4
Subproject commit 15385de597ac53a3b5397371aa01e578e136fe62