mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-07 20:31:06 -05:00
Merge branch 'master' into sk-user-features
This commit is contained in:
Shane Kilkelly
commit
e2570a06d2
7 changed files with 19 additions and 15 deletions
|
|
@ -14,7 +14,7 @@ If you'd like a report a bug or open an issue then please:
|
|||
|
||||
1. **Find the correct repository.** ShareLaTeX is split across multiple different repositories, each containing a different service (you can find a list of [all repositories here](https://github.com/sharelatex/sharelatex/blob/master/README.md#other-repositories)). If you know the bug only applies to one service, then please open an issue in that repository. For general bugs and issues that span more than one service, please open an issue in the [sharelatex/sharelatex](https://github.com/sharelatex/sharelatex) repository.
|
||||
2. **Check if there is an existing issue.** If there is then please add
|
||||
any more information that you have, or give it a "+1" in the comments.
|
||||
any more information that you have, or give it a 👍.
|
||||
|
||||
When submitting an issue please describe the issue as clearly as possible, including how to
|
||||
reproduce the bug, which situations it appears in, what you expected to happen, and what actually happens.
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ module.exports = (grunt) ->
|
|||
grunt.loadNpmTasks "grunt-contrib-coffee"
|
||||
grunt.loadNpmTasks "grunt-shell"
|
||||
|
||||
grunt.task.loadTasks "./tasks"
|
||||
|
||||
execute = {}
|
||||
for service in SERVICES
|
||||
|
|
@ -112,7 +113,7 @@ module.exports = (grunt) ->
|
|||
grunt.registerTask "check:make", "Check that make is installed", () ->
|
||||
Helpers.checkMake @async()
|
||||
|
||||
grunt.registerTask 'migrate', "compile migrations and run them", ['coffee:migrate', 'shell:migrate']
|
||||
grunt.registerTask 'migrate', "compile migrations and run them", ["coffee:migrate", 'shell:migrate']
|
||||
|
||||
|
||||
Helpers =
|
||||
|
|
@ -233,7 +234,7 @@ module.exports = (grunt) ->
|
|||
|
||||
ShareLaTeX can not talk to the redis instance
|
||||
|
||||
Check the redis instance is running and accessible on env var SHARELATEX_REDIS_URL
|
||||
Check the redis instance is running and accessible on env var SHARELATEX_REDIS_HOST
|
||||
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
"""
|
||||
|
|
@ -242,5 +243,4 @@ module.exports = (grunt) ->
|
|||
rclient.on 'error', errorHandler
|
||||
|
||||
|
||||
require('load-grunt-config')(grunt)
|
||||
|
||||
|
|
|
|||
4
server-ce/ISSUE_TEMPLATE
Normal file
4
server-ce/ISSUE_TEMPLATE
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
Please tell us the following when opening an issue
|
||||
|
||||
- Official Docker version being run:
|
||||
- URL to appropriate logs:
|
||||
|
|
@ -14,7 +14,7 @@ Installation
|
|||
|
||||
We have detailed installation instructions in our wiki:
|
||||
|
||||
* [Installing ShareLaTeX in Production using docker](https://github.com/sharelatex/sharelatex/wiki/Production-Installation-Instructions)
|
||||
* [ShareLaTeX Quick Start Guide](https://github.com/sharelatex/sharelatex/wiki/Quick-Start-Guide)
|
||||
|
||||
|
||||
Upgrading
|
||||
|
|
@ -30,48 +30,48 @@ This repository does not contain any code. It acts a wrapper and toolkit for man
|
|||
|
||||
The different services are:
|
||||
|
||||
### [web](https://github.com/sharelatex/web-sharelatex) [](https://travis-ci.org/sharelatex/web-sharelatex)
|
||||
### [web](https://github.com/sharelatex/web-sharelatex) [](https://travis-ci.org/sharelatex/web-sharelatex)
|
||||
|
||||
The front facing web server that serves all the HTML pages, CSS and JavaScript
|
||||
to the client. Also contains a lot of logic around creating and editing
|
||||
projects, and account management.
|
||||
|
||||
### [document-updater](https://github.com/sharelatex/document-updater-sharelatex) [](https://travis-ci.org/sharelatex/document-updater-sharelatex)
|
||||
### [document-updater](https://github.com/sharelatex/document-updater-sharelatex) [](https://travis-ci.org/sharelatex/document-updater-sharelatex)
|
||||
|
||||
Processes updates that come in from the editor when users modify documents. Ensures that
|
||||
the updates are applied in the right order, and that only one operation is modifying
|
||||
the document at a time. Also caches the documents in redis for very fast but persistent
|
||||
modifications.
|
||||
|
||||
### [CLSI](https://github.com/sharelatex/clsi-sharelatex) [](https://travis-ci.org/sharelatex/clsi-sharelatex)
|
||||
### [CLSI](https://github.com/sharelatex/clsi-sharelatex) [](https://travis-ci.org/sharelatex/clsi-sharelatex)
|
||||
|
||||
The Common LaTeX Service Interface (CLSI) which provides an API for compiling LaTeX
|
||||
documents.
|
||||
|
||||
### [docstore](https://github.com/sharelatex/docstore-sharelatex) [](https://travis-ci.org/sharelatex/docstore-sharelatex)
|
||||
### [docstore](https://github.com/sharelatex/docstore-sharelatex) [](https://travis-ci.org/sharelatex/docstore-sharelatex)
|
||||
|
||||
An API for performing CRUD (Create, Read, Update and Delete) operations on text files
|
||||
stored in ShareLaTeX.
|
||||
|
||||
### [realtime](https://github.com/sharelatex/real-time-sharelatex) [](https://travis-ci.org/sharelatex/real-time-sharelatex)
|
||||
### [realtime](https://github.com/sharelatex/real-time-sharelatex) [](https://travis-ci.org/sharelatex/real-time-sharelatex)
|
||||
|
||||
The websocket process clients connect to
|
||||
|
||||
### [filestore](https://github.com/sharelatex/filestore-sharelatex) [](https://travis-ci.org/sharelatex/filestore-sharelatex)
|
||||
### [filestore](https://github.com/sharelatex/filestore-sharelatex) [](https://travis-ci.org/sharelatex/filestore-sharelatex)
|
||||
|
||||
An API for performing CRUD (Create, Read, Update and Delete) operations on binary files
|
||||
(like images) stored in ShareLaTeX.
|
||||
|
||||
### [track-changes](https://github.com/sharelatex/track-changes-sharelatex) [](https://travis-ci.org/sharelatex/track-changes-sharelatex)
|
||||
### [track-changes](https://github.com/sharelatex/track-changes-sharelatex) [](https://travis-ci.org/sharelatex/track-changes-sharelatex)
|
||||
|
||||
An API for compressing and storing the updates applied to a document, and then rendering a diff of the changes
|
||||
between any two time points.
|
||||
|
||||
### [chat](https://github.com/sharelatex/chat-sharelatex) [](https://travis-ci.org/sharelatex/chat-sharelatex)
|
||||
### [chat](https://github.com/sharelatex/chat-sharelatex) [](https://travis-ci.org/sharelatex/chat-sharelatex)
|
||||
|
||||
The backend API for storing and fetching chat messages.
|
||||
|
||||
### [tags](https://github.com/sharelatex/tags-sharelatex) [](https://travis-ci.org/sharelatex/tags-sharelatex)
|
||||
### [tags](https://github.com/sharelatex/tags-sharelatex) [](https://travis-ci.org/sharelatex/tags-sharelatex)
|
||||
|
||||
The backend API for managing project tags (folders).
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ services:
|
|||
# SHARELATEX_EMAIL_SMTP_PASS:
|
||||
# SHARELATEX_EMAIL_SMTP_TLS_REJECT_UNAUTH: true
|
||||
# SHARELATEX_EMAIL_SMTP_IGNORE_TLS: false
|
||||
# SHARELATEX_CUSTOM_EMAIL_FOOTER:"<div>This system is run by department x </div>"
|
||||
# SHARELATEX_CUSTOM_EMAIL_FOOTER: "<div>This system is run by department x </div>"
|
||||
|
||||
################
|
||||
## Server Pro ##
|
||||
|
|
|
|||
Loading…
Reference in a new issue