agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-11-14 06:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into multicurrency

Browse Source
This commit is contained in:
Henry Oswald
2014-10-14 11:52:03 +01:00
parent 6437f74cd3 2538d16e63
commit 4a774981cf
5 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/app/coffee/Features/Compile/CompileManager.coffee
+1 -1
View File
@@ -60,7 +60,7 @@ module.exports = CompileManager =
endpointName:"auto_compile"
timeInterval:15
subjectName:"everyone"
throttle: 10
throttle: 15
rateLimiter.addCount opts, (err, canCompile)->
if err?
canCompile = false
services/web/app/coffee/models/User.coffee
+3
View File
@@ -31,6 +31,9 @@ UserSchema = new Schema
collaborators: { type:Number, default: Settings.defaultFeatures.collaborators }
versioning: { type:Boolean, default: Settings.defaultFeatures.versioning }
dropbox: { type:Boolean, default: Settings.defaultFeatures.dropbox }
github: { type:Boolean, default: Settings.defaultFeatures.github }
compileTimeout: { type:Number, default: Settings.defaultFeatures.compileTimeout }
compileGroup: { type:String, default: Settings.defaultFeatures.compileGroup }
}
featureSwitches : {
github: {type: Boolean}
services/web/app/views/project/editor/left-menu.jade
+1 -1
View File
@@ -40,7 +40,7 @@ aside#left-menu.full-size(
ng-click="openCloneProjectModal()"
)
i.fa.fa-fw.fa-copy
|   #{translate("copy_project")}
|    #{translate("copy_project")}
li(ng-controller="TemplatesController", ng-show="permissions.admin")
a(ng-click="openPublishTemplateModal()")
i.fa.fa-external-link.fa-fw
services/web/config/settings.defaults.coffee
+2
View File
@@ -131,6 +131,8 @@ module.exports =
collaborators: -1
dropbox: true
versioning: true
compileTimeout: 60
compileGroup: "standard"
plans: plans = [{
planCode: "personal"
services/web/test/UnitTests/coffee/Compile/CompileManagerTests.coffee
+1 -1
View File
@@ -201,7 +201,7 @@ describe "CompileManager", ->
@ratelimiter.addCount.callsArgWith(1, null, true)
@CompileManager._checkIfAutoCompileLimitHasBeenHit true, (err, canCompile)=>
args = @ratelimiter.addCount.args[0][0]
args.throttle.should.equal 10
args.throttle.should.equal 15
args.subjectName.should.equal "everyone"
args.timeInterval.should.equal 15
args.endpointName.should.equal "auto_compile"