mirror of
https://github.com/overleaf/overleaf.git
synced 2024-09-16 02:52:31 -04:00
Merge branch 'master' into sk-references-ac
This commit is contained in:
commit
1e904e6ab7
5 changed files with 5 additions and 7 deletions
|
@ -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?
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
@ -15,8 +15,8 @@ block content
|
||||||
p #{translate("if_you_dont_want_to_be_charged")}
|
p #{translate("if_you_dont_want_to_be_charged")}
|
||||||
a(href="/user/subscription") #{translate("click_here_to_cancel")}.
|
a(href="/user/subscription") #{translate("click_here_to_cancel")}.
|
||||||
span(sixpack-when="manage-subscription")
|
span(sixpack-when="manage-subscription")
|
||||||
p #{translate("to_modify_your_subscription_go_to")}
|
p #{translate("to_modify_your_subscription_go_to")}
|
||||||
a(href="/user/subscription") #{translate("manage_subscription")}.
|
a(href="/user/subscription") #{translate("manage_subscription")}.
|
||||||
p
|
p
|
||||||
- if (subscription.groupPlan == true)
|
- if (subscription.groupPlan == true)
|
||||||
a.btn.btn-success.btn-large(href="/subscription/group") #{translate("add_your_first_group_member_now")}
|
a.btn.btn-success.btn-large(href="/subscription/group") #{translate("add_your_first_group_member_now")}
|
||||||
|
|
|
@ -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: [{
|
||||||
|
|
|
@ -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",
|
||||||
|
|
Loading…
Reference in a new issue