From 3b2cbfd7434cf87be8591f9ae9e71874d67beb9f Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 3 Nov 2016 15:13:02 +0000 Subject: [PATCH 1/8] should check SHARELATEX_REDIS_HOST not SHARELATEX_REDIS_URL --- server-ce/Gruntfile.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-ce/Gruntfile.coffee b/server-ce/Gruntfile.coffee index 217e06d2f0..da95f2d46e 100644 --- a/server-ce/Gruntfile.coffee +++ b/server-ce/Gruntfile.coffee @@ -233,7 +233,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 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! """ From 5d69513fe870a30aa6d37d7e85538efd3700dcca Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Tue, 15 Nov 2016 10:19:20 +0000 Subject: [PATCH 2/8] Create ISSUE_TEMPLATE --- server-ce/ISSUE_TEMPLATE | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 server-ce/ISSUE_TEMPLATE diff --git a/server-ce/ISSUE_TEMPLATE b/server-ce/ISSUE_TEMPLATE new file mode 100644 index 0000000000..0a49049094 --- /dev/null +++ b/server-ce/ISSUE_TEMPLATE @@ -0,0 +1,4 @@ +Please tell us the following when opening an issue + +- Offical Docker version being run: +- URL to appropriate logs: From d94b622a8e537c04749be831f454c1c1bbf3bda3 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Tue, 15 Nov 2016 10:19:58 +0000 Subject: [PATCH 3/8] Update ISSUE_TEMPLATE --- server-ce/ISSUE_TEMPLATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-ce/ISSUE_TEMPLATE b/server-ce/ISSUE_TEMPLATE index 0a49049094..0408054675 100644 --- a/server-ce/ISSUE_TEMPLATE +++ b/server-ce/ISSUE_TEMPLATE @@ -1,4 +1,4 @@ Please tell us the following when opening an issue -- Offical Docker version being run: +- Official Docker version being run: - URL to appropriate logs: From fc868f00258a86c9b0c1c85b1dd4e68e3b8a0abc Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Tue, 15 Nov 2016 10:27:21 +0000 Subject: [PATCH 4/8] Update docker-compose.yml --- server-ce/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-ce/docker-compose.yml b/server-ce/docker-compose.yml index efba08f4cc..2cd7434505 100644 --- a/server-ce/docker-compose.yml +++ b/server-ce/docker-compose.yml @@ -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:"
This system is run by department x
" + # SHARELATEX_CUSTOM_EMAIL_FOOTER: "
This system is run by department x
" ################ ## Server Pro ## From 6f9891891043ad8d1056572fd4c3623f548fd80f Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Tue, 15 Nov 2016 10:29:06 +0000 Subject: [PATCH 5/8] Update README.md --- server-ce/README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/server-ce/README.md b/server-ce/README.md index 70c32d9e76..a94976919b 100644 --- a/server-ce/README.md +++ b/server-ce/README.md @@ -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) [![Build Status](https://travis-ci.org/sharelatex/web-sharelatex.png?branch=master)](https://travis-ci.org/sharelatex/web-sharelatex) +### [web](https://github.com/sharelatex/web-sharelatex) [![Build Status](https://travis-ci.org/sharelatex/web-sharelatex.svg?branch=master)](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) [![Build Status](https://travis-ci.org/sharelatex/document-updater-sharelatex.png?branch=master)](https://travis-ci.org/sharelatex/document-updater-sharelatex) +### [document-updater](https://github.com/sharelatex/document-updater-sharelatex) [![Build Status](https://travis-ci.org/sharelatex/document-updater-sharelatex.svg?branch=master)](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) [![Build Status](https://travis-ci.org/sharelatex/clsi-sharelatex.png?branch=master)](https://travis-ci.org/sharelatex/clsi-sharelatex) +### [CLSI](https://github.com/sharelatex/clsi-sharelatex) [![Build Status](https://travis-ci.org/sharelatex/clsi-sharelatex.svg?branch=master)](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) [![Build Status](https://travis-ci.org/sharelatex/docstore-sharelatex.png?branch=master)](https://travis-ci.org/sharelatex/docstore-sharelatex) +### [docstore](https://github.com/sharelatex/docstore-sharelatex) [![Build Status](https://travis-ci.org/sharelatex/docstore-sharelatex.svg?branch=master)](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) [![Build Status](https://travis-ci.org/sharelatex/real-time-sharelatex.png?branch=master)](https://travis-ci.org/sharelatex/real-time-sharelatex) +### [realtime](https://github.com/sharelatex/real-time-sharelatex) [![Build Status](https://travis-ci.org/sharelatex/real-time-sharelatex.svg?branch=master)](https://travis-ci.org/sharelatex/real-time-sharelatex) The websocket process clients connect to -### [filestore](https://github.com/sharelatex/filestore-sharelatex) [![Build Status](https://travis-ci.org/sharelatex/filestore-sharelatex.png?branch=master)](https://travis-ci.org/sharelatex/filestore-sharelatex) +### [filestore](https://github.com/sharelatex/filestore-sharelatex) [![Build Status](https://travis-ci.org/sharelatex/filestore-sharelatex.svg?branch=master)](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) [![Build Status](https://travis-ci.org/sharelatex/track-changes-sharelatex.png?branch=master)](https://travis-ci.org/sharelatex/track-changes-sharelatex) +### [track-changes](https://github.com/sharelatex/track-changes-sharelatex) [![Build Status](https://travis-ci.org/sharelatex/track-changes-sharelatex.svg?branch=master)](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) [![Build Status](https://travis-ci.org/sharelatex/chat-sharelatex.png?branch=master)](https://travis-ci.org/sharelatex/chat-sharelatex) +### [chat](https://github.com/sharelatex/chat-sharelatex) [![Build Status](https://travis-ci.org/sharelatex/chat-sharelatex.svg?branch=master)](https://travis-ci.org/sharelatex/chat-sharelatex) The backend API for storing and fetching chat messages. -### [tags](https://github.com/sharelatex/tags-sharelatex) [![Build Status](https://travis-ci.org/sharelatex/tags-sharelatex.png?branch=master)](https://travis-ci.org/sharelatex/tags-sharelatex) +### [tags](https://github.com/sharelatex/tags-sharelatex) [![Build Status](https://travis-ci.org/sharelatex/tags-sharelatex.svg?branch=master)](https://travis-ci.org/sharelatex/tags-sharelatex) The backend API for managing project tags (folders). From 62849c79eedac2a267736a22ebd7b3cc768bd6a7 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 17 Nov 2016 15:42:51 +0000 Subject: [PATCH 6/8] Update README.md --- server-ce/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-ce/README.md b/server-ce/README.md index a94976919b..19d5567717 100644 --- a/server-ce/README.md +++ b/server-ce/README.md @@ -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 From 3aecf9abe4d27c46f6fca2b79a8cb541378d89c9 Mon Sep 17 00:00:00 2001 From: Ethan Date: Sat, 19 Nov 2016 19:02:27 -0800 Subject: [PATCH 7/8] =?UTF-8?q?Update=20+1=20to=20=F0=9F=91=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change comment with a +1 to modern github reaction (👍) --- server-ce/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-ce/CONTRIBUTING.md b/server-ce/CONTRIBUTING.md index a40bc8814f..3b32dee34e 100644 --- a/server-ce/CONTRIBUTING.md +++ b/server-ce/CONTRIBUTING.md @@ -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. From b1a3be45109307476ece0ec6659f3631cd0608ad Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 23 Nov 2016 15:32:44 +0000 Subject: [PATCH 8/8] change how grunt splits tasks up which fix broken migrate call --- server-ce/Gruntfile.coffee | 4 ++-- server-ce/{grunt => tasks}/CreateAndDestoryUsers.coffee | 0 server-ce/{grunt => tasks}/ProjectSize.coffee | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename server-ce/{grunt => tasks}/CreateAndDestoryUsers.coffee (100%) rename server-ce/{grunt => tasks}/ProjectSize.coffee (100%) diff --git a/server-ce/Gruntfile.coffee b/server-ce/Gruntfile.coffee index c2af03cf45..fc2c654427 100644 --- a/server-ce/Gruntfile.coffee +++ b/server-ce/Gruntfile.coffee @@ -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 = @@ -242,5 +243,4 @@ module.exports = (grunt) -> rclient.on 'error', errorHandler - require('load-grunt-config')(grunt) diff --git a/server-ce/grunt/CreateAndDestoryUsers.coffee b/server-ce/tasks/CreateAndDestoryUsers.coffee similarity index 100% rename from server-ce/grunt/CreateAndDestoryUsers.coffee rename to server-ce/tasks/CreateAndDestoryUsers.coffee diff --git a/server-ce/grunt/ProjectSize.coffee b/server-ce/tasks/ProjectSize.coffee similarity index 100% rename from server-ce/grunt/ProjectSize.coffee rename to server-ce/tasks/ProjectSize.coffee