From 1070cd36bbdcb9202f0a8590068ae3b95ff38230 Mon Sep 17 00:00:00 2001
From: James Allen <james@sharelatex.com>
Date: Wed, 28 Nov 2018 12:19:51 +0100
Subject: [PATCH] Merge pull request #1163 from sharelatex/ja-zotero

Add support for Zotero linked files

GitOrigin-RevId: 917a881254949163126746667d6debc2a3f16941
---
 services/web/app/coffee/models/User.coffee               | 1 +
 services/web/app/views/project/editor/new-file-modal.pug | 2 +-
 services/web/app/views/project/list/modals.pug           | 2 +-
 services/web/docker-compose.yml                          | 2 +-
 services/web/public/src/ide/file-tree/FileTreeManager.js | 3 ++-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/services/web/app/coffee/models/User.coffee b/services/web/app/coffee/models/User.coffee
index fcfb06742b..6ad504b0fa 100644
--- a/services/web/app/coffee/models/User.coffee
+++ b/services/web/app/coffee/models/User.coffee
@@ -50,6 +50,7 @@ UserSchema = new Schema
 		references:       { type:Boolean, default: Settings.defaultFeatures.references }
 		trackChanges:     { type:Boolean, default: Settings.defaultFeatures.trackChanges }
 		mendeley:         { type:Boolean, default: Settings.defaultFeatures.mendeley }
+		zotero:           { type:Boolean, default: Settings.defaultFeatures.zotero }
 		referencesSearch: { type:Boolean, default: Settings.defaultFeatures.referencesSearch }
 	}
 	referal_id : {type:String, default:() -> uuid.v4().split("-")[0]}
diff --git a/services/web/app/views/project/editor/new-file-modal.pug b/services/web/app/views/project/editor/new-file-modal.pug
index cbe8124242..969b1e2564 100644
--- a/services/web/app/views/project/editor/new-file-modal.pug
+++ b/services/web/app/views/project/editor/new-file-modal.pug
@@ -162,7 +162,7 @@ script(type='text/ng-template', id='newFileModalTemplate')
 								on-enter="create()",
 								name="url"
 							)
-							.row-spaced.small
+							.row-spaced-small
 								label(for="name") File name in this project
 								input.form-control(
 									type="text",
diff --git a/services/web/app/views/project/list/modals.pug b/services/web/app/views/project/list/modals.pug
index f89b26925c..18c39a43e9 100644
--- a/services/web/app/views/project/list/modals.pug
+++ b/services/web/app/views/project/list/modals.pug
@@ -351,7 +351,7 @@ script(type="text/ng-template", id="v1ImportModalTemplate")
 						| <strong>Direct git access to your projects</strong> is not yet available, but you can migrate your project to the Overleaf v2 GitHub integration
 						|
 						a(href='https://www.overleaf.com/help/343-working-offline-in-overleaf-v2', target='_blank') Read More.
-					li There are <strong>no Zotero and CiteULike</strong> integrations yet
+					li There is no <strong>CiteULike</strong> integration
 					li Some <strong>Journals and Services in the Submit menu</strong> don't support direct submissions yet
 		.v1-import-cta
 			p
diff --git a/services/web/docker-compose.yml b/services/web/docker-compose.yml
index ebf164f606..fb1fba2b8d 100644
--- a/services/web/docker-compose.yml
+++ b/services/web/docker-compose.yml
@@ -17,7 +17,7 @@ services:
       PROJECT_HISTORY_ENABLED: 'true'
       ENABLED_LINKED_FILE_TYPES: 'url'
       LINKED_URL_PROXY: 'http://localhost:6543'
-      ENABLED_LINKED_FILE_TYPES: 'url,project_file,project_output_file,mendeley'
+      ENABLED_LINKED_FILE_TYPES: 'url,project_file,project_output_file,mendeley,zotero'
       SHARELATEX_CONFIG: /app/test/acceptance/config/settings.test.coffee
       NODE_ENV: production
     depends_on:
diff --git a/services/web/public/src/ide/file-tree/FileTreeManager.js b/services/web/public/src/ide/file-tree/FileTreeManager.js
index a72a988af8..0717a9039b 100644
--- a/services/web/public/src/ide/file-tree/FileTreeManager.js
+++ b/services/web/public/src/ide/file-tree/FileTreeManager.js
@@ -79,7 +79,8 @@ define([
               name: file.name,
               id: file._id,
               type: 'file',
-              linkedFileData
+              linkedFileData,
+              created: file.created
             })
             return this.recalculateDocList()
           })