From 81f67d0ef9dc0f69f2742dd273e1baf58ebdfbaf Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 18 Feb 2013 03:50:24 -0500
Subject: [PATCH 1/7] Fix Firefox charset warning displaying note editor

---
 chrome/content/zotero/tinymce/note.html     | 1 +
 chrome/content/zotero/tinymce/noteview.html | 1 +
 2 files changed, 2 insertions(+)
diff --git a/chrome/content/zotero/tinymce/note.html b/chrome/content/zotero/tinymce/note.html
index b93b7744d7..a815524b43 100755
--- a/chrome/content/zotero/tinymce/note.html
+++ b/chrome/content/zotero/tinymce/note.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
+<meta charset="UTF-8">
 <link type="text/css" rel="stylesheet" href="css/note-ui.css"/>
 <script type="text/javascript;version=1.8" src="tiny_mce.js"></script>
 <script type="text/javascript;version=1.8">
diff --git a/chrome/content/zotero/tinymce/noteview.html b/chrome/content/zotero/tinymce/noteview.html
index bf457f533f..56cdfd5a99 100644
--- a/chrome/content/zotero/tinymce/noteview.html
+++ b/chrome/content/zotero/tinymce/noteview.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
+<meta charset="UTF-8">
 <title>TinyMCE</title>
 <link type="text/css" rel="stylesheet" href="css/note-ui.css"/>
 <style>

From 82a8d9e2aeca229161f83253dd9a01bff453053d Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 18 Feb 2013 04:59:16 -0500
Subject: [PATCH 2/7] Fix items list freezing in some situations

---
 chrome/content/zotero/xpcom/itemTreeView.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js
index 7144dc91b5..f9d43da8ae 100644
--- a/chrome/content/zotero/xpcom/itemTreeView.js
+++ b/chrome/content/zotero/xpcom/itemTreeView.js
@@ -481,6 +481,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

From 8f5145f5554fdea66af2a8c935cc1bb295b88e40 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 18 Feb 2013 05:02:25 -0500
Subject: [PATCH 3/7] Version bump

