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

Merge branch 'master' into sk-references-ac

Browse source
This commit is contained in:
Shane Kilkelly 2016-01-13 11:31:58 +00:00
commit 1e904e6ab7
5 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee
View file

@ -111,7 +111,6 @@ module.exports = ProjectEntityHandler =
DocstoreManager.getDoc project_id, doc_id, options, callback DocstoreManager.getDoc project_id, doc_id, options, callback
addDoc: (project_id, folder_id, docName, docLines, callback = (error, doc, folder_id) ->)=> addDoc: (project_id, folder_id, docName, docLines, callback = (error, doc, folder_id) ->)=>
console.log project_id
ProjectGetter.getProjectWithOnlyFolders project_id, (err, project) -> ProjectGetter.getProjectWithOnlyFolders project_id, (err, project) ->
logger.log project: project._id, folder_id: folder_id, doc_name: docName, "adding doc" logger.log project: project._id, folder_id: folder_id, doc_name: docName, "adding doc"
return callback(err) if err? return callback(err) if err?

1
services/web/app/views/subscriptions/new.jade
View file

@ -112,7 +112,6 @@ block content
.form-group(ng-class="validation.correctExpiry == false || validation.errorFields.year ? 'has-error' : ''") .form-group(ng-class="validation.correctExpiry == false || validation.errorFields.year ? 'has-error' : ''")
select.form-control(data-recurly='year', ng-change="validateExpiry()", ng-model='data.year') select.form-control(data-recurly='year', ng-change="validateExpiry()", ng-model='data.year')
option(value="", disabled, selected) Year option(value="", disabled, selected) Year
option(value="2015") 2015
option(value="2016") 2016 option(value="2016") 2016
option(value="2017") 2017 option(value="2017") 2017
option(value="2018") 2018 option(value="2018") 2018

2
services/web/app/views/subscriptions/successful_subscription.jade
View file

@ -5,7 +5,7 @@ block content
.container .container
.row .row
.col-md-8.col-md-offset-2 .col-md-8.col-md-offset-2
.card .card(ng-cloak)
.page-header .page-header
h2 #{translate("thanks_for_subscribing")} h2 #{translate("thanks_for_subscribing")}
.alert.alert-success .alert.alert-success

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

@ -291,7 +291,7 @@ module.exports =
title: "ShareLaTeX Community Edition" title: "ShareLaTeX Community Edition"
left_footer: [{ left_footer: [{
text: "Powered by <a href='https://www.sharelatex.com'>ShareLaTeX</a> © 2015" text: "Powered by <a href='https://www.sharelatex.com'>ShareLaTeX</a> © 2016"
}] }]
right_footer: [{ right_footer: [{

2
services/web/package.json
View file

@ -27,7 +27,7 @@
"http-proxy": "^1.8.1", "http-proxy": "^1.8.1",
"jade": "~1.3.1", "jade": "~1.3.1",
"ldapjs": "^0.7.1", "ldapjs": "^0.7.1",
"logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.1.0", "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.3.0",
"lynx": "0.1.1", "lynx": "0.1.1",
"marked": "^0.3.3", "marked": "^0.3.3",
"method-override": "^2.3.3", "method-override": "^2.3.3",