Restrict Fx55 toolbar icon fixes to >=Fx55

This reverts commit 8958809f4 and 330054e93. This might need an adjustment to not apply the border change to Windows and Linux.
Update version
2017-11-08 15:50:47 -05:00 · 2017-11-08 06:31:10 -05:00 · 2017-11-08 06:28:59 -05:00 · 2017-11-08 05:26:01 -05:00 · 2017-11-08 04:31:05 -05:00 · 2017-09-30 04:18:47 -04:00
26 changed files with 1408 additions and 781 deletions
--- a/chrome.manifest
+++ b/chrome.manifest
@ -1,5 +1,11 @@
 content	zotero				chrome/content/zotero/
-content	zotero-platform		chrome/content/zotero-platform/		platform
+content	zotero-platform		chrome/content/zotero-platform/mac/       os=Darwin
+content	zotero-platform		chrome/content/zotero-platform/win/       os=WINNT
+content	zotero-platform		chrome/content/zotero-platform/unix/      os=Linux
+content	zotero-platform		chrome/content/zotero-platform/unix/      os=SunOS
+content	zotero-platform		chrome/content/zotero-platform/unix/      os=FreeBSD
+content	zotero-platform		chrome/content/zotero-platform/unix/      os=OpenBSD
+
 resource zotero				resource/

 locale	zotero	en-US		chrome/locale/en-US/zotero/
@ -63,6 +69,8 @@ overlay chrome://zotero/content/preferences/preferences_advanced.xul chrome://zo
 overlay chrome://mozapps/content/downloads/unknownContentType.xul chrome://zotero/content/downloadOverlay.xul

 style	chrome://browser/content/browser.xul	chrome://zotero/skin/zotero.css
+style	chrome://browser/content/browser.xul	chrome://zotero/skin/zotero-fx55.css platformversion>=55
+
 style	chrome://global/content/customizeToolbar.xul	chrome://zotero/skin/zotero.css

 component	{e4c61080-ec2d-11da-8ad9-0800200c9a66}			components/zotero-service.js
--- a/chrome/content/zotero/bindings/noteeditor.xml
+++ b/chrome/content/zotero/bindings/noteeditor.xml
@ -530,7 +530,7 @@
 					tagsbox and tagsLabel above, so be sure to update fixPopup() if it changes
 					-->
 					<xul:menupopup id="tagsPopup" ignorekeys="true"
-							onpopupshown="if (!document.commandDispatcher.focusedElement || document.commandDispatcher.focusedElement.tagName=='xul:label'){ /* DEBUG: it would be nice to make this work -- if (this.firstChild.count==0){ this.firstChild.new(); } */ this.setAttribute('showing', 'true'); }"
+							onpopupshown="if (!document.commandDispatcher.focusedElement || document.commandDispatcher.focusedElement.tagName=='xul:label'){ /* DEBUG: it would be nice to make this work -- if (this.firstChild.count==0){ this.firstChild.newTag(); } */ this.setAttribute('showing', 'true'); }"
 							onpopuphidden="if (!document.commandDispatcher.focusedElement || document.commandDispatcher.focusedElement.tagName=='xul:label'){ this.setAttribute('showing', 'false'); }">
 						<xul:tagsbox id="tags" flex="1" mode="edit"/>
 					</xul:menupopup>
--- a/chrome/content/zotero/bindings/tagsbox.xml
+++ b/chrome/content/zotero/bindings/tagsbox.xml
@ -726,7 +726,7 @@
 			</method>
 			
 			