---
 chrome/content/zotero/xpcom/zotero.js | 2 +-
 install.rdf                           | 4 ++--
 update.rdf                            | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index 724f2495c7..2cce9f2f02 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -35,7 +35,7 @@ const ZOTERO_CONFIG = {
 	API_URL: 'https://api.zotero.org/',
 	PREF_BRANCH: 'extensions.zotero.',
 	BOOKMARKLET_URL: 'https://www.zotero.org/bookmarklet/',
-	VERSION: "3.0.13.SOURCE"
+	VERSION: "3.0.14.SOURCE"
 };
 
 /*
diff --git a/install.rdf b/install.rdf
index b6723d4888..cc4787bcd1 100644
--- a/install.rdf
+++ b/install.rdf
@@ -6,7 +6,7 @@
   
     <em:id>zotero@chnm.gmu.edu</em:id>
     <em:name>Zotero</em:name>
-    <em:version>3.0.13.SOURCE</em:version>
+    <em:version>3.0.14.SOURCE</em:version>
     <em:creator>Center for History and New Media<br/>George Mason University</em:creator>
     <em:contributor>Dan Cohen</em:contributor>
     <em:contributor>Sean Takats</em:contributor>
@@ -26,7 +26,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>5.0</em:minVersion>
-        <em:maxVersion>18.*</em:maxVersion>
+        <em:maxVersion>19.*</em:maxVersion>
       </Description>
     </em:targetApplication>
     
diff --git a/update.rdf b/update.rdf
index 1e4eea52d0..25826d8ab8 100644
--- a/update.rdf
+++ b/update.rdf
@@ -7,12 +7,12 @@
     <RDF:Seq>
       <RDF:li>
         <RDF:Description>
-          <version>3.0.13.SOURCE</version>
+          <version>3.0.14.SOURCE</version>
           <targetApplication>
             <RDF:Description>
               <id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</id>
               <minVersion>5.0</minVersion>
-              <maxVersion>18.*</maxVersion>
+              <maxVersion>19.*</maxVersion>
               <updateLink>http://download.zotero.org/extension/zotero.xpi</updateLink>
               <updateHash>sha1:</updateHash>
             </RDF:Description>

From ab2cbb0808c58a73416fd3a24614bcd269d30882 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Mon, 18 Feb 2013 17:21:06 -0500
Subject: [PATCH 4/7] Avoid some unnecessary citation updates

---
 chrome/content/zotero/xpcom/integration.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
index aa0841a82c..2b7bb94718 100644
--- a/chrome/content/zotero/xpcom/integration.js
+++ b/chrome/content/zotero/xpcom/integration.js
@@ -2181,6 +2181,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;

From 8f263d0fd9a9a67eca43b6febd99be9d727ffdbf Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 18 Feb 2013 23:53:40 -0500
Subject: [PATCH 5/7] Update submodules and repotime

---
 repotime.txt | 2 +-
 styles       | 2 +-
 translators  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/repotime.txt b/repotime.txt
index a8de5f4a05..4371ce1103 100644
--- a/repotime.txt
+++ b/repotime.txt
@@ -1 +1 @@
-2013-02-08 07:00:00
+2013-02-19 00:25:00
diff --git a/styles b/styles
index a482d1ea39..47c49468f4 160000
--- a/styles
+++ b/styles
@@ -1 +1 @@
-Subproject commit a482d1ea39213aaebaabfa372879f41f627d8a49
+Subproject commit 47c49468f4d829a43bee6c4105f83b37c91a2fb7
diff --git a/translators b/translators
index 23c54a2766..15385de597 160000
--- a/translators
+++ b/translators
@@ -1 +1 @@
-Subproject commit 23c54a2766497e2a5cf9103cfe44ff83b04c41b4
+Subproject commit 15385de597ac53a3b5397371aa01e578e136fe62

From 42f9aaa8a1356d4ed6371405f2f77e515734c13d Mon Sep 17 00:00:00 2001
From: Aurimas Vinckevicius <aurimas.dev@gmail.com>
Date: Sat, 23 Feb 2013 19:25:06 -0600
Subject: [PATCH 6/7] Tweaks to duplicate detection

---
 chrome/content/zotero/xpcom/duplicates.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/chrome/content/zotero/xpcom/duplicates.js b/chrome/content/zotero/xpcom/duplicates.js
index 79953538ae..a9ffa96149 100644
--- a/chrome/content/zotero/xpcom/duplicates.js
+++ b/chrome/content/zotero/xpcom/duplicates.js
@@ -117,8 +117,8 @@ Zotero.Duplicates.prototype._findDuplicates = function () {
 		}
 		
 		str = Zotero.Utilities.removeDiacritics(str)
-			.replace(/[!-/:-@[-`{-~]/g, ' ') // Convert (ASCII) punctuation to spaces
-			.replace(/ +/, ' ') // Normalize spaces
+			.replace(/[ !-/:-@[-`{-~]+/g, ' ') // Convert (ASCII) punctuation to spaces
+			.trim()
 			.toLowerCase();
 		
 		return str;
@@ -194,7 +194,7 @@ Zotero.Duplicates.prototype._findDuplicates = function () {
 	var isbnCache = {};
 	if (rows) {
 		for each(var row in rows) {
-			isbnCache[row.itemID] = row.value;
+			isbnCache[row.itemID] = row.value.replace(/[^\dX]+/ig, '').toUpperCase(); //ignore formatting
 		}
 	}
 	processRows();
@@ -209,7 +209,7 @@ Zotero.Duplicates.prototype._findDuplicates = function () {
 	var doiCache = {};
 	if (rows) {
 		for each(var row in rows) {
-			doiCache[row.itemID] = row.value;
+			doiCache[row.itemID] = row.value.trim();
 		}
 	}
 	processRows();
@@ -279,6 +279,7 @@ Zotero.Duplicates.prototype._findDuplicates = function () {
 		}
 		
 		// Check for at least one match on last name + first initial of first name
+		var aCreatorRows, bCreatorRows;
 		if (typeof creatorRowsCache[a.itemID] != 'undefined') {
 			aCreatorRows = creatorRowsCache[a.itemID];
 		}
@@ -287,7 +288,7 @@ Zotero.Duplicates.prototype._findDuplicates = function () {
 						+ "JOIN creators USING (creatorID) "
 						+ "JOIN creatorData USING (creatorDataID) "
 						+ "WHERE itemID=? ORDER BY orderIndex LIMIT 10";
-			var aCreatorRows = Zotero.DB.query(sql, a.itemID);
+			aCreatorRows = Zotero.DB.query(sql, a.itemID);
 			creatorRowsCache[a.itemID] = aCreatorRows;
 		}
 		
@@ -300,12 +301,12 @@ Zotero.Duplicates.prototype._findDuplicates = function () {
 						+ "JOIN creators USING (creatorID) "
 						+ "JOIN creatorData USING (creatorDataID) "
 						+ "WHERE itemID=? ORDER BY orderIndex LIMIT 10";
-			var bCreatorRows = Zotero.DB.query(sql, b.itemID);
+			bCreatorRows = Zotero.DB.query(sql, b.itemID);
 			creatorRowsCache[b.itemID] = bCreatorRows;
 		}
 		
 		// Match if no creators
-		if (!aCreatorRows && !bCreatorRows.length) {
+		if (!aCreatorRows && !bCreatorRows) {
 			return 1;
 		}
 		
@@ -315,11 +316,11 @@ Zotero.Duplicates.prototype._findDuplicates = function () {
 		
 		for each(var aCreatorRow in aCreatorRows) {
 			var aLastName = normalizeString(aCreatorRow.lastName);
-			var aFirstInitial = aCreatorRow.fieldMode == 0 ? normalizeString(aCreatorRow.firstName.substr(1)) : false;
+			var aFirstInitial = aCreatorRow.fieldMode == 0 ? normalizeString(aCreatorRow.firstName).charAt(0) : false;
 			
 			for each(var bCreatorRow in bCreatorRows) {
 				var bLastName = normalizeString(bCreatorRow.lastName);
-				var bFirstInitial = bCreatorRow.fieldMode == 0 ? normalizeString(bCreatorRow.firstName.substr(1)) : false;
+				var bFirstInitial = bCreatorRow.fieldMode == 0 ? normalizeString(bCreatorRow.firstName).charAt(0) : false;
 				
 				if (aLastName === bLastName && aFirstInitial === bFirstInitial) {
 					return 1;

From 475b290600f630257a9cc5e4d8367b9a015756e6 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sun, 24 Feb 2013 03:39:14 -0500
Subject: [PATCH 7/7] Revert "Merge pull request #252 from aurimasv/patch-1"

This reverts commit d2e42bda299c2e16fe88a08c0378bf6008146903, reversing
changes made to 8f263d0fd9a9a67eca43b6febd99be9d727ffdbf.
---
 chrome/content/zotero/xpcom/duplicates.js | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/chrome/content/zotero/xpcom/duplicates.js b/chrome/content/zotero/xpcom/duplicates.js
index a9ffa96149..79953538ae 100644
--- a/chrome/content/zotero/xpcom/duplicates.js
+++ b/chrome/content/zotero/xpcom/duplicates.js
@@ -117,8 +117,8 @@ Zotero.Duplicates.prototype._findDuplicates = function () {
 		}
 		
 		str = Zotero.Utilities.removeDiacritics(str)
-			.replace(/[ !-/:-@[-`{-~]+/g, ' ') // Convert (ASCII) punctuation to spaces
-			.trim()
+			.replace(/[!-/:-@[-`{-~]/g, ' ') // Convert (ASCII) punctuation to spaces
+			.replace(/ +/, ' ') // Normalize spaces
 			.toLowerCase();
 		
 		return str;
@@ -194,7 +194,7 @@ Zotero.Duplicates.prototype._findDuplicates = function () {
 	var isbnCache = {};
 	if (rows) {
 		for each(var row in rows) {
-			isbnCache[row.itemID] = row.value.replace(/[^\dX]+/ig, '').toUpperCase(); //ignore formatting
+			isbnCache[row.itemID] = row.value;
 		}
 	}
 	processRows();
@@ -209,7 +209,7 @@ Zotero.Duplicates.prototype._findDuplicates = function () {
 	var doiCache = {};
 	if (rows) {
 		for each(var row in rows) {
-			doiCache[row.itemID] = row.value.trim();
+			doiCache[row.itemID] = row.value;
 		}
 	}
 	processRows();
@@ -279,7 +279,6 @@ Zotero.Duplicates.prototype._findDuplicates = function () {
 		}
 		
 		// Check for at least one match on last name + first initial of first name
-		var aCreatorRows, bCreatorRows;
 		if (typeof creatorRowsCache[a.itemID] != 'undefined') {
 			aCreatorRows = creatorRowsCache[a.itemID];
 		}
@@ -288,7 +287,7 @@ Zotero.Duplicates.prototype._findDuplicates = function () {
 						+ "JOIN creators USING (creatorID) "
 						+ "JOIN creatorData USING (creatorDataID) "
 						+ "WHERE itemID=? ORDER BY orderIndex LIMIT 10";
-			aCreatorRows = Zotero.DB.query(sql, a.itemID);
+			var aCreatorRows = Zotero.DB.query(sql, a.itemID);
 			creatorRowsCache[a.itemID] = aCreatorRows;
 		}
 		
@@ -301,12 +300,12 @@ Zotero.Duplicates.prototype._findDuplicates = function () {
 						+ "JOIN creators USING (creatorID) "
 						+ "JOIN creatorData USING (creatorDataID) "
 						+ "WHERE itemID=? ORDER BY orderIndex LIMIT 10";
-			bCreatorRows = Zotero.DB.query(sql, b.itemID);
+			var bCreatorRows = Zotero.DB.query(sql, b.itemID);
 			creatorRowsCache[b.itemID] = bCreatorRows;
 		}
 		
 		// Match if no creators
-		if (!aCreatorRows && !bCreatorRows) {
+		if (!aCreatorRows && !bCreatorRows.length) {
 			return 1;
 		}
 		
@@ -316,11 +315,11 @@ Zotero.Duplicates.prototype._findDuplicates = function () {
 		
 		for each(var aCreatorRow in aCreatorRows) {
 			var aLastName = normalizeString(aCreatorRow.lastName);
-			var aFirstInitial = aCreatorRow.fieldMode == 0 ? normalizeString(aCreatorRow.firstName).charAt(0) : false;
+			var aFirstInitial = aCreatorRow.fieldMode == 0 ? normalizeString(aCreatorRow.firstName.substr(1)) : false;
 			
 			for each(var bCreatorRow in bCreatorRows) {
 				var bLastName = normalizeString(bCreatorRow.lastName);
-				var bFirstInitial = bCreatorRow.fieldMode == 0 ? normalizeString(bCreatorRow.firstName).charAt(0) : false;
+				var bFirstInitial = bCreatorRow.fieldMode == 0 ? normalizeString(bCreatorRow.firstName.substr(1)) : false;
 				
 				if (aLastName === bLastName && aFirstInitial === bFirstInitial) {
 					return 1;
