From 56c0933af083a2ea477e0c2793853218a663187c Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 2 May 2016 22:39:57 -0400 Subject: [PATCH 1/6] Update version --- install.rdf | 2 +- resource/config.js | 2 +- update.rdf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install.rdf b/install.rdf index dc8a9d80b3..2033fcddb2 100644 --- a/install.rdf +++ b/install.rdf @@ -6,7 +6,7 @@ zotero@chnm.gmu.edu Zotero - 4.0.29.8.SOURCE + 4.0.29.9.SOURCE Center for History and New Media
George Mason University Dan Cohen Sean Takats diff --git a/resource/config.js b/resource/config.js index 05a7557b40..355a17ae6b 100644 --- a/resource/config.js +++ b/resource/config.js @@ -15,7 +15,7 @@ var ZOTERO_CONFIG = { BOOKMARKLET_ORIGIN: 'https://www.zotero.org', HTTP_BOOKMARKLET_ORIGIN: 'http://www.zotero.org', BOOKMARKLET_URL: 'https://www.zotero.org/bookmarklet/', - VERSION: '4.0.29.8.SOURCE' + VERSION: '4.0.29.9.SOURCE' }; EXPORTED_SYMBOLS = ["ZOTERO_CONFIG"]; diff --git a/update.rdf b/update.rdf index f3f70604cd..4ff13ebab5 100644 --- a/update.rdf +++ b/update.rdf @@ -7,7 +7,7 @@ - 4.0.29.8.SOURCE + 4.0.29.9.SOURCE {ec8030f7-c20a-464f-9b0e-13a3a9e97384} From 797f00ab7cb82ab43bf6c9be98c25832db7b32e2 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 2 May 2016 22:41:52 -0400 Subject: [PATCH 2/6] Update translators --- resource/schema/repotime.txt | 2 +- translators | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resource/schema/repotime.txt b/resource/schema/repotime.txt index 9265a5974d..d26462968d 100644 --- a/resource/schema/repotime.txt +++ b/resource/schema/repotime.txt @@ -1 +1 @@ -2016-04-12 04:26:00 +2016-04-27 15:10:00 diff --git a/translators b/translators index c834d84780..155dfa3555 160000 --- a/translators +++ b/translators @@ -1 +1 @@ -Subproject commit c834d847805f030afe3c38c4ad92f135faf01a4d +Subproject commit 155dfa3555e522fd991f5095c19dbe5460b74662 From 151c066043e763bd8df2c00a5a8ad86bd14cafc3 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 2 May 2016 22:44:10 -0400 Subject: [PATCH 3/6] Update styles --- styles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles b/styles index 2a33b37ec4..a154cf5d27 160000 --- a/styles +++ b/styles @@ -1 +1 @@ -Subproject commit 2a33b37ec422fa00f2a860d906120357f23574a0 +Subproject commit a154cf5d27d61b137ce41a663b53c92c936e2441 From c7c271f2c44148e7da15a8b155808c4dbe387967 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sat, 7 May 2016 13:17:57 -0400 Subject: [PATCH 4/6] Fix CSL editor in Firefox 46 --- chrome/content/zotero/tools/csledit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/zotero/tools/csledit.js b/chrome/content/zotero/tools/csledit.js index 5234ec5aa0..e90cb29fd9 100644 --- a/chrome/content/zotero/tools/csledit.js +++ b/chrome/content/zotero/tools/csledit.js @@ -176,7 +176,7 @@ var Zotero_CSL_Editor = new function() { throw e; } - var itemIds = [items[i].id for (i in items)]; + var itemIds = items.map(item => item.id); styleEngine.updateItems(itemIds); From e5edd12371480fc2e568e63a9a10aa21e4f11763 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sat, 7 May 2016 13:18:22 -0400 Subject: [PATCH 5/6] RTF Scan fixes - Firefox 46 compatibility - Stretched progress meters Partial backport of c5716a395f0ae42e46d7d1cccf40e2d9f9e06ed0 --- chrome/content/zotero/rtfScan.js | 4 +++- chrome/content/zotero/rtfScan.xul | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/chrome/content/zotero/rtfScan.js b/chrome/content/zotero/rtfScan.js index ffa9cc7884..d4c4b5cbd9 100644 --- a/chrome/content/zotero/rtfScan.js +++ b/chrome/content/zotero/rtfScan.js @@ -341,7 +341,9 @@ var Zotero_RTFScan = new function() { var m = initialRe.exec(firstName); if(m) { var initials = firstName.replace(/[^A-Z]/g, ""); - var itemInitials = [name[0].toUpperCase() for each (name in itemCreator.ref.firstName.split(/ +/g))].join(""); + var itemInitials = itemCreator.firstName.split(/ +/g) + .map(name => name[0].toUpperCase()) + .join(""); if(initials != itemInitials) return false; } else { // not all initials; verify that the first name matches diff --git a/chrome/content/zotero/rtfScan.xul b/chrome/content/zotero/rtfScan.xul index 1c533101d5..1b83e42ad8 100644 --- a/chrome/content/zotero/rtfScan.xul +++ b/chrome/content/zotero/rtfScan.xul @@ -45,7 +45,7 @@ &zotero.rtfScan.scanPage.description; - + &zotero.rtfScan.formatPage.description; - + From 9b41c8dd9708ab5396bbb591a8f3bd0af1c21bb7 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sat, 7 May 2016 13:19:27 -0400 Subject: [PATCH 6/6] Update version --- install.rdf | 2 +- resource/config.js | 2 +- update.rdf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install.rdf b/install.rdf index 2033fcddb2..df96ce18ed 100644 --- a/install.rdf +++ b/install.rdf @@ -6,7 +6,7 @@ zotero@chnm.gmu.edu Zotero - 4.0.29.9.SOURCE + 4.0.29.10.SOURCE Center for History and New Media
George Mason University Dan Cohen Sean Takats diff --git a/resource/config.js b/resource/config.js index 355a17ae6b..f63007e6b2 100644 --- a/resource/config.js +++ b/resource/config.js @@ -15,7 +15,7 @@ var ZOTERO_CONFIG = { BOOKMARKLET_ORIGIN: 'https://www.zotero.org', HTTP_BOOKMARKLET_ORIGIN: 'http://www.zotero.org', BOOKMARKLET_URL: 'https://www.zotero.org/bookmarklet/', - VERSION: '4.0.29.9.SOURCE' + VERSION: '4.0.29.10.SOURCE' }; EXPORTED_SYMBOLS = ["ZOTERO_CONFIG"]; diff --git a/update.rdf b/update.rdf index 4ff13ebab5..958ab0b917 100644 --- a/update.rdf +++ b/update.rdf @@ -7,7 +7,7 @@ - 4.0.29.9.SOURCE + 4.0.29.10.SOURCE {ec8030f7-c20a-464f-9b0e-13a3a9e97384}