-			<method name="new">
+			<method name="newTag">
 				<body>
 					<![CDATA[
 						var row = this.addDynamicRow();
@ -967,7 +967,7 @@
 						next.click();
 					}
 					else {
-						next = this.new();
+						next = this.newTag();
 						next = next.firstChild.nextSibling;
 					}
 					
@ -1072,7 +1072,7 @@
 					<xul:label id="tagsNum"/>
 					<xul:button id="addButton" label="&zotero.item.add;"
 						onkeypress="return document.getBindingParent(this)._onAddButtonKeypress(event)"
-						oncommand="document.getBindingParent(this).new();"/>
+						oncommand="document.getBindingParent(this).newTag();"/>
 				</xul:hbox>
 				<xul:grid>
 					<xul:columns>
--- a/chrome/content/zotero/bindings/tagselector.xml
+++ b/chrome/content/zotero/bindings/tagselector.xml
@ -772,7 +772,7 @@
 			</method>
 			
 			
-			<method name="delete">
+			<method name="deleteTag">
 				<parameter name="name"/>
 				<body>
 				<![CDATA[
@ -1002,7 +1002,7 @@
 					<menuitem label="&zotero.tagSelector.renameTag;"
 						oncommand="document.getBindingParent(this).rename(document.popupNode.getAttribute('value')); event.stopPropagation()"/>
 					<menuitem label="&zotero.tagSelector.deleteTag;"
-						oncommand="document.getBindingParent(this).delete(document.popupNode.getAttribute('value')); event.stopPropagation()"/>
+						oncommand="document.getBindingParent(this).deleteTag(document.popupNode.getAttribute('value')); event.stopPropagation()"/>
 				</menupopup>
 				
 				<vbox id="no-tags-box" align="center" pack="center" flex="1">
--- a/chrome/content/zotero/icon.js
+++ b/chrome/content/zotero/icon.js
@ -248,10 +248,10 @@ function getTooltipText(button) {
 				let src = 'chrome://zotero/locale/zotero.properties';
 				let localeService = Components.classes['@mozilla.org/intl/nslocaleservice;1']
 					.getService(Components.interfaces.nsILocaleService);
-				let appLocale = localeService.getApplicationLocale();
+				Components.utils.import("resource://gre/modules/Services.jsm");
 				let stringBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"]
 					.getService(Components.interfaces.nsIStringBundleService);
-				let stringBundle = stringBundleService.createBundle(src, appLocale);
+				let stringBundle = stringBundleService.createBundle(src);
 				text = stringBundle.GetStringFromName('startupError');
 			}
 		}
--- a/chrome/content/zotero/locale/csl
+++ b/chrome/content/zotero/locale/csl
@ -1 +1 @@
-Subproject commit 020712589f08bd74adf53c99f808fbbefebd463f
+Subproject commit da68506f8f47089d28a8289db75f2f5b7f8e5000
--- a/chrome/content/zotero/overlay.js
+++ b/chrome/content/zotero/overlay.js
@ -103,6 +103,13 @@ var ZoteroOverlay = new function()
 			if(newMode == "connector") {
 				// save current state
 				_stateBeforeReload = !zoteroPane.hidden && !zoteroPane.collapsed;
+				
+				// Don't display startup error when Standalone opens
+				if (Zotero.startupError) {
+					Zotero.debug(startupError, 1);
+					return;
+				}
+				
 				// ensure pane is closed
 				if(!zoteroPane.collapsed) ZoteroOverlay.toggleDisplay(false, true);
 			}
@ -169,6 +176,10 @@ var ZoteroOverlay = new function()
 		*/
 		
 		if(makeVisible) {
+			if (!this.show5UpgradeMessage()) {
+				return false;
+			}
+			
 			if (Zotero.locked) {
 				var ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
 										.getService(Components.interfaces.nsIPromptService);
@ -280,6 +291,23 @@ var ZoteroOverlay = new function()
 			this.loadZoteroTab();
 		}
 	}
+	
+	this.show5UpgradeMessage = function () {
+		if (Zotero.Prefs.get('skipUpgradeWarning')) {
+			return true;
+		}
+		var io = {};
+		var win = window.openDialog(
+			"chrome://zotero/content/zotero5Upgrade.xul",
+			"zotero5-upgrade",
+			"centerscreen,modal,width=620,height=570",
+			io
+		);
+		if (io.dontShowAgain) {
+			Zotero.Prefs.set('skipUpgradeWarning', true);
+		}
+		return io.ok;
+	};
 }

 window.addEventListener("load", function(e) { ZoteroOverlay.onLoad(e); }, false);
--- a/chrome/content/zotero/standalone/standalone.js
+++ b/chrome/content/zotero/standalone/standalone.js
@ -230,5 +230,10 @@ const gXPInstallObserver = {
 	}
 };

+// Used by update prompt
+function openUILinkIn(url) {
+	ZoteroPane.loadURI(url);
+}
+
 window.addEventListener("load", function(e) { ZoteroStandalone.onLoad(e); }, false);
 window.addEventListener("unload", function(e) { ZoteroStandalone.onUnload(e); }, false);
