Merge branch 'master' into dcl-i1207

GitOrigin-RevId: c947041ca99860d4afb62ecfd28ba6fe1c717bfc
This commit is contained in:
Douglas Lovell
2018-11-30 13:24:27 +00:00
committed by sharelatex
parent ed3147a58f
commit aae0484458
44 changed files with 538 additions and 148 deletions
+1 -1
View File
@@ -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: