Merge branch 'dev' into 'master'

Dev

See merge request !374

app/components/activity/CitationForm.jsx

@@ -80,7 +80,7 @@ const CiteUrl = props => (
   <TextField
     className={props.className}
     invalidTest={props.invalidTest}
-    label="Citation URL"
+    label="Citation URL (always include)"
     {...props.field}
   />
 )
@@ -174,7 +174,7 @@ const CitationForm = ({ values, errors, touched, ...props }) => (
     </div>
     <Flex>
       <div>
-        <H4>Print date</H4>
+        <H4>Print date (Issue date)</H4>
         <Field
           component={PYear}
           invalidTest={errors.printyear && touched.printyear}

server/ebi-integration/app.js

@@ -16,7 +16,7 @@ module.exports = async app => {
     if (clientId) {
       if (ManuscriptManager.findById(clientId, adminUser.id, null, false)) {
         res.status(200).send('Callback response recieved')
-        await new Promise(resolve => setTimeout(resolve, 900))
+        await new Promise(resolve => setTimeout(resolve, 1000))
         completeCitation(body, req.query.token)
       } else {
         res.status(503).send('ERROR: Database unavailable')
@@ -33,7 +33,7 @@ module.exports = async app => {
       if (ManuscriptManager.findById(clientId, adminUser.id, null, false)) {
         const { token, indexOnly } = req.query
         res.status(200).send('Callback response recieved')
-        await new Promise(resolve => setTimeout(resolve, 900))
+        await new Promise(resolve => setTimeout(resolve, 1000))
         preprintComplete(body, token, !!indexOnly)
       } else {
         res.status(503).send('ERROR: Database unavailable')
@@ -50,7 +50,7 @@ module.exports = async app => {
       if (ManuscriptManager.findById(clientId, adminUser.id, null, false)) {
         const { token, indexOnly } = req.query
         res.status(200).send('Callback response recieved')
-        await new Promise(resolve => setTimeout(resolve, 900))
+        await new Promise(resolve => setTimeout(resolve, 1000))
         resendComplete(body, token, !!indexOnly)
       } else {
         res.status(503).send('ERROR: Database unavailable')