--- a/chrome/content/zotero/xpcom/cite.js
+++ b/chrome/content/zotero/xpcom/cite.js
@ -556,21 +556,13 @@ Zotero.Cite.System.prototype = {
 	 * @return {String|Boolean} The locale as a string if it exists, or false if it doesn't
 	 */
 	"retrieveLocale":function retrieveLocale(lang) {
-		var protHandler = Components.classes["@mozilla.org/network/protocol;1?name=chrome"]
-			.createInstance(Components.interfaces.nsIProtocolHandler);
 		try {
-			var channel = protHandler.newChannel(protHandler.newURI("chrome://zotero/content/locale/csl/locales-"+lang+".xml", "UTF-8", null));
-			var rawStream = channel.open();
-		} catch(e) {
+			return Zotero.File.getContentsFromURL(
+				`chrome://zotero/content/locale/csl/locales-${lang}.xml`
+			);
+		}
+		catch (e) {
 			return false;
 		}
-		var converterStream = Components.classes["@mozilla.org/intl/converter-input-stream;1"]
-							   .createInstance(Components.interfaces.nsIConverterInputStream);
-		converterStream.init(rawStream, "UTF-8", 65535,
-			Components.interfaces.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER);
-		var str = {};
-		converterStream.readString(channel.contentLength, str);
-		converterStream.close();
-		return str.value;
 	}
 };
