github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

added coffeescript and moved admin require to bottom of file

Browse source
This commit is contained in:
Henry Oswald 2016-10-19 11:39:40 +01:00
parent bdea2e3236
commit 3e13565a84
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server-ce/Gruntfile.coffee
View file

@ -1,3 +1,4 @@
coffee = require("coffee-script")
fs = require "fs" fs = require "fs"
spawn = require("child_process").spawn spawn = require("child_process").spawn
exec = require("child_process").exec exec = require("child_process").exec
@ -20,7 +21,6 @@ module.exports = (grunt) ->
grunt.loadNpmTasks 'grunt-concurrent' grunt.loadNpmTasks 'grunt-concurrent'
grunt.loadNpmTasks "grunt-contrib-coffee" grunt.loadNpmTasks "grunt-contrib-coffee"
grunt.loadNpmTasks "grunt-shell" grunt.loadNpmTasks "grunt-shell"
require('load-grunt-config')(grunt)
execute = {} execute = {}
@ -240,3 +240,7 @@ module.exports = (grunt) ->
throw new Error("Can not connect to redis") throw new Error("Can not connect to redis")
return callback(err) return callback(err)
rclient.on 'error', errorHandler rclient.on 'error', errorHandler
require('load-grunt-config')(grunt)

2
server-ce/config/services.js
View file

@ -3,7 +3,7 @@ module.exports =
[{ [{
name: "web", name: "web",
repo: "https://github.com/sharelatex/web-sharelatex.git", repo: "https://github.com/sharelatex/web-sharelatex.git",
version: "master" version: "ha-docker"
}, { }, {
name: "real-time", name: "real-time",
repo: "https://github.com/sharelatex/real-time-sharelatex.git", repo: "https://github.com/sharelatex/real-time-sharelatex.git",

1
server-ce/package.json
View file

@ -4,6 +4,7 @@
"description": "An online collaborative LaTeX editor", "description": "An online collaborative LaTeX editor",
"dependencies": { "dependencies": {
"async": "^0.9.0", "async": "^0.9.0",
"coffee-script": "^1.11.1",
"east": "0.5.1", "east": "0.5.1",
"east-mongo": "^0.1.2", "east-mongo": "^0.1.2",
"grunt-shell": "^1.1.1", "grunt-shell": "^1.1.1",