github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-03-06 07:13:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/sharelatex/web-sharelatex

Browse source
This commit is contained in:
Henry Oswald 2014-10-14 11:50:10 +01:00
commit 2538d16e63
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
services/web/app/coffee/models/User.coffee
View file

@ -31,6 +31,9 @@ UserSchema = new Schema
collaborators: { type:Number, default: Settings.defaultFeatures.collaborators } collaborators: { type:Number, default: Settings.defaultFeatures.collaborators }
versioning: { type:Boolean, default: Settings.defaultFeatures.versioning } versioning: { type:Boolean, default: Settings.defaultFeatures.versioning }
dropbox: { type:Boolean, default: Settings.defaultFeatures.dropbox } 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 : { featureSwitches : {
github: {type: Boolean} github: {type: Boolean}

2
services/web/app/views/project/editor/left-menu.jade
View file

@ -40,7 +40,7 @@ aside#left-menu.full-size(
ng-click="openCloneProjectModal()" ng-click="openCloneProjectModal()"
) )
i.fa.fa-fw.fa-copy i.fa.fa-fw.fa-copy
|   #{translate("copy_project")} |    #{translate("copy_project")}
li(ng-controller="TemplatesController", ng-show="permissions.admin") li(ng-controller="TemplatesController", ng-show="permissions.admin")
a(ng-click="openPublishTemplateModal()") a(ng-click="openPublishTemplateModal()")
i.fa.fa-external-link.fa-fw i.fa.fa-external-link.fa-fw

2
services/web/config/settings.defaults.coffee
View file

@ -131,6 +131,8 @@ module.exports =
collaborators: -1 collaborators: -1
dropbox: true dropbox: true
versioning: true versioning: true
compileTimeout: 60
compileGroup: "standard"
plans: plans = [{ plans: plans = [{
planCode: "personal" planCode: "personal"