--- a/chrome/content/zotero/xpcom/citeproc.js
+++ b/chrome/content/zotero/xpcom/citeproc.js
--- a/chrome/content/zotero/xpcom/date.js
+++ b/chrome/content/zotero/xpcom/date.js
@ -54,19 +54,13 @@ Zotero.Date = new function(){
 		if(_months) return _months;
 		
 		if(Zotero.isFx && !Zotero.isBookmarklet) {
-			var src = 'chrome://global/locale/dateFormat.properties';
-			var localeService = Components.classes['@mozilla.org/intl/nslocaleservice;1'].
-								getService(Components.interfaces.nsILocaleService);
-			var appLocale = localeService.getApplicationLocale();
-			
-			var bundle =
-				Components.classes["@mozilla.org/intl/stringbundle;1"]
-				.getService(Components.interfaces.nsIStringBundleService).createBundle(src, appLocale);
+			let dtfShort = new Intl.DateTimeFormat('en', { year: 'numeric', month: 'short'});
+			let dtfLong = new Intl.DateTimeFormat('en', { year: 'numeric', month: 'long'});
 			
 			_months = {"short":[], "long":[]};
-			for(var i=1; i<=12; i++) {
-				_months.short.push(bundle.GetStringFromName("month."+i+".Mmm"));
-				_months.long.push(bundle.GetStringFromName("month."+i+".name"));
+			for(var i=0; i<=11; i++) {
+				_months.short.push(dtfShort.format(new Date(2017, i)).split(' ')[0]);
+				_months.long.push(dtfLong.format(new Date(2017, i)).split(' ')[0]);
 			}
 		} else {
 			// TODO localize for Chrome/Safari
--- a/chrome/content/zotero/xpcom/ipc.js
+++ b/chrome/content/zotero/xpcom/ipc.js
@ -253,8 +253,8 @@ Zotero.IPC = new function() {
 				}
 				
 				if(!defunct) {
-					// Try to write to the pipe for 100 ms
-					var time = Date.now(), timeout = time+100, wroteToPipe;
+					// Try to write to the pipe for 500 ms
+					var time = Date.now(), timeout = time+500, wroteToPipe;
 					do {
 						wroteToPipe = Zotero.IPC.safePipeWrite(pipe, msg+"\n");
 					} while(Date.now() < timeout && !wroteToPipe);
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@ -266,20 +266,10 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 			this.locale = this.locale + '-' + this.locale.toUpperCase();
 		}
 		
-		// Load in the localization stringbundle for use by getString(name)
-		var stringBundleService =
-			Components.classes["@mozilla.org/intl/stringbundle;1"]
-			.getService(Components.interfaces.nsIStringBundleService);
-		var localeService = Components.classes['@mozilla.org/intl/nslocaleservice;1'].
-							getService(Components.interfaces.nsILocaleService);
-		var appLocale = localeService.getApplicationLocale();
-		
-		_localizedStringBundle = stringBundleService.createBundle(
-			"chrome://zotero/locale/zotero.properties", appLocale);
+		_localizedStringBundle = Services.strings.createBundle("chrome://zotero/locale/zotero.properties");
 		
 		// Also load the brand as appName
-		var brandBundle = stringBundleService.createBundle(
-			"chrome://branding/locale/brand.properties", appLocale);
+		var brandBundle = Services.strings.createBundle("chrome://branding/locale/brand.properties");
 		this.appName = brandBundle.GetStringFromName("brandShortName");
 		
 		// Set the locale direction to Zotero.dir
@ -611,6 +601,8 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 			}
 			catch (e) {
 				if (e instanceof Zotero.DB.IncompatibleVersionException) {
+					Zotero.DB.closeDatabase(true).then(() => Zotero.debug("Database closed"));
+					
 					let kbURL = "https://www.zotero.org/support/kb/newer_db_version";
 					let msg = (e.dbClientVersion
 						? Zotero.getString('startupError.incompatibleDBVersion',
@ -1490,31 +1482,40 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 			return this.collation;
 		}
 		
-		var localeService = Components.classes["@mozilla.org/intl/nslocaleservice;1"]
-				.getService(Components.interfaces.nsILocaleService);
-		var appLocale = localeService.getApplicationLocale();
-		
-		// Use nsICollation before Fx30
-		if (Zotero.platformMajorVersion < 30) {
-			var localeService = Components.classes["@mozilla.org/intl/nslocaleservice;1"]
-				.getService(Components.interfaces.nsILocaleService);
-			var collationFactory = Components.classes["@mozilla.org/intl/collation-factory;1"]
-				.getService(Components.interfaces.nsICollationFactory);
-			return this.collation = collationFactory.CreateCollation(appLocale);
-		}
-		
 		try {
-			var locale = appLocale.getCategory('NSILOCALE_COLLATE');
-			// Extract a valid language tag
-			locale = locale.match(/^[a-z]{2}(\-[A-Z]{2})?/)[0];
-			var collator = new Intl.Collator(locale, {
+			// DEBUG: Is this necessary, or will Intl.Collator just default to the same locales we're
+			// passing manually?
+			
+			let locales;
+			// Fx55+
+			if (Services.locale.getAppLocalesAsBCP47) {
+				locales = Services.locale.getAppLocalesAsBCP47();
+			}
+			else {
+				let locale;
+				// Fx54
+				if (Services.locale.getAppLocale) {
+					locale = Services.locale.getAppLocale();
+				}
+				// Fx <=53
+				else {
+					locale = Services.locale.getApplicationLocale();
+					locale = locale.getCategory('NSILOCALE_COLLATE');
+				}
+				
+				// Extract a valid language tag
+				locale = locale.match(/^[a-z]{2}(\-[A-Z]{2})?/)[0];
+				locales = [locale];
+			}
+			
+			var collator = new Intl.Collator(locales, {
 				ignorePunctuation: true,
 				numeric: true,
 				sensitivity: 'base'
 			});
 		}
 		catch (e) {
-			Zotero.debug(e, 1);
+			Zotero.logError(e);
 			
 			// If there's an error, just skip sorting
 			collator = {
@ -2126,7 +2127,11 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 			'Sync.Engine.Tabs',
 			'content-sessionStore.js',
 			'org.mozilla.appSessions',
-			'bad script XDR magic number'
+			'bad script XDR magic number',
+			'BindInt32Parameter is deprecated and will be removed soon',
+			'BindInt64Parameter is deprecated and will be removed soon',
+			'BindUTF8StringParameter is deprecated and will be removed soon',
+			'BindNullParameter is deprecated and will be removed soon'
 		];
 		
 		for (var i=0; i<blacklist.length; i++) {
--- a/chrome/content/zotero/zotero5Upgrade.xul
+++ b/chrome/content/zotero/zotero5Upgrade.xul
@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://zotero/skin/zotero5upgrade.css" type="text/css"?>
+<!DOCTYPE window SYSTEM "chrome://zotero/locale/about.dtd">
+
+<dialog
+	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	orient="vertical"
+	buttons="accept"
+	buttonlabelaccept="OK"
+	onload="document.documentElement.getButton('accept').focus();"
+	ondialogaccept="var io = window.arguments[0]; io.dontShowAgain = document.getElementById('dont-show-again').checked; io.ok = true;">
+	
+	<script src="include.js"/>
+	
+	<div xmlns="http://www.w3.org/1999/xhtml">
+		<h1>The way you use Zotero is changing</h1>
+		
+		<p>Zotero 5.0, the next major version of Zotero, is now available, and along with many new features and improvements, it brings some important changes that you’ll need to be aware of as a user of Zotero for Firefox.</p>
+		
+		<p>With the release of Firefox 57 on November 14, 2017, Mozilla will be removing the powerful extension framework on which Zotero for Firefox is based in favor of a new, more limited extension system similar to the one in Chrome. Because of this change, Zotero 5.0 is available only as a standalone program, which you’ll need to install to continue accessing your Zotero data locally. Instead of clicking a “Z” button in the Firefox toolbar, you’ll open Zotero as you would any other program. A new extension, the Zotero Connector for Firefox, replaces this one and provides the same “Save to Zotero” button that you’re used to.</p>
+		
+		<p>You’ll soon be automatically upgraded to the Zotero Connector for Firefox, at which point you’ll need to install Zotero 5.0 as well to access your library. To avoid any unexpected disruption, we recommend installing Zotero 5.0 and the Zotero Connector for Firefox from the <a href="https://www.zotero.org/download/">download page</a> as soon as possible.</p>
+		
+		<p>See our <a href="https://www.zotero.org/blog/a-unified-zotero-experience/">blog post</a> for more details on this change and what it means for you.</p>
+		
+		<p>
+			<input id="dont-show-again" type="checkbox"/>
+			<label for="dont-show-again">Don’t show again</label>
+		</p>
+	</div>
+	
+	<script type="text/javascript">
+	<![CDATA[
+		var links = document.querySelectorAll('a');
+		for (let link of links) {
+			link.onclick = function (event) {
+				window.close();
+				var gb = window.opener.gBrowser;
+				gb.selectedTab = gb.addTab(event.target.getAttribute('href'));
+				event.preventDefault();
+			}
+		}
+	]]>
+	</script>
+</dialog>
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@ -3572,7 +3572,7 @@ var ZoteroPane = new function()
 				}
 				
 				if (!externalViewer) {
-					var url = 'zotero://attachment/' + itemID + '/';
+					let url = Services.io.newFileURI(file).spec;
 					this.loadURI(url, event);
 				}
 				else {
@ -4078,12 +4078,9 @@ var ZoteroPane = new function()
 			if (!errMsg) {
 				// Get the stringbundle manually
 				var src = 'chrome://zotero/locale/zotero.properties';
-				var localeService = Components.classes['@mozilla.org/intl/nslocaleservice;1'].
-						getService(Components.interfaces.nsILocaleService);
-				var appLocale = localeService.getApplicationLocale();
 				var stringBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"]
 					.getService(Components.interfaces.nsIStringBundleService);
-				var stringBundle = stringBundleService.createBundle(src, appLocale);
+				var stringBundle = stringBundleService.createBundle(src);
 				
 				var errMsg = stringBundle.GetStringFromName('startupError');
 			}
--- a/chrome/skin/default/zotero/timeline/timelineControls.js
+++ b/chrome/skin/default/zotero/timeline/timelineControls.js
@ -7,13 +7,9 @@ var lastJumpToYearValue;
 */
 function initLocaleBundle() {
 	var src = 'chrome://zotero/locale/timeline.properties';
-	var localeService = Components.classes['@mozilla.org/intl/nslocaleservice;1']
-		.getService(Components.interfaces.nsILocaleService);
-	var appLocale = localeService.getApplicationLocale();
-	
 	var stringBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"]
 			.getService(Components.interfaces.nsIStringBundleService);
-	return stringBundleService.createBundle(src, appLocale);
+	return stringBundleService.createBundle(src);
 }

 /*
--- a/chrome/skin/default/zotero/zotero-fx55.css
+++ b/chrome/skin/default/zotero/zotero-fx55.css
@ -0,0 +1,12 @@
+#zotero-toolbar-buttons[cui-areatype="toolbar"]:hover .dropmarker-icon,
+#zotero-toolbar-save-button[cui-areatype="toolbar"]:hover .dropmarker-icon {
+       padding-top: calc(var(--toolbarbutton-inner-padding) + 5px);
+       padding-bottom: calc(var(--toolbarbutton-inner-padding) + 5px);
+}
+
+#zotero-toolbar-buttons[cui-areatype="toolbar"]:hover .toolbarbutton-menubutton-button,
+#zotero-toolbar-buttons[cui-areatype="toolbar"]:hover .toolbarbutton-menubutton-dropmarker,
+#zotero-toolbar-save-button[cui-areatype="toolbar"]:hover > .toolbarbutton-menubutton-button,
+#zotero-toolbar-save-button[cui-areatype="toolbar"]:hover > .toolbarbutton-menubutton-dropmarker {
+       border: 0 !important;
+}
--- a/chrome/skin/default/zotero/zotero5upgrade.css
+++ b/chrome/skin/default/zotero/zotero5upgrade.css
@ -0,0 +1,23 @@
+.dialog-content-box {
+	overflow-y: auto;
+	background: white;
+}
+
+div {
+	padding-left: 15px;
+	padding-right: 15px;
+}
+
+h1 {
+	font-size: 24px;
+}
+
+p {
+	font-size: 14px;
+	line-height: 1.5;
+}
+
+a {
+	color: blue;
+	text-decoration: underline;
+}
--- 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>4.0.29.16.SOURCE</em:version>
+    <em:version>4.0.29.25.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>
@ -25,7 +25,7 @@
    <em:targetApplication>
      <Description>
        <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-        <em:minVersion>38.0</em:minVersion>
+        <em:minVersion>45.0</em:minVersion>
        <em:maxVersion>45.*</em:maxVersion>
      </Description>
    </em:targetApplication>
--- 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.16.SOURCE'
+	VERSION: '4.0.29.25.SOURCE'
 };

 EXPORTED_SYMBOLS = ["ZOTERO_CONFIG"];
--- a/resource/schema/renamed-styles.json
+++ b/resource/schema/renamed-styles.json
@ -11,6 +11,7 @@
    "american-journal-of-cardiology": "the-american-journal-of-cardiology",
    "american-journal-of-clinical-nutrition": "the-american-journal-of-clinical-nutrition",
    "american-journal-of-medicine": "the-american-journal-of-medicine",
+    "american-journal-of-human-genetics": "the-american-journal-of-human-genetics",
    "american-journal-of-pathology": "the-american-journal-of-pathology",
    "american-journal-of-sports-medicine": "the-american-journal-of-sports-medicine",
    "american-journal-of-surgery": "the-american-journal-of-surgery",
@ -25,6 +26,7 @@
    "annual-reviews-alphabetically": "annual-reviews-alphabetical",
    "annual-reviews-by-appearance": "annual-reviews",
    "apa-fr": "apa-fr-provost",
+    "apa-fr-universite-de-montreal": "universite-de-montreal-apa",
    "apa5th": "apa-5th-edition",
    "apsa": "american-political-science-association",
    "archives-of-dermatology": "jama-dermatology",
@ -85,7 +87,10 @@
    "edizioni-minerva-medica": "minerva-medica",
    "ethics-science-environmental-politics": "ethics-in-science-and-environmental-politics",
    "european-journal-of-population-revue-europeenne-de-demographie": "european-journal-of-population",
+    "expert-review-of-dermatology": "taylor-and-francis-national-library-of-medicine",
+    "expert-review-of-obstetrics-and-gynecology": "taylor-and-francis-national-library-of-medicine",
    "f1000-research": "f1000research",
+    "fachhochschule-vorarlberg": "fachhochschule-vorarlberg-author-date",
    "febs-journal": "the-febs-journal",
    "fems": "oxford-university-press-scimed-author-date",
    "federation-of-european-microbiological-societies": "oxford-university-press-scimed-author-date",
@ -276,11 +281,12 @@
    "harvard-university-of-northampton": "harvard-the-university-of-northampton",
    "harvard-university-of-south-africa": "university-of-south-australia-harvard-2011",
    "harvard-university-of-south-australia": "university-of-south-australia-harvard-2011",
-    "harvard-university-west-london": "harvard-university-of-west-london",
+    "harvard-university-of-west-london": "harvard-cite-them-right",
+    "harvard-university-west-london": "harvard-cite-them-right",
    "harvard1-unisa-gbfe": "harvard-gesellschaft-fur-bildung-und-forschung-in-europa",
    "harvard3": "harvard-swinburne-university-of-technology",
+    "harvard7de": "fachhochschule-vorarlberg-author-date",
    "head-and-neck-oncology": "biomed-central",
-    "healthcare-the-journal-of-delivery-science-and-innovation": "healthcare",
    "hwr-berlin": "hochschule-fur-wirtschaft-und-recht-berlin",
    "ices-jms": "ices-journal-of-marine-science",
    "ieee-w-url": "ieee-with-url",
@ -341,6 +347,7 @@
    "journal-of-physical-chemistry": "the-journal-of-physical-chemistry-a",
    "journal-of-prosthetic-dentistry": "the-journal-of-prosthetic-dentistry",
    "journal-of-science-teacher-education": "springer-socpsych-author-date",
+    "journal-of-spinal-disorders-and-techniques": "clinical-spine-surgery",
    "journal-of-the-american-academy-of-physician-assistants": "jaapa",
    "journal-of-the-american-dental-association": "the-journal-of-the-american-dental-association",
    "journal-of-the-american-medical-association": "jama",
@ -427,6 +434,7 @@
    "scandinavian-journal-of-clinical-and-laboratory-investigation": "the-scandinavian-journal-of-clinical-and-laboratory-investigation",
    "science-without-title": "science-without-titles",
    "sensing-and-imaging-an-international-journal": "sensing-and-imaging",
+    "sexuality-and-early-development-in-aquatic-organisms": "inter-research-science-center",
    "silence": "biomed-central",
    "small-wiley": "small",
    "smartt": "biomed-central",
@ -439,9 +447,11 @@
    "synergy-research": "synergy",
    "tah-gkw": "geistes-und-kulturwissenschaften-heilmann",
    "tah-soz": "sozialwissenschaften-heilmann",
+    "taylor-and-francis-american-psychological-association": "taylor-and-francis-apa",
    "taylor-and-francis-reference-style-f": "taylor-and-francis-chicago-f",
    "technology-operation-management": "springer-humanities-author-date",
    "the-academy-of-management-review": "academy-of-management-review",
+    "thieme-e-journals-vancouver": "thieme-german",
    "tort-law-review": "the-tort-law-review",
    "transition-studies-review": "springer-basic-author-date",
    "trends-journal": "trends-journals",
--- a/resource/schema/repotime.txt
+++ b/resource/schema/repotime.txt
@ -1 +1 @@
-2016-10-23 15:30:00
+2017-09-29 03:25:00
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 37b89da2373093ca8baf062f34b9b1d0952c543e
+Subproject commit 8e4273171b0639a4c5b4e123b97390cea3f4f522
--- a/test/tests/utilities.js
+++ b/test/tests/utilities.js
@ -37,7 +37,7 @@ describe("Zotero.Utilities", function() {
 		});
 		it("should strip off internal characters in ISBN string", function() {
 			let ignoredChars = '\x2D\xAD\u2010\u2011\u2012\u2013\u2014\u2015\u2043\u2212' // Dashes
-				+ ' \xA0\r\n\t\x0B\x0C\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005' // Spaces
+				+ ' \xA0\r\n\t\x0B\x0C\u1680\u2000\u2001\u2002\u2003\u2004\u2005' // Spaces
 				+ '\u2006\u2007\u2008\u2009\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF';
 			for (let i=0; i<ignoredChars.length; i++) {
 				let charCode = '\\u' + Zotero.Utilities.lpad(ignoredChars.charCodeAt(i).toString(16).toUpperCase(), '0', 4);
@ -134,7 +134,7 @@ describe("Zotero.Utilities", function() {
 		});
 		it("should strip off internal characters in ISSN string", function() {
 			let ignoredChars = '\x2D\xAD\u2010\u2011\u2012\u2013\u2014\u2015\u2043\u2212' // Dashes
-				+ ' \xA0\r\n\t\x0B\x0C\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005' // Spaces
+				+ ' \xA0\r\n\t\x0B\x0C\u1680\u2000\u2001\u2002\u2003\u2004\u2005' // Spaces
 				+ '\u2006\u2007\u2008\u2009\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF';
 			for (let i=0; i<ignoredChars.length; i++) {
 				let charCode = '\\u' + Zotero.Utilities.lpad(ignoredChars.charCodeAt(i).toString(16).toUpperCase(), '0', 4);
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 79486040d42c9d273eb45012b2296d90be8008de
+Subproject commit 08a0389eaf8ea7bb11e0246e382505bbba3373a3
--- a/update.rdf
+++ b/update.rdf
@ -7,11 +7,11 @@
    <RDF:Seq>
      <RDF:li>
        <RDF:Description>
-          <version>4.0.29.16.SOURCE</version>
+          <version>4.0.29.25.SOURCE</version>
          <targetApplication>
            <RDF:Description>
              <id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</id>
-              <minVersion>38.0</minVersion>
+              <minVersion>45.0</minVersion>
              <maxVersion>45.*</maxVersion>
              <updateLink>http://download.zotero.org/extension/zotero.xpi</updateLink>
              <updateHash>sha1:</updateHash>
Author	SHA1	Message	Date
Dan Stillman	273194eaf3	Restrict Fx55 toolbar icon fixes to >=Fx55 This reverts commit `8958809f4` and `330054e93`. This might need an adjustment to not apply the border change to Windows and Linux.	2017-11-08 15:50:47 -05:00
Dan Stillman	bb87ce3007	Update version	2017-11-08 06:31:10 -05:00
Dan Stillman	28d8ce3dc2	Fix broken Z button in XPI from filename case mismatch in `685adcd118`	2017-11-08 06:28:59 -05:00
Dan Stillman	95711b72a1	Update version	2017-11-08 05:26:01 -05:00
Dan Stillman	685adcd118	Add Zotero Connector upgrade warning when opening pane	2017-11-08 04:31:05 -05:00
Dan Stillman	dfb821ee92	Update version and submodules	2017-09-30 04:18:47 -04:00
Dan Stillman	36e7a76f27	Fix startup error display (broken by `c06aa9ed52`)	2017-09-30 04:17:38 -04:00
Dan Stillman	dbdbc9d64f	Blacklist mozStorage deprecation warnings from error reporting	2017-09-30 04:17:38 -04:00
Dan Stillman	4b3d0054e5	Fix citeproc-js in Firefox 56 Our retrieveLocale() implementation was broken by https://bugzilla.mozilla.org/show_bug.cgi?id=1319111	2017-09-30 04:11:50 -04:00
Dan Stillman	330054e936	Firefox 55 compatibility: move part of toolbar button change to global	2017-08-09 05:43:16 +02:00
Dan Stillman	8958809f4a	Firefox 55 compatibility: fix some Mac toolbar button weirdness At the cost of some ugliness in earlier versions, at least for now	2017-08-09 05:27:25 +02:00
Dan Stillman	8212bd3f61	Update version and submodules	2017-08-09 04:53:55 +02:00
Dan Stillman	b791a162a4	Firefox 55 compatibility: fix zotero-platform files Mozilla removed support for the 'platform' keyword in chrome.manifest, so use os= instead	2017-08-09 04:51:01 +02:00
Dan Stillman	c06aa9ed52	Firefox 55 compatibility: fix Services.locale.getAppLocale() calls This is a backport of `55b2dc39b`.	2017-08-09 04:29:13 +02:00
Dan Stillman	f5971279ea	Update version and translators	2017-06-05 18:32:28 -04:00
Dan Stillman	20f838a93a	Update citeproc-js to 1.1.170	2017-06-05 18:32:28 -04:00
Dan Stillman	ceb4c5eb61	Fix getLocaleCollation() in Firefox 54	2017-05-27 05:39:09 -04:00
Dan Stillman	19b4a7c458	Update citeproc-js to 1.1.169	2017-05-26 14:27:08 -04:00
Dan Stillman	150263d197	Update version and translators	2017-05-26 14:26:46 -04:00
Dan Stillman	6d20803256	Firefox 54 compatibility: dateFormat.properties -> Intl.DateTimeFormat	2017-05-25 19:49:55 -04:00
Dan Stillman	7f52280a95	Firefox 54 compatiblity for locale service	2017-05-25 19:49:20 -04:00
Dan Stillman	4bdef6d24a	Firefox 54 compatibility: rename "new" and "delete" XBL methods	2017-05-25 18:51:18 -04:00
Dan Stillman	9f43934934	Update whitespace chars in cleanISBN/cleanISSN tests for Firefox 52+ Farewell, Mongolian Vowel Separator	2017-05-09 03:27:40 -04:00
Dan Stillman	65a3fab345	Update citeproc-js to 1.1.165	2017-05-09 03:21:33 -04:00
Dan Stillman	0e05d434f8	Update version and submodules	2017-05-09 02:20:50 -04:00
Dan Stillman	25f65c4d98	Increase pipe write timeout to 500 ms from 100 ms Writing to the pipe from Firefox was sometimes taking 100 ms for me when opening Standalone, which meant that Zotero for Firefox would display an error until Firefox was restarted.	2017-05-09 02:17:03 -04:00
Dan Stillman	4d4c0f9e73	Don't display startup error when switching into connector mode And close DB on incompatible version error This should make things a bit smoother for people upgrading to 5.0 before Zotero for Firefox is updated to the connector.	2017-05-09 02:05:23 -04:00
Dan Stillman	2ef84125e7	Update version and submodules	2017-04-21 07:43:55 -04:00
Dan Stillman	6333e0b5ad	Fix in-browser PDF viewing in Firefox 53 Use file:// URLs for viewing attachments instead of zotero://attachment, which the new version of PDF.js in Fx53 doesn't like.	2017-04-21 07:37:54 -04:00
Dan Stillman	18d89cbdf0	Update version and submodules	2017-01-16 03:00:10 -05:00
Dan Stillman	c27eb5421d	Fix more info link in update prompt	2017-01-16 02:58:05 -05:00
Dan Stillman	e2a3a6edbb	Update minVersion in install/update manifests I'm not sure if minVersion, like maxVersion, is now ignored without strict compatibility on. Would make sense for minVersion to still be enforced.	2016-11-05 13:03:14 -04:00